nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 10:36:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28641 from frappe/mergify/bp/version-13-hotfix/pr-28302

Browse Source 
fix: Shipping Rule picking up old net_rate (backport #28302)
This commit is contained in:
Deepesh Garg
2021-12-03 15:20:09 +05:30
committed by GitHub
parent 99dfa91f81 f591596615
commit b09274bd49
5 changed files with 16 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/taxes_and_totals.py
View File

@@ -50,6 +50,7 @@ class calculate_taxes_and_totals(object):
self.initialize_taxes()
self.determine_exclusive_rate()
self.calculate_net_total()
self.calculate_shipping_charges()
self.calculate_taxes()
self.manipulate_grand_total_for_inclusive_tax()
self.calculate_totals()
@@ -258,6 +259,11 @@ class calculate_taxes_and_totals(object):
self.doc.round_floats_in(self.doc, ["total", "base_total", "net_total", "base_net_total"])
def calculate_shipping_charges(self):
if hasattr(self.doc, "shipping_rule") and self.doc.shipping_rule:
shipping_rule = frappe.get_doc("Shipping Rule", self.doc.shipping_rule)
shipping_rule.apply(self.doc)
def calculate_taxes(self):
if not self.doc.get('is_consolidated'):
self.doc.rounding_adjustment = 0