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

Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

Browse Source
This commit is contained in:
Anand Doshi 2013-06-14 17:45:01 +05:30
commit a7ffd0c81d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,8 +225,9 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
if(this.frm.doc.doctype != "Purchase Invoice") {
// hack!
wn.meta.docfield_copy[this.tname][this.frm.doc.name]["rate"] = $.extend({},
wn.meta.docfield_copy[this.tname][this.frm.doc.name]["purchase_rate"]);
var purchase_rate_df = wn.meta.get_docfield(this.tname, "rate", this.frm.doc.name);
wn.meta.docfield_copy[this.tname][this.frm.doc.name]["rate"] =
$.extend({}, purchase_rate_df);
}
$.each(this.frm.item_doclist, function(i, item) {
@ -310,10 +311,12 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
});
}
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"];
});
if(this.frm.item_doclist.length) {
if(!wn.meta.get_docfield(this.frm.item_doclist[0].doctype, "item_tax_amount", this.frm.doctype)) {
$.each(this.frm.item_doclist, function(i, item) {
delete item["item_tax_amount"];
});
}
}
},