nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge Conflicts in test_shopping_cart imports

Browse Source
This commit is contained in:
Marica
2022-03-10 14:49:05 +05:30
committed by GitHub
parent 62b50b6b63
commit aec1916a0f
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/e_commerce/shopping_cart/test_shopping_cart.py
View File

@@ -5,12 +5,9 @@
import unittest import unittest
import frappe import frappe
<<<<<<< HEAD
from frappe.utils import add_months, nowdate
=======
from frappe.tests.utils import change_settings from frappe.tests.utils import change_settings
from frappe.utils import add_months, cint, nowdate from frappe.utils import add_months, cint, nowdate
>>>>>>> a13e06156b (fix: 'save_quotations_as_draft' checkbox not honoured)
from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule from erpnext.accounts.doctype.tax_rule.tax_rule import ConflictingTaxRule
from erpnext.e_commerce.doctype.website_item.website_item import make_website_item from erpnext.e_commerce.doctype.website_item.website_item import make_website_item