nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ljain112
2026-04-22 16:22:34 +05:30
parent eb9bf0c2cc
commit 355b47cf3c
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/report/purchase_register/test_purchase_register.py
View File

@@ -6,11 +6,7 @@ from frappe.tests.utils import FrappeTestCase
from frappe.utils import add_months, today from frappe.utils import add_months, today
from erpnext.accounts.report.purchase_register.purchase_register import execute from erpnext.accounts.report.purchase_register.purchase_register import execute
<<<<<<< HEAD
=======
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
from erpnext.tests.utils import ERPNextTestSuite
>>>>>>> 3aeb7d6b01 (fix(purchase_register): filter tax rows by parenttype in invoice tax map query)
class TestPurchaseRegister(FrappeTestCase): class TestPurchaseRegister(FrappeTestCase):

4
erpnext/accounts/report/sales_register/test_sales_register.py
View File

@@ -5,11 +5,7 @@ from frappe.utils import getdate, today
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.accounts.report.sales_register.sales_register import execute from erpnext.accounts.report.sales_register.sales_register import execute
from erpnext.accounts.test.accounts_mixin import AccountsTestMixin from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
<<<<<<< HEAD
=======
from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
from erpnext.tests.utils import ERPNextTestSuite
>>>>>>> 3aeb7d6b01 (fix(purchase_register): filter tax rows by parenttype in invoice tax map query)
class TestItemWiseSalesRegister(AccountsTestMixin, FrappeTestCase): class TestItemWiseSalesRegister(AccountsTestMixin, FrappeTestCase):