nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 04:09:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext into stock_reco

Browse Source 
Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
This commit is contained in:
Anand Doshi
2013-01-14 13:28:31 +05:30
parent e868db33ab 0c42dc4c22
commit 6c5262abb1
21 changed files with 238 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accounts/doctype/mis_control/mis_control.py
View File

@@ -53,11 +53,8 @@ class DocType:
ret['period'] = ['Annual','Half Yearly','Quarterly','Monthly']
# ---- get companies ---------
res = sql("select name from `tabCompany`")
for r in res:
comp.append(r[0])
#comp.append(r[0] for r in res)
ret['company'] = comp
from accounts.page.accounts_browser.accounts_browser import get_companies
ret['company'] = get_companies()
#--- to get fiscal year and start_date of that fiscal year -----
res = sql("select name, year_start_date from `tabFiscal Year`")

5
accounts/page/accounts_home/accounts_home.js
View File

@@ -146,6 +146,11 @@ wn.module_page["Accounts"] = [
"label":wn._("Financial Analytics"),
page: "financial-analytics"
},
{
"label":wn._("Trend Analyzer"),
route: "Report/Profile/Trend Analyzer",
doctype: "Sales Invoice"
},
]
},
{

4
accounts/search_criteria/creditors_ledger/creditors_ledger.txt
View File

@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-05-14 18:05:41",
"modified_by": "nabin@erpnext.com",
"modified": "2012-12-06 11:36:09"
"modified": "2012-12-06 11:36:10"
},
{
"custom_query": null,
@@ -18,7 +18,7 @@
"name": "__common__",
"doctype": "Search Criteria",
"sort_by": "`tabGL Entry`.`name`",
"criteria_name": "Creditor's Ledger"
"criteria_name": "Creditors Ledger"
},
{
"name": "creditors_ledger",

4
accounts/search_criteria/debtors_ledger/debtors_ledger.txt
View File

@@ -4,7 +4,7 @@
"docstatus": 0,
"creation": "2012-05-14 18:05:42",
"modified_by": "nabin@erpnext.com",
"modified": "2012-12-06 11:37:15"
"modified": "2012-12-06 11:37:16"
},
{
"custom_query": null,
@@ -18,7 +18,7 @@
"name": "__common__",
"doctype": "Search Criteria",
"sort_by": "`tabGL Entry`.`name`",
"criteria_name": "Debtor's Ledger"
"criteria_name": "Debtors Ledger"
},
{
"name": "debtors_ledger",