schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2022-12-30 14:35:12 +05:30
committed by GitHub
parent 1c7c591ee2
commit 8521e12753
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

@@ -5,12 +5,8 @@
import frappe
from frappe.permissions import add_user_permission, remove_user_permission
from frappe.tests.utils import FrappeTestCase, change_settings
<<<<<<< HEAD
from frappe.utils import add_days, flt, now, nowdate, nowtime, today
from six import iteritems
=======
from frappe.utils import add_days, flt, nowdate, nowtime, today
>>>>>>> 728dc1acf4 (Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation")
from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.stock.doctype.item.test_item import (