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

fix in fiscal year validation

Browse Source
This commit is contained in:
Anand Doshi 2012-12-10 18:06:14 +05:30
parent c9d9bf3a58
commit 50a19b578c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
selling/doctype/sales_common/sales_common.py
View File

@ -17,12 +17,12 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import webnotes import webnotes
from webnotes.utils import add_days, cint, cstr, default_fields, flt, getdate, now, nowdate from webnotes.utils import add_days, cint, cstr, default_fields, flt, getdate, now, nowdate, formatdate
from webnotes.model import db_exists from webnotes.model import db_exists
from webnotes.model.doc import addchild from webnotes.model.doc import addchild
from webnotes.model.wrapper import getlist, copy_doclist from webnotes.model.wrapper import getlist, copy_doclist
from webnotes.model.code import get_obj from webnotes.model.code import get_obj
from webnotes import form, msgprint from webnotes import form, msgprint, _
get_value = webnotes.conn.get_value get_value = webnotes.conn.get_value
@ -604,14 +604,15 @@ class DocType(TransactionBase):
exact_outstanding = flt(tot_outstanding) + flt(grand_total) exact_outstanding = flt(tot_outstanding) + flt(grand_total)
get_obj('Account',acc_head[0][0]).check_credit_limit(acc_head[0][0], obj.doc.company, exact_outstanding) get_obj('Account',acc_head[0][0]).check_credit_limit(acc_head[0][0], obj.doc.company, exact_outstanding)
def validate_fiscal_year(self,fiscal_year,transaction_date,dn): def validate_fiscal_year(self, fiscal_year, transaction_date, label):
fy=webnotes.conn.sql("select year_start_date from `tabFiscal Year` where name='%s'"%fiscal_year) from accounts.utils import get_fiscal_year
ysd=fy and fy[0][0] or "" if get_fiscal_year(transaction_date)[0] != fiscal_year:
yed=add_days(str(ysd),365) msgprint(("%(label)s '%(posting_date)s': " + _("not within Fiscal Year") + \
if str(transaction_date) < str(ysd) or str(transaction_date) > str(yed): ": '%(fiscal_year)s'") % {
msgprint("%s not within the fiscal year"%(dn)) "label": label,
raise Exception "posting_date": formatdate(transaction_date),
"fiscal_year": fiscal_year
}, raise_exception=1)
# get against document date self.prevdoc_date_field # get against document date self.prevdoc_date_field
#----------------------------- #-----------------------------