Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38126 from frappe/mergify/bp/version-15-hotfix/pr-38090

Browse Source 
fix(dn): regression from bulk transaction fix (#38090)
This commit is contained in:
Deepesh Garg 2023-11-16 13:00:44 +05:30 committed by GitHub
commit 32039d4de1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -767,8 +767,11 @@ def make_delivery_note(source_name, target_doc=None, kwargs=None):
if target.company_address:
target.update(get_fetch_values("Delivery Note", "company_address", target.company_address))
# set target items names to ensure proper linking with packed_items
target.set_new_name()
# if invoked in bulk creation, validations are ignored and thus this method is nerver invoked
if frappe.flags.bulk_transaction:
# set target items names to ensure proper linking with packed_items
target.set_new_name()
make_packing_list(target)
def condition(doc):

2
erpnext/utilities/bulk_transaction.py
View File

@ -141,6 +141,7 @@ def task(doc_name, from_doctype, to_doctype):
},
"Purchase Receipt": {"Purchase Invoice": purchase_receipt.make_purchase_invoice},
}
frappe.flags.bulk_transaction = True
if to_doctype in ["Payment Entry"]:
obj = mapper[from_doctype][to_doctype](from_doctype, doc_name)
else:
@ -149,6 +150,7 @@ def task(doc_name, from_doctype, to_doctype):
obj.flags.ignore_validate = True
obj.set_title_field()
obj.insert(ignore_mandatory=True)
del frappe.flags.bulk_transaction
def create_log(doc_name, e, from_doctype, to_doctype, status, log_date=None, restarted=0):