diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js index 1c2f751b3c806245634a8b0f2e5597d4c3ebbe80..8a428af9430fdae9000ac1bc8d2d190eb5b24bab 100644 --- a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js +++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation.js @@ -2,9 +2,18 @@ // For license information, please see license.txt frappe.provide("erpnext.accounts"); +frappe.provide("erpnext.bank_reconciliation"); frappe.pages['bank-reconciliation'].on_page_load = function(wrapper) { + wrapper.page = frappe.ui.make_app_page({ + parent: wrapper, + title: __("Bank Reconciliation"), + single_column: true + }); + + frappe.utils.make_event_emitter(erpnext.bank_reconciliation); + frappe.require('bank_reconciliation.bundle.js', function() { - new erpnext.accounts.bankReconciliationPage(wrapper); + erpnext.accounts.bank_reconciliation_page = new erpnext.accounts.bankReconciliationPage(wrapper); }); } diff --git a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation_page/bank_reconciliation.js b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation_page/bank_reconciliation.js index 41e33be39f2218ef37403170c6f222faa583826f..c82d97104492e5125a41ada361127da80d64987c 100644 --- a/erpnext/accounts/page/bank_reconciliation/bank_reconciliation_page/bank_reconciliation.js +++ b/erpnext/accounts/page/bank_reconciliation/bank_reconciliation_page/bank_reconciliation.js @@ -4,11 +4,6 @@ frappe.provide("erpnext.bank_reconciliation") erpnext.accounts.bankReconciliationPage = class BankReconciliationPage { constructor(wrapper) { - this.page = frappe.ui.make_app_page({ - parent: wrapper, - title: __("Bank Reconciliation"), - single_column: true - }); this.parent = wrapper; this.page = this.parent.page; @@ -19,10 +14,18 @@ erpnext.accounts.bankReconciliationPage = class BankReconciliationPage { ) this.bank_account = this.user_bank_account; this.date_range = [frappe.datetime.add_months(frappe.datetime.get_today(),-1), frappe.datetime.get_today()]; - frappe.utils.make_event_emitter(erpnext.bank_reconciliation); + + this.emit_initial_events() + this.make(); } + emit_initial_events() { + if (this.user_bank_account) { + erpnext.bank_reconciliation.trigger("filter_change", {name: 'BANK_ACCOUNT', value: this.user_bank_account}) + } + } + make() { const me = this; diff --git a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html index 62afc3c9e19c45881d5d1b90ee4c30d66edc425f..b474fdbe2fc35ad510df6d65463629eb77e4b360 100644 --- a/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html +++ b/erpnext/accounts/print_format/sales_invoice_return/sales_invoice_return.html @@ -17,7 +17,7 @@ {%- macro render_taxes(df, doc) -%} {%- set data = doc.get(df.fieldname)[df.start:df.end] -%} -
+
{%- for charge in data -%} diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index c8086f81ab0569c295ac60833d096c8d2dddb7b1..315d9a55fce1af0308b10f14240c0d4704c56d1d 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -639,8 +639,7 @@ "fieldname": "discount_amount", "fieldtype": "Currency", "label": "Additional Discount Amount", - "options": "currency", - "print_hide": 1 + "options": "currency" }, { "fieldname": "totals", @@ -1080,7 +1079,7 @@ "idx": 82, "is_submittable": 1, "links": [], - "modified": "2023-07-28 16:57:43.666306", + "modified": "2024-01-05 15:56:54.965566", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/templates/print_formats/includes/taxes.html b/erpnext/templates/print_formats/includes/taxes.html index 068028daf1bb3ec94d3bf87bef71d8dfa042aa38..8881f81740b9f6141afd3180ae7c17653457b021 100644 --- a/erpnext/templates/print_formats/includes/taxes.html +++ b/erpnext/templates/print_formats/includes/taxes.html @@ -10,7 +10,7 @@ {%- endif -%} {%- endmacro -%} -
+
{%- if doc.apply_discount_on == "Net Total" -%} diff --git a/erpnext/templates/print_formats/includes/taxes_and_charges.html b/erpnext/templates/print_formats/includes/taxes_and_charges.html index 92100c494814ddde1735845fb48770e26e86f0e5..ccbd84f33efb681c65559186c0fcebf75e4dca06 100644 --- a/erpnext/templates/print_formats/includes/taxes_and_charges.html +++ b/erpnext/templates/print_formats/includes/taxes_and_charges.html @@ -15,7 +15,7 @@ {%- endif -%} {%- endmacro -%} -
+
{%- if doc.apply_discount_on == "Net Total" -%}