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

[buying] [fix] store item tax amount only if field exists

Browse Source
This commit is contained in:
Anand Doshi 2013-06-05 17:46:20 +05:30
parent 12cea9587f
commit b392878f15
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
buying/doctype/purchase_common/purchase_common.js
View File

@ -309,6 +309,12 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
delete item["rate"];
});
}
if(!wn.meta.get_docfield(item.doctype, "item_tax_amount", item.parent || item.name)) {
$.each(this.frm.item_doclist, function(i, item) {
delete item["item_tax_amount"];
});
}
},
calculate_outstanding_amount: function() {
@ -326,9 +332,10 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
// stored for valuation
//
// TODO: rename item_tax_amount to valuation_tax_amount
if(["Valuation", "Valuation and Total"].indexOf(tax.category) != -1) {
// accumulate only if tax is for Valuation / Valuation and Total
item.item_tax_amount += flt(current_tax_amount, precision("item_tax_amount", item));
if(["Valuation", "Valuation and Total"].indexOf(tax.category) != -1 &&
wn.meta.get_docfield(item.doctype, "item_tax_amount", item.parent || item.name)) {
// accumulate only if tax is for Valuation / Valuation and Total
item.item_tax_amount += flt(current_tax_amount, precision("item_tax_amount", item));
}
},

7
controllers/buying_controller.py
View File

@ -167,7 +167,7 @@ class BuyingController(StockController):
for item in self.item_doclist:
item.purchase_rate = item.rate
del item.fields["rate"]
if not self.meta.get_field("item_tax_amount", parentfield=self.fname):
for item in self.item_doclist:
del item.fields["item_tax_amount"]
@ -179,8 +179,9 @@ class BuyingController(StockController):
TODO: rename item_tax_amount to valuation_tax_amount
"""
if tax.category in ["Valuation", "Valuation and Total"]:
item.item_tax_amount += flt(current_tax_amount, self.precision("item_tax_amount", item))
if tax.category in ["Valuation", "Valuation and Total"] and \
self.meta.get_field("item_tax_amount", parentfield=self.fname):
item.item_tax_amount += flt(current_tax_amount, self.precision("item_tax_amount", item))
# update valuation rate
def update_valuation_rate(self, parentfield):