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

fix: Linting and patch fixes

Browse Source 
(cherry picked from commit b6d0b17ed6)

# Conflicts:
#	erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
#	erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
This commit is contained in:
Deepesh Garg
2021-09-01 10:11:18 +05:30
committed by Mergify
parent a9a97fa1ef
commit 35b3bc4e71
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
View File

@@ -24,6 +24,7 @@ class TaxWithholdingCategory(Document):
frappe.throw(_("Row #{0}: From Date cannot be before To Date").format(d.idx)) frappe.throw(_("Row #{0}: From Date cannot be before To Date").format(d.idx))
# validate overlapping of dates # validate overlapping of dates
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
if last_date and getdate(d.to_date) < getdate(last_date): if last_date and getdate(d.to_date) < getdate(last_date):
frappe.throw(_("Row #{0}: Dates overlapping with other row").format(d.idx)) frappe.throw(_("Row #{0}: Dates overlapping with other row").format(d.idx))
@@ -41,6 +42,9 @@ class TaxWithholdingCategory(Document):
======= =======
if last_date and getdate(r.to_date) < getdate(last_date): if last_date and getdate(r.to_date) < getdate(last_date):
=======
if last_date and getdate(d.to_date) < getdate(last_date):
>>>>>>> b6d0b17ed6 (fix: Linting and patch fixes)
frappe.throw(_("Row #{0}: Dates overlapping with other row").format(d.idx)) frappe.throw(_("Row #{0}: Dates overlapping with other row").format(d.idx))
def validate_thresholds(self): def validate_thresholds(self):

23
erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
View File

@@ -31,18 +31,27 @@ from erpnext.accounts.utils import get_fiscal_year
def execute(): def execute():
frappe.reload_doc('accounts', 'doctype', 'Tax Withholding Rate') frappe.reload_doc('accounts', 'doctype', 'Tax Withholding Rate')
tds_category_rates = frappe.get_all('Tax Withholding Rate', fields=['name', 'fiscal_year'])
fiscal_year_map = {} if frappe.db.has_column('Tax Withholding Rate', 'fiscal_year'):
for rate in tds_category_rates: tds_category_rates = frappe.get_all('Tax Withholding Rate', fields=['name', 'fiscal_year'])
if not fiscal_year_map.get(rate.fiscal_year):
fiscal_year_map[rate.fiscal_year] = get_fiscal_year(fiscal_year=rate.fiscal_year)
from_date = fiscal_year_map.get(rate.fiscal_year)[1] fiscal_year_map = {}
to_date = fiscal_year_map.get(rate.fiscal_year)[2] for rate in tds_category_rates:
if not fiscal_year_map.get(rate.fiscal_year):
fiscal_year_map[rate.fiscal_year] = get_fiscal_year(fiscal_year=rate.fiscal_year)
<<<<<<< HEAD
frappe.db.set_value('Tax Withholding Rate', rate.name, { frappe.db.set_value('Tax Withholding Rate', rate.name, {
'from_date': from_date, 'from_date': from_date,
'to_date': to_date 'to_date': to_date
}) })
>>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates) >>>>>>> 5e10e10329 (feat: Validity dates in Tax Withholding Rates)
=======
from_date = fiscal_year_map.get(rate.fiscal_year)[1]
to_date = fiscal_year_map.get(rate.fiscal_year)[2]
frappe.db.set_value('Tax Withholding Rate', rate.name, {
'from_date': from_date,
'to_date': to_date
})
>>>>>>> b6d0b17ed6 (fix: Linting and patch fixes)