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

Filters for tax templates (#23998)

Browse Source 
* feat: add company filter to tax templates

* fix: remove filer from PO because it is from tran

* fix: linting

* fix: solve translation string issues

* fix: remove doctype name
This commit is contained in:
Mohammad Hasnain Mohsin Rajan
2020-11-25 15:36:41 +05:30
committed by GitHub
parent 6b57cf3285
commit e15b6a91de
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/pos_profile/pos_profile.js
View File

@@ -35,6 +35,15 @@ frappe.ui.form.on('POS Profile', {
}; };
}); });
frm.set_query("taxes_and_charges", function() {
return {
filters: [
['Sales Taxes and Charges Template', 'company', '=', frm.doc.company],
['Sales Taxes and Charges Template', 'docstatus', '!=', 2]
]
};
});
frm.set_query('company_address', function(doc) { frm.set_query('company_address', function(doc) {
if(!doc.company) { if(!doc.company) {
frappe.throw(__('Please set Company')); frappe.throw(__('Please set Company'));

11
erpnext/public/js/controllers/transaction.js
View File

@@ -209,6 +209,17 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
}); });
} }
if (this.frm.fields_dict.taxes_and_charges) {
this.frm.set_query("taxes_and_charges", function() {
return {
filters: [
['company', '=', me.frm.doc.company],
['docstatus', '!=', 2]
]
};
});
}
}, },
onload: function() { onload: function() {
var me = this; var me = this;

12
erpnext/selling/sales_common.js
View File

@@ -42,16 +42,6 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
me.frm.set_query('customer_address', erpnext.queries.address_query); me.frm.set_query('customer_address', erpnext.queries.address_query);
me.frm.set_query('shipping_address_name', erpnext.queries.address_query); me.frm.set_query('shipping_address_name', erpnext.queries.address_query);
if(this.frm.fields_dict.taxes_and_charges) {
this.frm.set_query("taxes_and_charges", function() {
return {
filters: [
['Sales Taxes and Charges Template', 'company', '=', me.frm.doc.company],
['Sales Taxes and Charges Template', 'docstatus', '!=', 2]
]
}
});
}
if(this.frm.fields_dict.selling_price_list) { if(this.frm.fields_dict.selling_price_list) {
this.frm.set_query("selling_price_list", function() { this.frm.set_query("selling_price_list", function() {
@@ -479,7 +469,7 @@ frappe.ui.form.on(cur_frm.doctype,"project", function(frm) {
$.each(frm.doc["items"] || [], function(i, row) { $.each(frm.doc["items"] || [], function(i, row) {
if(r.message) { if(r.message) {
frappe.model.set_value(row.doctype, row.name, "cost_center", r.message); frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
frappe.msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message)); frappe.msgprint(__("Cost Center For Item with Item Code {0} has been Changed to {1}", [row.item_name, r.message]));
} }
}) })
} }