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

[Fix] If two po consolidated in one purchase invoice, Total Net Weight not get summed (#14230)

Browse Source
This commit is contained in:
rohitwaghchaure 2018-05-26 09:23:02 +05:30 committed by Nabin Hait
parent 27cf190269
commit a8fb2db001
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/taxes_and_totals.py
View File

@ -38,6 +38,7 @@ class calculate_taxes_and_totals(object):
self.manipulate_grand_total_for_inclusive_tax() self.manipulate_grand_total_for_inclusive_tax()
self.calculate_totals() self.calculate_totals()
self._cleanup() self._cleanup()
self.calculate_total_net_weight()
def validate_conversion_rate(self): def validate_conversion_rate(self):
# validate conversion rate # validate conversion rate
@ -328,6 +329,13 @@ class calculate_taxes_and_totals(object):
self.set_rounded_total() self.set_rounded_total()
def calculate_total_net_weight(self):
if self.doc.meta.get_field('total_net_weight'):
self.doc.total_net_weight = 0.0
for d in self.doc.items:
if d.total_weight:
self.doc.total_net_weight += d.total_weight
def set_rounded_total(self): def set_rounded_total(self):
if self.doc.meta.get_field("rounded_total"): if self.doc.meta.get_field("rounded_total"):
if self.doc.is_rounded_total_disabled(): if self.doc.is_rounded_total_disabled():