schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make showing taxes as table in print configurable (backport #35672) (#35678)

Browse Source 
* fix: make showing taxes as table in print configurable (#35672)

(cherry picked from commit 491a50a027)

# Conflicts:
#	erpnext/accounts/doctype/accounts_settings/accounts_settings.json

* chore: fix conflict

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
This commit is contained in:
mergify[bot]
2023-06-13 20:44:05 +05:30
committed by GitHub
parent 4add1b4374
commit f39ae9dbb1
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/accounts_settings/accounts_settings.json
View File

@@ -36,6 +36,7 @@
"book_tax_discount_loss", "book_tax_discount_loss",
"print_settings", "print_settings",
"show_inclusive_tax_in_print", "show_inclusive_tax_in_print",
"show_taxes_as_table_in_print",
"column_break_12", "column_break_12",
"show_payment_schedule_in_print", "show_payment_schedule_in_print",
"currency_exchange_section", "currency_exchange_section",
@@ -378,6 +379,12 @@
"fieldname": "auto_reconcile_payments", "fieldname": "auto_reconcile_payments",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Auto Reconcile Payments" "label": "Auto Reconcile Payments"
},
{
"default": "0",
"fieldname": "show_taxes_as_table_in_print",
"fieldtype": "Check",
"label": "Show Taxes as Table in Print"
} }
], ],
"icon": "icon-cog", "icon": "icon-cog",
@@ -385,7 +392,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
"modified": "2023-04-21 13:11:37.130743", "modified": "2023-06-13 18:47:46.430291",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Accounts Settings", "name": "Accounts Settings",
@@ -414,4 +421,4 @@
"sort_order": "ASC", "sort_order": "ASC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1
} }

3
erpnext/controllers/accounts_controller.py
View File

@@ -917,6 +917,9 @@ class AccountsController(TransactionBase):
return is_inclusive return is_inclusive
def should_show_taxes_as_table_in_print(self):
return cint(frappe.db.get_single_value("Accounts Settings", "show_taxes_as_table_in_print"))
def validate_advance_entries(self): def validate_advance_entries(self):
order_field = "sales_order" if self.doctype == "Sales Invoice" else "purchase_order" order_field = "sales_order" if self.doctype == "Sales Invoice" else "purchase_order"
order_list = list(set(d.get(order_field) for d in self.get("items") if d.get(order_field))) order_list = list(set(d.get(order_field) for d in self.get("items") if d.get(order_field)))

8
erpnext/controllers/print_settings.py
View File

@@ -30,10 +30,16 @@ def set_print_templates_for_taxes(doc, settings):
doc.print_templates.update( doc.print_templates.update(
{ {
"total": "templates/print_formats/includes/total.html", "total": "templates/print_formats/includes/total.html",
"taxes": "templates/print_formats/includes/taxes.html",
} }
) )
if not doc.should_show_taxes_as_table_in_print():
doc.print_templates.update(
{
"taxes": "templates/print_formats/includes/taxes.html",
}
)
def format_columns(display_columns, compact_fields): def format_columns(display_columns, compact_fields):
compact_fields = compact_fields + ["image", "item_code", "item_name"] compact_fields = compact_fields + ["image", "item_code", "item_name"]