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

fix: conflict

Browse Source
This commit is contained in:
rohitwaghchaure
2022-12-20 11:55:22 +05:30
committed by GitHub
parent 4587bb3767
commit 7ef0c6bb01
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, today
from six import iteritems
=======
from frappe.utils import add_days, flt, now, nowdate, nowtime, today from frappe.utils import add_days, flt, now, nowdate, nowtime, today
>>>>>>> f31612376a (test: added test case to validate audit for incorrect entries) 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 (