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-09-10 16:41:39 +05:30
committed by GitHub
parent bb41d8bc47
commit 6f2a567c95
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@@ -9,11 +9,8 @@ from collections import defaultdict
import frappe import frappe
from frappe.tests.utils import FrappeTestCase, change_settings from frappe.tests.utils import FrappeTestCase, change_settings
from frappe.utils import add_days, cint, cstr, flt, today from frappe.utils import add_days, cint, cstr, flt, today
<<<<<<< HEAD
from six import iteritems from six import iteritems
=======
from pypika import functions as fn from pypika import functions as fn
>>>>>>> a03b4ce213 (fix: reposting not working for internal transferred purchase receipt)
import erpnext import erpnext
from erpnext.accounts.doctype.account.test_account import get_inventory_account from erpnext.accounts.doctype.account.test_account import get_inventory_account