Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update utils.py

Browse Source
This commit is contained in:
Nabin Hait 2015-05-20 12:53:04 +05:30
parent 90a51225a4
commit a7bd8ee34b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/utils.py
View File

@ -20,9 +20,9 @@ def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verb
# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
cond = " ifnull(disabled, 0) = 0"
if fiscal_year:
cond = " and fy.name = %(fiscal_year)s"
cond += " and fy.name = %(fiscal_year)s"
else:
cond = " and %(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
cond += " and %(transaction_date)s >= fy.year_start_date and %(transaction_date)s <= fy.year_end_date"
if company:
cond += """ and (not exists(select name from `tabFiscal Year Company` fyc where fyc.parent = fy.name)