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

chore: fix conflicts

Browse Source 
Refactor test cases for delivery notes to handle negative stock and higher precision.

(cherry picked from commit 5193dbba9b)
This commit is contained in:
rohitwaghchaure
2026-01-08 14:45:39 +05:30
committed by Mergify
parent 21d13859a0
commit 22e5aba02b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2051,7 +2051,6 @@ class TestDeliveryNote(FrappeTestCase):
serial_batch_map[row.item_code].batch_no_valuation[entry.batch_no], serial_batch_map[row.item_code].batch_no_valuation[entry.batch_no],
) )
<<<<<<< HEAD
@change_settings("Stock Settings", {"allow_negative_stock": 0, "enable_stock_reservation": 1}) @change_settings("Stock Settings", {"allow_negative_stock": 0, "enable_stock_reservation": 1})
def test_partial_delivery_note_against_reserved_stock(self): def test_partial_delivery_note_against_reserved_stock(self):
from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import ( from erpnext.stock.doctype.stock_reservation_entry.stock_reservation_entry import (
@@ -2120,7 +2119,7 @@ class TestDeliveryNote(FrappeTestCase):
self.assertEqual(sre_details[0].status, "Partially Delivered") self.assertEqual(sre_details[0].status, "Partially Delivered")
self.assertEqual(sre_details[0].reserved_qty, so.items[0].qty) self.assertEqual(sre_details[0].reserved_qty, so.items[0].qty)
self.assertEqual(sre_details[0].delivered_qty, dn.items[0].qty) self.assertEqual(sre_details[0].delivered_qty, dn.items[0].qty)
=======
def test_negative_stock_with_higher_precision(self): def test_negative_stock_with_higher_precision(self):
original_flt_precision = frappe.db.get_default("float_precision") original_flt_precision = frappe.db.get_default("float_precision")
frappe.db.set_single_value("System Settings", "float_precision", 7) frappe.db.set_single_value("System Settings", "float_precision", 7)
@@ -2137,7 +2136,6 @@ class TestDeliveryNote(FrappeTestCase):
self.assertRaises(frappe.ValidationError, dn.submit) self.assertRaises(frappe.ValidationError, dn.submit)
frappe.db.set_single_value("System Settings", "float_precision", original_flt_precision) frappe.db.set_single_value("System Settings", "float_precision", original_flt_precision)
>>>>>>> 87be020c78 (fix: negative stock issue for higher precision)
>>>>>>> 1bbeecff12 (fix: negative stock issue for higher precision) >>>>>>> 1bbeecff12 (fix: negative stock issue for higher precision)