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

Fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-04-14 18:25:53 +05:30
parent 15a7f215b9 9f553e7206
commit 972c25f78d
50 changed files with 355 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/party.py
View File

@@ -305,8 +305,12 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup
else:
args.update(get_party_details(party, party_type))
if party_type=="Customer":
if party_type in ("Customer", "Lead"):
args.update({"tax_type": "Sales"})
if party_type=='Lead':
args['customer'] = None
del args['lead']
else:
args.update({"tax_type": "Purchase"})