nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 02:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3349. Thanks @abelbm for reporting.

Browse Source
This commit is contained in:
Anand Doshi
2015-05-26 18:06:09 -04:00
parent 438b67e8b0
commit ff8a854b82
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/selling_controller.py
View File

@@ -85,9 +85,9 @@ class SellingController(StockController):
existing_shipping_charge = self.get("taxes", filters=shipping_charge) existing_shipping_charge = self.get("taxes", filters=shipping_charge)
if existing_shipping_charge: if existing_shipping_charge:
# take the last record found # take the last record found
existing_shipping_charge[-1].rate = shipping_amount existing_shipping_charge[-1].tax_amount = shipping_amount
else: else:
shipping_charge["rate"] = shipping_amount shipping_charge["tax_amount"] = shipping_amount
shipping_charge["description"] = shipping_rule.label shipping_charge["description"] = shipping_rule.label
self.append("taxes", shipping_charge) self.append("taxes", shipping_charge)