nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2023-03-04 15:04:50 +05:30
parent 9bea2fcdfc
commit 14547d94b3
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -393,9 +393,6 @@ def make_return_doc(doctype: str, source_name: str, target_doc=None):
if serial_nos: if serial_nos:
target_doc.serial_no = "\n".join(serial_nos) target_doc.serial_no = "\n".join(serial_nos)
<<<<<<< HEAD
if doctype == "Purchase Receipt":
=======
if source_doc.get("rejected_serial_no"): if source_doc.get("rejected_serial_no"):
returned_serial_nos = get_returned_serial_nos( returned_serial_nos = get_returned_serial_nos(
source_doc, source_parent, serial_no_field="rejected_serial_no" source_doc, source_parent, serial_no_field="rejected_serial_no"
@@ -406,8 +403,7 @@ def make_return_doc(doctype: str, source_name: str, target_doc=None):
if rejected_serial_nos: if rejected_serial_nos:
target_doc.rejected_serial_no = "\n".join(rejected_serial_nos) target_doc.rejected_serial_no = "\n".join(rejected_serial_nos)
if doctype in ["Purchase Receipt", "Subcontracting Receipt"]: if doctype == "Purchase Receipt":
>>>>>>> a9f0a11ce6 (fix: `rejected_serial_no` not getting copied from PR to PR(Return))
returned_qty_map = get_returned_qty_map_for_row( returned_qty_map = get_returned_qty_map_for_row(
source_parent.name, source_parent.supplier, source_doc.name, doctype source_parent.name, source_parent.supplier, source_doc.name, doctype
) )