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

Jump to bottom

fix: Added TDS Payable account number and an error message #24065

Merged
merged 7 commits into from
Dec 7, 2020
Merged

fix: Added TDS Payable account number and an error message #24065

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2e4faf9
fix: Added TDS Payable account number and an error message
Anuja-pawar Dec 5, 2020
d3157c9
Merge branch 'develop' of https://github.com/frappe/erpnext into comp…
Anuja-pawar Dec 5, 2020
b6cf75d
fix: error messsage indent fix
Anuja-pawar Dec 5, 2020
6227c1e
Merge branch 'develop' into company_fiscal_year_fix
Anuja-pawar Dec 5, 2020
47b4b70
Merge branch 'develop' of https://github.com/frappe/erpnext into comp…
Anuja-pawar Dec 7, 2020
550cb9c
fix: suggested changes
Anuja-pawar Dec 7, 2020
276a729
Merge branch 'company_fiscal_year_fix' of https://github.com/Anuja-pa…
Anuja-pawar Dec 7, 2020
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
3 changes: 3 additions & 0 deletions ...type/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ def get():
"account_number": "2200"
},
_("Duties and Taxes"): {
_("TDS Payable"): {
"account_number": "2310"
},
"account_type": "Tax",
"is_group": 1,
"account_number": "2300"
Expand Down
5 changes: 4 additions & 1 deletion erpnext/accounts/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verb
else:
return ((fy.name, fy.year_start_date, fy.year_end_date),)

error_msg = _("""{0} {1} not in any active Fiscal Year.""").format(label, formatdate(transaction_date))
error_msg = _("""{0} {1} not in any active Fiscal Year""").format(label, formatdate(transaction_date))
marination marked this conversation as resolved.
Show resolved Hide resolved
if company:
error_msg = _("""{0} for {1}""").format(error_msg, company)
marination marked this conversation as resolved.
Show resolved Hide resolved

if verbose==1: frappe.msgprint(error_msg)
raise FiscalYearError(error_msg)

Expand Down