Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13322 from achillesrasquinha/fixes

Browse Source 
Fixed dict_keys concatenation
This commit is contained in:
Achilles Rasquinha 2018-03-18 10:09:48 +05:30 committed by GitHub
commit 984ec2652e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -188,7 +188,7 @@ def get_tax_accounts(item_list, columns, company_currency,
%s
order by description
""" % (tax_doctype, '%s', ', '.join(['%s']*len(invoice_item_row)), conditions),
tuple([doctype] + invoice_item_row.keys()))
tuple([doctype] + list(invoice_item_row)))
for parent, description, item_wise_tax_detail, charge_type, tax_amount in tax_details:
description = handle_html(description)