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

Merge pull request #1280 from nabinhait/hotfix

Browse Source 
Fixes in item-wise sales/purchase register
This commit is contained in:
Nabin Hait
2014-01-06 03:03:02 -08:00
parent 5e702de710 6b66c387ad
commit cb665285db
2 changed files with 4 additions and 3 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) item_list = get_items(filters)
aii_account_map = get_aii_accounts() 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 = [] data = []
for d in item_list: 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) last_col = len(columns)
item_list = get_items(filters) 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 = [] data = []
for d in item_list: for d in item_list:
@@ -39,7 +40,6 @@ def get_columns():
"Qty:Float:120", "Rate:Currency:120", "Amount:Currency:120" "Qty:Float:120", "Rate:Currency:120", "Amount:Currency:120"
] ]
def get_conditions(filters): def get_conditions(filters):
conditions = "" conditions = ""