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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2012-10-10 12:23:36 +02:00
commit 633ef45de8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/journal_voucher/journal_voucher.py
View File

@ -385,7 +385,7 @@ class DocType:
get_obj(dt='GL Control').make_gl_entries(self.doc, self.doclist, cancel=1) get_obj(dt='GL Control').make_gl_entries(self.doc, self.doclist, cancel=1)
def check_tds_payment_voucher(self): def check_tds_payment_voucher(self):
tdsp = sql("select parent from `tabTDS Payment Detail` where voucher_no = '%s' and docstatus = 1 and parent not like 'old%'") tdsp = sql("select parent from `tabTDS Payment Detail` where voucher_no = %s and docstatus = 1 and parent not like 'old%'", self.doc.name)
if tdsp: if tdsp:
msgprint("TDS Payment voucher '%s' has been made against this voucher. Please cancel the payment voucher to proceed." % (tdsp and tdsp[0][0] or '')) msgprint("TDS Payment voucher '%s' has been made against this voucher. Please cancel the payment voucher to proceed." % (tdsp and tdsp[0][0] or ''))
raise Exception raise Exception

4
patches/patch_list.py
View File

@ -635,4 +635,8 @@ patch_list = [
'patch_module': 'patches.october_2012', 'patch_module': 'patches.october_2012',
'patch_file': 'remove_old_trial_bal', 'patch_file': 'remove_old_trial_bal',
}, },
{
'patch_module': 'patches.october_2012',
'patch_file': 'fix_cancelled_gl_entries',
},
] ]