mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-05 22:48:27 +00:00
chore: resolved conflicts
This commit is contained in:
@@ -96,9 +96,6 @@ class AccountsSettings(Document):
|
|||||||
if old_doc.show_payment_schedule_in_print != self.show_payment_schedule_in_print:
|
if old_doc.show_payment_schedule_in_print != self.show_payment_schedule_in_print:
|
||||||
self.enable_payment_schedule_in_print()
|
self.enable_payment_schedule_in_print()
|
||||||
|
|
||||||
if old_doc.use_sales_invoice_in_pos != self.use_sales_invoice_in_pos:
|
|
||||||
self.validate_invoice_mode_switch_in_pos()
|
|
||||||
|
|
||||||
if clear_cache:
|
if clear_cache:
|
||||||
frappe.clear_cache()
|
frappe.clear_cache()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user