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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-01-14 18:36:27 +05:30
committed by GitHub
parent 9ee5651848
commit 1c6fe9da3b
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@@ -2406,12 +2406,6 @@ class TestDeliveryNote(FrappeTestCase):
if row.item_code == serial_item.name: if row.item_code == serial_item.name:
self.assertTrue(row.serial_no) self.assertTrue(row.serial_no)
<<<<<<< HEAD
=======
if row.item_code == batch_serial_item.name:
self.assertTrue(row.batch_no)
self.assertTrue(row.serial_no)
def test_delivery_note_return_for_batch_item_with_different_warehouse(self): def test_delivery_note_return_for_batch_item_with_different_warehouse(self):
from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return
from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
@@ -2482,7 +2476,6 @@ class TestDeliveryNote(FrappeTestCase):
for d in bundle_data: for d in bundle_data:
self.assertEqual(d.incoming_rate, batch_no_valuation[d.batch_no]) self.assertEqual(d.incoming_rate, batch_no_valuation[d.batch_no])
>>>>>>> 3a2e816759 (fix: incorrect valuation for sales return with different warhouse)
def create_delivery_note(**args): def create_delivery_note(**args):
dn = frappe.new_doc("Delivery Note") dn = frappe.new_doc("Delivery Note")