pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: merging from the branch https://bugs.launchpad.net/openobject-addons/+bug/522011

Browse Source 
bzr revid: mga@tinyerp.com-20100215062847-q4z0nr7bidckhmmh
This commit is contained in:
Mantavya Gajjar
2010-02-15 11:58:47 +05:30
parent af003ddfa0
commit ba65e11add
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_voucher/voucher.py
+6 -3
View File
@@ -171,8 +171,11 @@ class account_voucher(osv.osv):
total=0
for i in obj[0].payment_ids:
total+=i.amount
self.write(cr,uid,ids,{'amount':total})
self.write(cr, uid, ids, {'state':'proforma'})
if total!=0:
self.write(cr,uid,ids,{'amount':total})
self.write(cr, uid, ids, {'state':'proforma'})
else:
raise osv.except_osv('Invalid action !', 'You can not post to Pro-Forma a voucher with Total amount = 0')
return True
def proforma_voucher(self, cr, uid, ids, context={}):
@@ -197,7 +200,7 @@ class account_voucher(osv.osv):
if t['state'] in ('draft', 'cancel'):
unlink_ids.append(t['id'])
else:
raise osv.except_osv('Invalid action !', 'Cannot delete invoice(s) which are already opened or paid !')
raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !')
osv.osv.unlink(self, cr, uid, unlink_ids)
return True