mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-15 11:09:17 +00:00
fix: posting date and time
(cherry picked from commit fb6c05f186)
# Conflicts:
# erpnext/stock/serial_batch_bundle.py
This commit is contained in:
committed by
Mergify
parent
48ed07816d
commit
4cfec16f5c
@@ -13,6 +13,7 @@ from erpnext.stock.deprecated_serial_batch import (
|
||||
DeprecatedBatchNoValuation,
|
||||
DeprecatedSerialNoValuation,
|
||||
)
|
||||
from erpnext.stock.utils import get_combine_datetime
|
||||
from erpnext.stock.valuation import round_off_if_near_zero
|
||||
|
||||
CONSUMED_SERIAL_NO_STOCK_ENTRY_PURPOSES = (
|
||||
@@ -1074,9 +1075,19 @@ class SerialBatchCreation:
|
||||
self.__dict__.update(item_details)
|
||||
|
||||
def set_other_details(self):
|
||||
<<<<<<< HEAD
|
||||
if not self.get("posting_date"):
|
||||
self.posting_date = today()
|
||||
self.__dict__["posting_date"] = self.posting_date
|
||||
=======
|
||||
if not self.get("posting_datetime"):
|
||||
if self.get("posting_date") and self.get("posting_time"):
|
||||
self.posting_datetime = get_combine_datetime(self.posting_date, self.posting_time)
|
||||
|
||||
if not self.get("posting_datetime"):
|
||||
self.posting_datetime = now()
|
||||
self.__dict__["posting_datetime"] = self.posting_datetime
|
||||
>>>>>>> fb6c05f186 (fix: posting date and time)
|
||||
|
||||
if not self.get("actual_qty"):
|
||||
qty = self.get("qty") or self.get("total_qty")
|
||||
|
||||
Reference in New Issue
Block a user