Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix : Get LTDS based on tax withholding category (backport #28071) #28128

Merged
merged 4 commits into from
Oct 29, 2021
Merged

fix : Get LTDS based on tax withholding category (backport #28071) #28128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9c3d3f
fix: Get LTDS based on tax withholding category
deepeshgarg007 Oct 23, 2021
1ba0111
fix: Replace section code with tax withholding category in LDC
deepeshgarg007 Oct 23, 2021
7a25d5f
fix: Rewrite patch using query builder
deepeshgarg007 Oct 28, 2021
4019148
fix: Resolve conflicts
deepeshgarg007 Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ def get_lower_deduction_certificate(tax_details, pan_no):
ldc_name = frappe.db.get_value('Lower Deduction Certificate',
{
'pan_no': pan_no,
'tax_withholding_category': tax_details.tax_withholding_category,
'valid_from': ('>=', tax_details.from_date),
'valid_upto': ('<=', tax_details.to_date)
}, 'name')
Expand Down
1 change: 1 addition & 0 deletions erpnext/patches.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,4 @@ erpnext.patches.v13_0.enable_scheduler_job_for_item_reposting
erpnext.patches.v13_0.requeue_failed_reposts
erpnext.patches.v13_0.fetch_thumbnail_in_website_items
erpnext.patches.v12_0.update_production_plan_status
erpnext.patches.v13_0.update_category_in_ltds_certificate
18 changes: 18 additions & 0 deletions erpnext/patches/v13_0/update_category_in_ltds_certificate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import frappe


def execute():
company = frappe.get_all('Company', filters = {'country': 'India'})
if not company:
return

ldc = frappe.qb.DocType("Lower Deduction Certificate").as_("ldc")
supplier = frappe.qb.DocType("Supplier")

frappe.qb.update(ldc).inner_join(supplier).on(
ldc.supplier == supplier.name
).set(
ldc.tax_withholding_category, supplier.tax_withholding_category
).where(
ldc.tax_withholding_category.isnull()
).run()
20 changes: 11 additions & 9 deletions erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"engine": "InnoDB",
"field_order": [
"certificate_details_section",
"section_code",
"tax_withholding_category",
"fiscal_year",
"column_break_3",
"certificate_no",
Expand All @@ -33,13 +33,6 @@
"reqd": 1,
"unique": 1
},
{
"fieldname": "section_code",
"fieldtype": "Select",
"label": "Section Code",
"options": "192\n193\n194\n194A\n194C\n194D\n194H\n194I\n194J\n194LA\n194LBB\n194LBC\n195",
"reqd": 1
},
{
"fieldname": "section_break_3",
"fieldtype": "Section Break",
Expand Down Expand Up @@ -123,13 +116,22 @@
"label": "Fiscal Year",
"options": "Fiscal Year",
"reqd": 1
},
{
"fieldname": "tax_withholding_category",
"fieldtype": "Link",
"label": "Tax Withholding Category",
"options": "Tax Withholding Category",
"reqd": 1
}
],
"index_web_pages_for_search": 1,
"links": [],
"modified": "2020-04-23 23:04:41.203721",
"modified": "2021-10-23 18:33:38.962622",
"modified_by": "Administrator",
"module": "Regional",
"name": "Lower Deduction Certificate",
"naming_rule": "By fieldname",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
Expand Down
12 changes: 7 additions & 5 deletions erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class LowerDeductionCertificate(Document):
def validate(self):
self.validate_dates()
self.validate_supplier_against_section_code()
self.validate_supplier_against_tax_category()

def validate_dates(self):
if getdate(self.valid_upto) < getdate(self.valid_from):
Expand All @@ -31,12 +31,14 @@ def validate_dates(self):
<= fiscal_year.year_end_date):
frappe.throw(_("Valid Upto date not in Fiscal Year {0}").format(frappe.bold(self.fiscal_year)))

def validate_supplier_against_section_code(self):
duplicate_certificate = frappe.db.get_value('Lower Deduction Certificate', {'supplier': self.supplier, 'section_code': self.section_code}, ['name', 'valid_from', 'valid_upto'], as_dict=True)
def tax_withholding_category(self):
duplicate_certificate = frappe.db.get_value('Lower Deduction Certificate',
{'supplier': self.supplier, 'tax_withholding_category': self.tax_withholding_category, 'name': ("!=", self.name)},
['name', 'valid_from', 'valid_upto'], as_dict=True)
if duplicate_certificate and self.are_dates_overlapping(duplicate_certificate):
certificate_link = get_link_to_form('Lower Deduction Certificate', duplicate_certificate.name)
frappe.throw(_("There is already a valid Lower Deduction Certificate {0} for Supplier {1} against Section Code {2} for this time period.")
.format(certificate_link, frappe.bold(self.supplier), frappe.bold(self.section_code)))
frappe.throw(_("There is already a valid Lower Deduction Certificate {0} for Supplier {1} against category {2} for this time period.")
.format(certificate_link, frappe.bold(self.supplier), frappe.bold(self.tax_withholding_category)))

def are_dates_overlapping(self,duplicate_certificate):
valid_from = duplicate_certificate.valid_from
Expand Down