diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py index dec85d42184fbb9f7dbe73e98270981bcef22de8..7be0469f621c9da9115beb1af9182709e677cffc 100644 --- a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py +++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py @@ -186,6 +186,7 @@ class TestSerialandBatchBundle(FrappeTestCase): } ) + doc.set_posting_datetime() doc.flags.ignore_permissions = True doc.flags.ignore_mandatory = True doc.flags.ignore_links = True @@ -586,6 +587,7 @@ class TestSerialandBatchBundle(FrappeTestCase): "company": "_Test Company", } ) + doc.set_posting_datetime() doc.flags.ignore_permissions = True doc.flags.ignore_mandatory = True doc.flags.ignore_links = True diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index c08ebc6c6bfaa8f502425bf39a0dec0d07c37790..9cf0dfdeb43ce99bdb6ae11b9de493795560638f 100644 --- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -88,6 +88,7 @@ class StockLedgerEntry(Document): self.flags.ignore_submit_comment = True from erpnext.stock.utils import validate_disabled_warehouse, validate_warehouse_company + self.set_posting_datetime() self.validate_mandatory() self.validate_batch() validate_disabled_warehouse(self.warehouse) @@ -98,15 +99,10 @@ class StockLedgerEntry(Document): self.validate_with_last_transaction_posting_time() self.validate_inventory_dimension_negative_stock() - def set_posting_datetime(self, save=False): + def set_posting_datetime(self): from erpnext.stock.utils import get_combine_datetime - if save: - posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) - if not self.posting_datetime or self.posting_datetime != posting_datetime: - self.db_set("posting_datetime", posting_datetime) - else: - self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) + self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time) def validate_inventory_dimension_negative_stock(self): if self.is_cancelled or self.actual_qty >= 0: @@ -173,7 +169,6 @@ class StockLedgerEntry(Document): return inv_dimension_dict def on_submit(self): - self.set_posting_datetime(save=True) self.check_stock_frozen_date() # Added to handle few test cases where serial_and_batch_bundles are not required diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py index 05639ca6439ccebcc231ae7da143a37e5dcab3cd..9cadf5f65bdb5199f4f60a41acd404175eede1d4 100644 --- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py @@ -1242,6 +1242,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin): } ) + doc.set_posting_datetime() doc.flags.ignore_permissions = True doc.flags.ignore_mandatory = True doc.flags.ignore_links = True diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 2d870c2582f44639d15252c19cb62c41e5f9012a..336f777ef32d0f6e8f579f6df20fdf8fda4afb6d 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -224,7 +224,6 @@ def make_entry(args, allow_negative_stock=False, via_landed_cost_voucher=False): sle.flags.ignore_permissions = 1 sle.allow_negative_stock = allow_negative_stock sle.via_landed_cost_voucher = via_landed_cost_voucher - sle.set_posting_datetime() sle.submit() # Added to handle the case when the stock ledger entry is created from the repostig