nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-08 19:36:26 +05:30
parent f7a102ffe3 5eb139a531
commit 5c119a7e95
5 changed files with 57 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -12,7 +12,8 @@ def execute(filters=None):
item_list = get_items(filters)
aii_account_map = get_aii_accounts()
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
if item_list:
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
data = []
for d in item_list:

4
accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -11,7 +11,8 @@ def execute(filters=None):
last_col = len(columns)
item_list = get_items(filters)
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
if item_list:
item_tax, tax_accounts = get_tax_accounts(item_list, columns)
data = []
for d in item_list:
@@ -39,7 +40,6 @@ def get_columns():
"Qty:Float:120", "Rate:Currency:120", "Amount:Currency:120"
]
def get_conditions(filters):
conditions = ""