[MERGE] OPW 32677: account_voucher: add missing type in 'line_{dr,cr}_ids' fields...

[odoo/odoo.git] / addons / account_voucher / account_voucher.py

diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index a09064c..e0b097f 100644 (file)
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -596,6 +596,7 @@ class account_voucher(osv.osv):
         res = {
             'state':'cancel',
             'move_id':False,
+            'number': ''
         }
         self.write(cr, uid, ids, res)
         return True
@@ -646,10 +647,8 @@ class account_voucher(osv.osv):
                 continue
             context_multi_currency = context.copy()
             context_multi_currency.update({'date': inv.date})
-
-            if inv.number:
-                name = inv.number
-            elif inv.journal_id.sequence_id:
+            
+            if inv.journal_id.sequence_id:
                 name = seq_obj.get_id(cr, uid, inv.journal_id.sequence_id.id)
             if not name:
                 raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal and make sure it is activated !'))