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

[hot] taxes

Browse Source
This commit is contained in:
Rushabh Mehta 2015-05-08 11:08:48 +05:30
parent 15c284497b
commit ab1ed013b3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.js
View File

@ -5,6 +5,6 @@ cur_frm.cscript.tax_table = "Sales Taxes and Charges";
{% include "public/js/controllers/accounts.js" %} {% include "public/js/controllers/accounts.js" %}
frappe.ui.form.on("sales Taxes and Charges Template", "onload", function(frm) { frappe.ui.form.on("Sales Taxes and Charges Template", "onload", function(frm) {
erpnext.add_applicable_territory(); erpnext.add_applicable_territory();
}); });

4
erpnext/selling/sales_common.js
View File

@ -35,8 +35,8 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.frm.set_query("taxes_and_charges", function() { this.frm.set_query("taxes_and_charges", function() {
return { return {
filters: [ filters: [
['sales Taxes and Charges Template', 'company', '=', me.frm.doc.company], ['Sales Taxes and Charges Template', 'company', '=', me.frm.doc.company],
['sales Taxes and Charges Template', 'docstatus', '!=', 2] ['Sales Taxes and Charges Template', 'docstatus', '!=', 2]
] ]
} }
}); });