nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2024-03-16 15:01:46 +05:30
parent f87f284616
commit 9d827e84be
2 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/selling/doctype/sales_order/test_sales_order.py
View File

@@ -2225,13 +2225,8 @@ def make_sales_order(**args):
return so return so
<<<<<<< HEAD
def create_dn_against_so(so, delivered_qty=0):
frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
=======
def create_dn_against_so(so, delivered_qty=0, do_not_submit=False): def create_dn_against_so(so, delivered_qty=0, do_not_submit=False):
frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1) frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
>>>>>>> 4f396d3049 (test: SO reference validation)
dn = make_delivery_note(so) dn = make_delivery_note(so)
dn.get("items")[0].qty = delivered_qty or 5 dn.get("items")[0].qty = delivered_qty or 5

33
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@@ -196,38 +196,6 @@ class DeliveryNote(SellingController):
] ]
) )
<<<<<<< HEAD
=======
def set_serial_and_batch_bundle_from_pick_list(self):
from erpnext.stock.serial_batch_bundle import SerialBatchCreation
if not self.pick_list:
return
for item in self.items:
if item.pick_list_item and not item.serial_and_batch_bundle:
filters = {
"item_code": item.item_code,
"voucher_type": "Pick List",
"voucher_no": self.pick_list,
"voucher_detail_no": item.pick_list_item,
}
bundle_id = frappe.db.get_value("Serial and Batch Bundle", filters, "name")
if bundle_id:
cls_obj = SerialBatchCreation(
{
"type_of_transaction": "Outward",
"serial_and_batch_bundle": bundle_id,
"item_code": item.get("item_code"),
}
)
cls_obj.duplicate_package()
item.serial_and_batch_bundle = cls_obj.serial_and_batch_bundle
def validate_references(self): def validate_references(self):
self.validate_sales_order_references() self.validate_sales_order_references()
self.validate_sales_invoice_references() self.validate_sales_invoice_references()
@@ -280,7 +248,6 @@ class DeliveryNote(SellingController):
if err_msg: if err_msg:
frappe.throw(err_msg, title=_("References to Sales Invoices are Incomplete")) frappe.throw(err_msg, title=_("References to Sales Invoices are Incomplete"))
>>>>>>> 4d090bd3b8 (refactor: validate SO and SI references)
def validate_proj_cust(self): def validate_proj_cust(self):
"""check for does customer belong to same project as entered..""" """check for does customer belong to same project as entered.."""
if self.project and self.customer: if self.project and self.customer: