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

flat discount replaced to discount amount

Browse Source
This commit is contained in:
Akhilesh Darjee
2014-01-03 18:15:07 +05:30
parent 829eda47a8
commit 57738a0ff3
30 changed files with 144 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/buying_controller.py
View File

@@ -147,7 +147,7 @@ class BuyingController(StockController):
def _cleanup(self):
super(BuyingController, self)._cleanup()
# except in purchase invoice, rate field is purchase_rate
# except in purchase invoice, rate field is purchase_rate
# reset fieldname of rate
if self.doc.doctype != "Purchase Invoice":
df = self.meta.get_field("rate", parentfield=self.fname)
@@ -161,9 +161,9 @@ class BuyingController(StockController):
for item in self.item_doclist:
del item.fields["item_tax_amount"]
if not self.meta.get_field("tax_amount_after_flat_discount", parentfield=self.other_fname):
if not self.meta.get_field("tax_amount_after_discount_amount", parentfield=self.other_fname):
for tax in self.tax_doclist:
del tax.fields["tax_amount_after_flat_discount"]
del tax.fields["tax_amount_after_discount_amount"]
def set_item_tax_amount(self, item, tax, current_tax_amount):
"""