nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-17 02:26:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve conflicts

Browse Source
This commit is contained in:
Sudharsanan11
2026-09-09 10:38:11 +05:30
parent 10987b11cc
commit 00729a8d62
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -3,12 +3,8 @@
from frappe.permissions import add_user_permission, remove_user_permission from frappe.permissions import add_user_permission, remove_user_permission
<<<<<<< HEAD
from frappe.tests.utils import FrappeTestCase, change_settings from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, cstr, flt, get_time, getdate, nowtime, today
=======
from frappe.utils import add_days, cstr, flt, get_time, getdate, nowdate, nowtime, today from frappe.utils import add_days, cstr, flt, get_time, getdate, nowdate, nowtime, today
>>>>>>> b603581 (fix(stock): distribute additional costs when incoming items have no value)
from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.controllers.accounts_controller import InvalidQtyError from erpnext.controllers.accounts_controller import InvalidQtyError