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-08-17 14:47:47 +05:30
committed by GitHub
parent 7ee75ff762
commit 41b8563b7a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,12 +5,8 @@
import frappe import frappe
from frappe.permissions import add_user_permission, remove_user_permission from frappe.permissions import add_user_permission, remove_user_permission
from frappe.tests.utils import FrappeTestCase, change_settings from frappe.tests.utils import FrappeTestCase, change_settings
<<<<<<< HEAD
from frappe.utils import add_days, flt, nowdate, nowtime
from six import iteritems
=======
from frappe.utils import add_days, flt, nowdate, nowtime, today from frappe.utils import add_days, flt, nowdate, nowtime, today
>>>>>>> 795c94384a (fix: not able to issue expired batches) from six import iteritems
from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.accounts.doctype.account.test_account import get_inventory_account
from erpnext.stock.doctype.item.test_item import ( from erpnext.stock.doctype.item.test_item import (