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

fix in get_fiscal_year

Browse Source
This commit is contained in:
Anand Doshi 2012-10-05 19:29:11 +05:30
parent de4aee7ffa
commit bbe2403491
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
accounts/utils/__init__.py
View File

@ -21,14 +21,17 @@ from webnotes.utils import nowdate
def get_fiscal_year(date): def get_fiscal_year(date):
from webnotes.utils import formatdate from webnotes.utils import formatdate
# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
fy = webnotes.conn.sql("""select name, year_start_date, fy = webnotes.conn.sql("""select name, year_start_date,
adddate(year_start_date, interval 1 year) subdate(adddate(year_start_date, interval 1 year), interval 1 day)
as year_end_date
from `tabFiscal Year` from `tabFiscal Year`
where %s between year_start_date and adddate(year_start_date, where %s >= year_start_date and %s < adddate(year_start_date, interval 1 year)""",
interval 1 year)""", date) (date, date))
if not fy: if not fy:
webnotes.msgprint("""%s not in any Fiscal Year""" % formatdate(date), raise_exception=1) webnotes.msgprint("""%s not in any Fiscal Year""" % formatdate(date),
raise_exception=1)
return fy[0] return fy[0]