From d982853aa3414be835cae5621a3e675fc1480b3b Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Wed, 18 Oct 2023 11:42:19 +0530 Subject: [PATCH 1/3] fix: filter tax template based on company --- .../doctype/subscription/subscription.js | 45 ++++--------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/erpnext/accounts/doctype/subscription/subscription.js b/erpnext/accounts/doctype/subscription/subscription.js index 76de66fb30e..11102705902 100644 --- a/erpnext/accounts/doctype/subscription/subscription.js +++ b/erpnext/accounts/doctype/subscription/subscription.js @@ -56,43 +56,16 @@ frappe.ui.form.on('Subscription', { () => frm.events.abort_cancel_this_subscription(frm) ); } - frm.add_custom_button( - __('Fetch Subscription Updates'), - () => frm.events.get_subscription_updates(frm) - ); - - } - else if(frm.doc.status === 'Cancelled'){ - frm.page.add_action_item( - __('Restart Subscription'), - () => frm.events.renew_this_subscription(frm) - ); - } - - frappe.xcall("erpnext.accounts.doctype.subscription.subscription.subscription_headline", { - 'name': frm.doc.name - }) - .then(r => { - frm.dashboard.clear_headline(); - frm.dashboard.set_headline_alert(r); - }) - } - frm.set_value("company", frappe.defaults.get_user_default("Company")); - frm.trigger("show_stripe_section"); - - if (frm.is_new() && !frm.doc.print_format) { - frappe.model.with_doctype("Sales Invoice", function() { - frm.set_value("print_format", frappe.get_meta("Sales Invoice").default_print_format) - }); - } + }; + }); - frappe.db.get_list("Subscription Plan", { - filters: {"disabled": 0}, - }).then((sub_plans) => { - if (!sub_plans.length) { - frm.toggle_display("select_subscription_plan", 0); - } - }) + frm.set_query('sales_tax_template', function () { + return { + filters: { + company: frm.doc.company + } + }; + }); }, customer: function(frm) { -- GitLab From b6993b59bf32aec0d3d50937edc328c201df734a Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Wed, 18 Oct 2023 17:49:09 +0530 Subject: [PATCH 2/3] Merge pull request #37562 from GursheenK/subscription-tax-filters fix(minor): filter tax template based on company in subscription --- erpnext/accounts/doctype/subscription/subscription.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/erpnext/accounts/doctype/subscription/subscription.js b/erpnext/accounts/doctype/subscription/subscription.js index 11102705902..5312b2a24da 100644 --- a/erpnext/accounts/doctype/subscription/subscription.js +++ b/erpnext/accounts/doctype/subscription/subscription.js @@ -66,6 +66,14 @@ frappe.ui.form.on('Subscription', { } }; }); + + frm.set_query('sales_tax_template', function () { + return { + filters: { + company: frm.doc.company + } + }; + }); }, customer: function(frm) { -- GitLab From e2a3edbb350e9fcb3cb3f80ff06014caecdc8a6e Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Wed, 18 Oct 2023 18:33:58 +0000 Subject: [PATCH 3/3] fix: merge conflict --- .../doctype/subscription/subscription.js | 60 ++++++++++++++----- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/erpnext/accounts/doctype/subscription/subscription.js b/erpnext/accounts/doctype/subscription/subscription.js index 5312b2a24da..23441a43a6c 100644 --- a/erpnext/accounts/doctype/subscription/subscription.js +++ b/erpnext/accounts/doctype/subscription/subscription.js @@ -36,6 +36,15 @@ frappe.ui.form.on('Subscription', { filters: {'is_sales_item': 1} } }) + + frm.set_query('tax_template', function () { + return { + filters: { + company: frm.doc.company + } + }; + }); + }, refresh: function(frm) { frm.page.clear_actions_menu(); @@ -56,24 +65,43 @@ frappe.ui.form.on('Subscription', { () => frm.events.abort_cancel_this_subscription(frm) ); } - }; - }); + frm.add_custom_button( + __('Fetch Subscription Updates'), + () => frm.events.get_subscription_updates(frm) + ); - frm.set_query('sales_tax_template', function () { - return { - filters: { - company: frm.doc.company - } - }; - }); + } + else if(frm.doc.status === 'Cancelled'){ + frm.page.add_action_item( + __('Restart Subscription'), + () => frm.events.renew_this_subscription(frm) + ); + } - frm.set_query('sales_tax_template', function () { - return { - filters: { - company: frm.doc.company - } - }; - }); + frappe.xcall("erpnext.accounts.doctype.subscription.subscription.subscription_headline", { + 'name': frm.doc.name + }) + .then(r => { + frm.dashboard.clear_headline(); + frm.dashboard.set_headline_alert(r); + }) + } + frm.set_value("company", frappe.defaults.get_user_default("Company")); + frm.trigger("show_stripe_section"); + + if (frm.is_new() && !frm.doc.print_format) { + frappe.model.with_doctype("Sales Invoice", function() { + frm.set_value("print_format", frappe.get_meta("Sales Invoice").default_print_format) + }); + } + + frappe.db.get_list("Subscription Plan", { + filters: {"disabled": 0}, + }).then((sub_plans) => { + if (!sub_plans.length) { + frm.toggle_display("select_subscription_plan", 0); + } + }) }, customer: function(frm) { -- GitLab