diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 7f27ab6511b..298e1110d33 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -32,7 +32,21 @@ class TransactionBase(StatusUpdater): self.validate_future_posting() self.validate_with_last_transaction_posting_time() + def is_stock_transaction(self): + if self.doctype not in ["Sales Invoice", "Purchase Invoice", "Stock Entry", "Stock Reconciliation", + "Delivery Note", "Purchase Receipt", "Fees"]: + return False + + if self.doctype in ["Sales Invoice", "Purchase Invoice"]: + if not (self.get("update_stock") or self.get("is_pos")): + return False + + return True + def validate_future_posting(self): + if not self.is_stock_transaction(): + return + if getattr(self, 'set_posting_time', None) and date_diff(self.posting_date, nowdate()) > 0: msg = _("Posting future transactions are not allowed due to Immutable Ledger") frappe.throw(msg, title=_("Future Posting Not Allowed")) @@ -168,13 +182,8 @@ class TransactionBase(StatusUpdater): def validate_with_last_transaction_posting_time(self): - if self.doctype not in ["Sales Invoice", "Purchase Invoice", "Stock Entry", "Stock Reconciliation", - "Delivery Note", "Purchase Receipt", "Fees"]: - return - - if self.doctype in ["Sales Invoice", "Purchase Invoice"]: - if not (self.get("update_stock") or self.get("is_pos")): - return + if not self.is_stock_transaction(): + return for item in self.get('items'): last_transaction_time = frappe.db.sql("""