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

fix: conflict

Browse Source
This commit is contained in:
rohitwaghchaure
2022-10-03 13:18:58 +05:30
committed by GitHub
parent 2fd4485f2f
commit 0f8e34e972
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
View File

@@ -7,13 +7,8 @@ import unittest
import frappe import frappe
from frappe.model.dynamic_links import get_dynamic_link_map from frappe.model.dynamic_links import get_dynamic_link_map
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
<<<<<<< HEAD
from frappe.utils import add_days, flt, getdate, nowdate
from six import iteritems from six import iteritems
=======
from frappe.tests.utils import change_settings
from frappe.utils import add_days, flt, getdate, nowdate, today from frappe.utils import add_days, flt, getdate, nowdate, today
>>>>>>> 0b1727cf79 (fix: not able to return sold expired batches)
from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account from erpnext.accounts.doctype.account.test_account import create_account, get_inventory_account
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile