schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into payment-terms

Browse Source
This commit is contained in:
tunde
2017-09-29 13:30:22 +01:00
parent f65e55064b 6488645d42
commit c49e748c85
18 changed files with 285 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/party.py
View File

@@ -324,11 +324,15 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup
from erpnext.accounts.doctype.tax_rule.tax_rule import get_tax_template, get_party_details
args = {
party_type.lower(): party,
"customer_group": customer_group,
"supplier_type": supplier_type,
"company": company
}
if customer_group:
args['customer_group'] = customer_group
if supplier_type:
args['supplier_type'] = supplier_type
if billing_address or shipping_address:
args.update(get_party_details(party, party_type, {"billing_address": billing_address, \
"shipping_address": shipping_address }))