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

Reference / Cheque date is after due date

Browse Source
This commit is contained in:
Nabin Hait 2014-11-10 14:57:33 +05:30
parent 1582a0ce78
commit 6c1011df92
1 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
erpnext/accounts/doctype/journal_voucher/journal_voucher.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import cint, cstr, flt, fmt_money, formatdate, getdate from frappe.utils import cstr, flt, fmt_money, formatdate, getdate
from frappe import msgprint, _, scrub from frappe import msgprint, _, scrub
from erpnext.setup.utils import get_company_currency from erpnext.setup.utils import get_company_currency
@ -13,10 +13,6 @@ from erpnext.controllers.accounts_controller import AccountsController
class JournalVoucher(AccountsController): class JournalVoucher(AccountsController):
def __init__(self, arg1, arg2=None): def __init__(self, arg1, arg2=None):
super(JournalVoucher, self).__init__(arg1, arg2) super(JournalVoucher, self).__init__(arg1, arg2)
self.master_type = {}
self.credit_days_for = {}
self.credit_days_global = -1
self.is_approving_authority = -1
def validate(self): def validate(self):
if not self.is_opening: if not self.is_opening:
@ -40,7 +36,7 @@ class JournalVoucher(AccountsController):
def on_submit(self): def on_submit(self):
if self.voucher_type in ['Bank Voucher', 'Contra Voucher', 'Journal Entry']: if self.voucher_type in ['Bank Voucher', 'Contra Voucher', 'Journal Entry']:
self.check_credit_days() self.check_reference_date()
self.make_gl_entries() self.make_gl_entries()
self.check_credit_limit() self.check_credit_limit()
self.update_advance_paid() self.update_advance_paid()
@ -309,43 +305,18 @@ class JournalVoucher(AccountsController):
from frappe.utils import money_in_words from frappe.utils import money_in_words
self.total_amount_in_words = money_in_words(amt, company_currency) self.total_amount_in_words = money_in_words(amt, company_currency)
def check_credit_days(self): def check_reference_date(self):
if self.cheque_date: if self.cheque_date:
for d in self.get("entries"): for d in self.get("entries"):
if flt(d.credit) > 0 and d.against_invoice \ due_date = None
and frappe.db.get_value("Account", d.account, "master_type")=='Customer': if d.against_invoice and flt(d.credit) > 0:
posting_date = frappe.db.get_value("Sales Invoice", d.against_invoice, "posting_date") due_date = frappe.db.get_value("Sales Invoice", d.against_invoice, "due_date")
credit_days = self.get_credit_days_for(d.account) elif d.against_voucher and flt(d.debit) > 0:
if credit_days: due_date = frappe.db.get_value("Purchase Invoice", d.against_voucher, "due_date")
date_diff = (getdate(self.cheque_date) - getdate(posting_date)).days
if date_diff > flt(credit_days):
msgprint(_("Note: Reference Date exceeds allowed credit days by {0} days for {1}")
.format(date_diff - flt(credit_days), d.account))
if not self.get_authorized_user():
raise frappe.ValidationError
def get_credit_days_for(self, ac): if due_date and getdate(self.cheque_date) > getdate(due_date):
if not self.credit_days_for.has_key(ac): msgprint(_("Note: Reference Date {0} is after invoice due date {1}")
self.credit_days_for[ac] = cint(frappe.db.get_value("Account", ac, "credit_days")) .format(formatdate(self.cheque_date), formatdate(due_date)))
if not self.credit_days_for[ac]:
if self.credit_days_global==-1:
self.credit_days_global = cint(frappe.db.get_value("Company", self.company, "credit_days"))
return self.credit_days_global
else:
return self.credit_days_for[ac]
def get_authorized_user(self):
if self.is_approving_authority==-1:
self.is_approving_authority = 0
approving_authority = frappe.db.get_value("Accounts Settings", None, "credit_controller")
# Check logged-in user is authorized
if approving_authority in frappe.user.get_roles():
self.is_approving_authority = 1
return self.is_approving_authority
def make_gl_entries(self, cancel=0, adv_adj=0): def make_gl_entries(self, cancel=0, adv_adj=0):
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries