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

fix: conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2022-05-31 12:21:29 +05:30
parent 2c26ab599a
commit cdb884bbf2
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/regional/india/utils.py
View File

@@ -5,10 +5,6 @@ import re
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.utils import get_fetch_values from frappe.model.utils import get_fetch_values
<<<<<<< HEAD
from frappe.utils import cint, cstr, date_diff, flt, getdate, nowdate
from six import string_types
=======
from frappe.utils import ( from frappe.utils import (
add_days, add_days,
cint, cint,
@@ -19,7 +15,7 @@ from frappe.utils import (
getdate, getdate,
month_diff, month_diff,
) )
>>>>>>> 34925a3a8c (fix: HRA Exemption calculation in case of multiple salary structure assignments) from six import string_types
from erpnext.controllers.accounts_controller import get_taxes_and_charges from erpnext.controllers.accounts_controller import get_taxes_and_charges
from erpnext.controllers.taxes_and_totals import get_itemised_tax, get_itemised_taxable_amount from erpnext.controllers.taxes_and_totals import get_itemised_tax, get_itemised_taxable_amount