Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: remove repeated validation for voucher

Browse Source
This commit is contained in:
Gursheen Anand 2023-09-23 19:18:06 +05:30
parent 7ebf083683
commit a856091ff4
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -531,23 +531,10 @@ class PurchaseInvoice(BuyingController):
] ]
child_tables = {"items": ("expense_account",), "taxes": ("account_head",)} child_tables = {"items": ("expense_account",), "taxes": ("account_head",)}
self.needs_repost = self.check_if_fields_updated(fields_to_check, child_tables) self.needs_repost = self.check_if_fields_updated(fields_to_check, child_tables)
self.validate_deferred_accounting_before_repost()
self.validate_write_off_account() self.validate_write_off_account()
self.validate_expense_account() self.validate_expense_account()
self.db_set("repost_required", self.needs_repost) self.db_set("repost_required", self.needs_repost)
def validate_deferred_accounting_before_repost(self):
# validate if deferred expense is enabled for any item
# Don't allow to update the invoice if deferred expense is enabled
if self.needs_repost:
for item in self.get("items"):
if item.enable_deferred_expense:
frappe.throw(
_(
"Deferred Expense is enabled for item {0}. You cannot update the invoice after submission."
).format(item.item_code)
)
def make_gl_entries(self, gl_entries=None, from_repost=False): def make_gl_entries(self, gl_entries=None, from_repost=False):
if not gl_entries: if not gl_entries:
gl_entries = self.get_gl_entries() gl_entries = self.get_gl_entries()

13
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -527,22 +527,9 @@ class SalesInvoice(SellingController):
"taxes": ("account_head",), "taxes": ("account_head",),
} }
self.needs_repost = self.check_if_fields_updated(fields_to_check, child_tables) self.needs_repost = self.check_if_fields_updated(fields_to_check, child_tables)
self.validate_deferred_accounting_before_repost()
self.validate_accounts() self.validate_accounts()
self.db_set("repost_required", self.needs_repost) self.db_set("repost_required", self.needs_repost)
def validate_deferred_accounting_before_repost(self):
# validate if deferred revenue is enabled for any item
# Don't allow to update the invoice if deferred revenue is enabled
if self.needs_repost:
for item in self.get("items"):
if item.enable_deferred_revenue:
frappe.throw(
_(
"Deferred Revenue is enabled for item {0}. You cannot update the invoice after submission."
).format(item.item_code)
)
def set_paid_amount(self): def set_paid_amount(self):
paid_amount = 0.0 paid_amount = 0.0
base_paid_amount = 0.0 base_paid_amount = 0.0