From 08fb39f1ba6c11279755ca883bca57a3760cd5b1 Mon Sep 17 00:00:00 2001 From: Alec Ruiz-Ramon Date: Tue, 9 Aug 2016 15:38:34 -0400 Subject: [PATCH 1/2] Validate on changing from Total to Valuation/Valuation&Total when add_deduct_tax is 'Deduct' --- .../purchase_taxes_and_charges_template.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js index 433cda7372..0d37d00221 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js @@ -18,3 +18,13 @@ frappe.ui.form.on("Purchase Taxes and Charges", "add_deduct_tax", function(doc, } refresh_field('add_deduct_tax', d.name, 'taxes'); }); + +frappe.ui.form.on("Purchase Taxes and Charges", "category", function(doc, cdt, cdn) { + var d = locals[cdt][cdn]; + + if (d.category != 'Total' && d.add_deduct_tax == 'Deduct') { + msgprint(__("Cannot deduct when category is for 'Valuation' or 'Vaulation and Total'")); + d.add_deduct_tax = ''; + } + refresh_field('add_deduct_tax', d.name, 'taxes'); +}) From 8bd2487533ade6aa5725371fabdd7e2eb67f96e2 Mon Sep 17 00:00:00 2001 From: aruizramon Date: Tue, 9 Aug 2016 16:04:45 -0400 Subject: [PATCH 2/2] semicolon --- .../purchase_taxes_and_charges_template.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js index 0d37d00221..a1d8bf85d2 100644 --- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js +++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js @@ -27,4 +27,4 @@ frappe.ui.form.on("Purchase Taxes and Charges", "category", function(doc, cdt, c d.add_deduct_tax = ''; } refresh_field('add_deduct_tax', d.name, 'taxes'); -}) +});