nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-03-02 12:10:43 +05:30
committed by GitHub
parent 6e5738e95c
commit 97df39a630
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -791,22 +791,15 @@ class SerialandBatchBundle(Document):
if not self.voucher_detail_no or self.voucher_detail_no != row.name: if not self.voucher_detail_no or self.voucher_detail_no != row.name:
values_to_set["voucher_detail_no"] = row.name values_to_set["voucher_detail_no"] = row.name
<<<<<<< HEAD
if parent.get("posting_date") and (not self.posting_date or self.posting_date != parent.posting_date): if parent.get("posting_date") and (not self.posting_date or self.posting_date != parent.posting_date):
values_to_set["posting_date"] = parent.posting_date or today() values_to_set["posting_date"] = parent.posting_date or today()
if parent.get("posting_time") and (not self.posting_time or self.posting_time != parent.posting_time): if parent.get("posting_time") and (not self.posting_time or self.posting_time != parent.posting_time):
values_to_set["posting_time"] = parent.posting_time values_to_set["posting_time"] = parent.posting_time
=======
if row.get("doctype") == "Packed Item" and row.get("parent_detail_docname"): if row.get("doctype") == "Packed Item" and row.get("parent_detail_docname"):
values_to_set["voucher_detail_no"] = row.get("parent_detail_docname") values_to_set["voucher_detail_no"] = row.get("parent_detail_docname")
if parent.get("posting_date") and parent.get("posting_time"):
posting_datetime = combine_datetime(parent.posting_date, parent.posting_time)
if not self.posting_datetime or self.posting_datetime != posting_datetime:
values_to_set["posting_datetime"] = posting_datetime
>>>>>>> c37a56ec89 (fix: voucher detail no in SABB)
if parent.doctype in [ if parent.doctype in [
"Delivery Note", "Delivery Note",
"Purchase Receipt", "Purchase Receipt",