[Shopping Cart][Fixes] tax calculation based on tax rule

This commit is contained in:
Saurabh
2015-09-11 15:44:06 +05:30
parent def71d4d5d
commit 957e7a37be
5 changed files with 68 additions and 35 deletions

View File

@@ -278,7 +278,9 @@ def validate_due_date(posting_date, due_date, party_type, party, company):
frappe.throw(_("Due / Reference Date cannot be after {0}").format(formatdate(default_due_date)))
@frappe.whitelist()
def set_taxes(party, party_type, posting_date, company, customer_group=None, supplier_type=None, billing_address=None, shipping_address=None, for_shopping_cart=None):
def set_taxes(party, party_type, posting_date, company, customer_group=None, supplier_type=None,
billing_address=None, shipping_address=None, use_for_shopping_cart=None):
from erpnext.accounts.doctype.tax_rule.tax_rule import get_tax_template, get_party_details
args = {
party_type: party,
@@ -288,7 +290,8 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup
}
if billing_address or shipping_address:
args.update(get_party_details(party, party_type, {"billing_address": billing_address, "shipping_address": shipping_address }))
args.update(get_party_details(party, party_type, {"billing_address": billing_address, \
"shipping_address": shipping_address }))
else:
args.update(get_party_details(party, party_type))
@@ -297,7 +300,8 @@ def set_taxes(party, party_type, posting_date, company, customer_group=None, sup
else:
args.update({"tax_type": "Purchase"})
if for_shopping_cart:
args.update({"use_for_shopping_cart": for_shopping_cart})
if use_for_shopping_cart:
print "use_for_shopping_cart", use_for_shopping_cart
args.update({"use_for_shopping_cart": use_for_shopping_cart})
return get_tax_template(posting_date, args)