Skip to content

Commit b2f21a8

Browse files
ljain112mergify[bot]
authored andcommitted
fix: add company and is_group filter to "default_gst_expense_account" search query
(cherry picked from commit e1f1c4f) # Conflicts: # india_compliance/gst_india/client_scripts/company.js
1 parent b3b4135 commit b2f21a8

1 file changed

Lines changed: 20 additions & 0 deletions

File tree

  • india_compliance/gst_india/client_scripts

india_compliance/gst_india/client_scripts/company.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,26 @@ frappe.ui.form.on(DOCTYPE, {
1919
"default_customs_payable_account",
2020
{ root_type: "Liability" },
2121
]);
22+
<<<<<<< HEAD
23+
=======
24+
erpnext.company.set_custom_query(frm, [
25+
"default_gst_expense_account",
26+
{},
27+
]);
28+
29+
frm.set_query("print_label", "bank_details_for_printing", (_, cdt, cdn) => {
30+
return {
31+
query: "india_compliance.gst_india.overrides.company.get_default_print_options",
32+
params : {for_bank : 1}
33+
}
34+
});
35+
frm.set_query("print_label", "registration_details_for_printing", (_, cdt, cdn) => {
36+
return {
37+
query: "india_compliance.gst_india.overrides.company.get_default_print_options",
38+
params : {for_bank : 0}
39+
}
40+
});
41+
>>>>>>> e1f1c4fe (fix: add company and is_group filter to "default_gst_expense_account" search query)
2242
},
2343

2444
make_default_tax_template: function (frm) {

0 commit comments

Comments
 (0)