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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-12-31 15:55:03 +05:30
parent cf980a1304
commit bcd3b36821
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/taxes_and_totals.py
View File

@@ -18,12 +18,7 @@ from erpnext.controllers.accounts_controller import (
validate_inclusive_tax, validate_inclusive_tax,
validate_taxes_and_charges, validate_taxes_and_charges,
) )
<<<<<<< HEAD from erpnext.stock.get_item_details import _get_item_tax_template, get_item_tax_map
from erpnext.stock.get_item_details import _get_item_tax_template
=======
from erpnext.deprecation_dumpster import deprecated
from erpnext.stock.get_item_details import ItemDetailsCtx, _get_item_tax_template, get_item_tax_map
>>>>>>> de54c0b41f (fix: update item_tax_rate in backend)
from erpnext.utilities.regional import temporary_flag from erpnext.utilities.regional import temporary_flag