nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 13:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update journal_voucher.py

Browse Source
This commit is contained in:
Nabin Hait
2014-10-10 18:19:03 +05:30
parent c0a3cd603b
commit 79ed124939
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,14 +76,14 @@ class JournalVoucher(AccountsController):
def validate_entries_for_advance(self): def validate_entries_for_advance(self):
for d in self.get('entries'): for d in self.get('entries'):
if not (d.against_voucher and d.against_invoice and d.against_jv) and d.is_advance in ["", "No"]: if not (d.against_voucher and d.against_invoice and d.against_jv):
master_type = frappe.db.get_value("Account", d.account, "master_type") master_type = frappe.db.get_value("Account", d.account, "master_type")
if (master_type == 'Customer' and flt(d.credit) > 0) or \ if (master_type == 'Customer' and flt(d.credit) > 0) or \
(master_type == 'Supplier' and flt(d.debit) > 0): (master_type == 'Supplier' and flt(d.debit) > 0):
msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this \ if not d.is_advance:
is an advance entry.").format(d.idx, d.account)) msgprint(_("Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.").format(d.idx, d.account))
if d.against_sales_order or d.against_purchase_order: elif (d.against_sales_order or d.against_purchase_order) and d.is_advance != "Yes":
raise frappe.ValidationError frappe.throw(_("Row {0}: Payment against Sales/Purchase Order should always be marked as advance").format(d.idx))
def validate_against_jv(self): def validate_against_jv(self):
for d in self.get('entries'): for d in self.get('entries'):