nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
Diptanil Saha
2025-12-02 17:14:00 +05:30
committed by GitHub
parent e5457f8bb7
commit 0458c548ec
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/accounts/doctype/pos_invoice/pos_invoice.py
View File

@@ -21,11 +21,12 @@ from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
from erpnext.stock.stock_ledger import is_negative_stock_allowed from erpnext.stock.stock_ledger import is_negative_stock_allowed
<<<<<<< HEAD
class PartialPaymentValidationError(frappe.ValidationError): class PartialPaymentValidationError(frappe.ValidationError):
======= pass
class ProductBundleStockValidationError(frappe.ValidationError): class ProductBundleStockValidationError(frappe.ValidationError):
>>>>>>> 2612152456 (test(pos): add test for product bundle negative stock validation)
pass pass