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

fix: fix for not having fiscal year while creating new company (#24130)

Browse Source 
* fix: Fiscal year fix while creating new company

* fix: for failing Travis

* fix: suggested changes

Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
This commit is contained in:
Anuja Pawar
2021-01-14 19:24:30 +05:30
committed by GitHub
parent 00981206ad
commit 4569e52b45
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/regional/india/setup.py
View File

@@ -7,7 +7,7 @@ import frappe, os, json
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
from frappe.permissions import add_permission, update_permission_property from frappe.permissions import add_permission, update_permission_property
from erpnext.regional.india import states from erpnext.regional.india import states
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year, FiscalYearError
from frappe.utils import today from frappe.utils import today
def setup(company=None, patch=True): def setup(company=None, patch=True):
@@ -629,15 +629,20 @@ def set_salary_components(docs):
def set_tax_withholding_category(company): def set_tax_withholding_category(company):
accounts = [] accounts = []
fiscal_year = None
abbr = frappe.get_value("Company", company, "abbr") abbr = frappe.get_value("Company", company, "abbr")
tds_account = frappe.get_value("Account", 'TDS Payable - {0}'.format(abbr), 'name') tds_account = frappe.get_value("Account", 'TDS Payable - {0}'.format(abbr), 'name')
if company and tds_account: if company and tds_account:
accounts = [dict(company=company, account=tds_account)] accounts = [dict(company=company, account=tds_account)]
fiscal_year = get_fiscal_year(today(), company=company)[0] try:
docs = get_tds_details(accounts, fiscal_year) fiscal_year = get_fiscal_year(today(), verbose=0, company=company)[0]
except FiscalYearError:
pass
docs = get_tds_details(accounts, fiscal_year)
for d in docs: for d in docs:
try: try:
doc = frappe.get_doc(d) doc = frappe.get_doc(d)
@@ -650,11 +655,14 @@ def set_tax_withholding_category(company):
if accounts: if accounts:
doc.append("accounts", accounts[0]) doc.append("accounts", accounts[0])
# if fiscal year don't match with any of the already entered data, append rate row if fiscal_year:
fy_exist = [k for k in doc.get('rates') if k.get('fiscal_year')==fiscal_year] # if fiscal year don't match with any of the already entered data, append rate row
if not fy_exist: fy_exist = [k for k in doc.get('rates') if k.get('fiscal_year')==fiscal_year]
doc.append("rates", d.get('rates')[0]) if not fy_exist:
doc.append("rates", d.get('rates')[0])
doc.flags.ignore_permissions = True
doc.flags.ignore_mandatory = True
doc.save() doc.save()
def set_tds_account(docs, company): def set_tds_account(docs, company):