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

fix: Linting Issues

Browse Source 
(cherry picked from commit e7e2ce1271)

# 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-09 11:36:57 +05:30
committed by Mergify
parent 981c25375f
commit 2ffb76a374
2 changed files with 11 additions and 2 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

@@ -5,7 +5,11 @@
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
<<<<<<< HEAD
from frappe.utils import cint, flt, getdate from frappe.utils import cint, flt, getdate
=======
from frappe.utils import cint, getdate
>>>>>>> e7e2ce1271 (fix: Linting Issues)
class TaxWithholdingCategory(Document): class TaxWithholdingCategory(Document):

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

@@ -3,6 +3,7 @@
import frappe import frappe
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
def execute(): def execute():
@@ -27,8 +28,12 @@ def execute():
"Tax Withholding Rate", rate.name, {"from_date": from_date, "to_date": to_date} "Tax Withholding Rate", rate.name, {"from_date": from_date, "to_date": to_date}
) )
======= =======
=======
>>>>>>> e7e2ce1271 (fix: Linting Issues)
from erpnext.accounts.utils import get_fiscal_year 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')