Rename fields '_id' to '_ids', to reflect the change from many2one to many2many

Adapt the YAML test (but it still fails, I don't know why)

bzr revid: alexis@via.ecp.fr-20130207094845-fhawd5jw1409p7pc

diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index d47ee56..f2ab6fd 100644 (file)
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -75,8 +75,13 @@
   I validate this account move by using the 'Post Journal Entries' wizard
 -
   !record {model: validate.account.move, id: validate_account_move_0}:
-    journal_id: account.bank_journal
-    period_id: account.period_6
+    journal_ids:
+      - bank_journal
+      - check_journal
+    period_ids:
+      - period_6
+      - period_7
+      - period_8
 -
   I click on validate Button
 -

diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index ec938f0..77afda7 100644 (file)
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -25,8 +25,8 @@ class validate_account_move(osv.osv_memory):
     _name = "validate.account.move"
     _description = "Validate Account Move"
     _columns = {
-        'journal_id': fields.many2many('account.journal', 'wizard_validate_account_move_journal', 'wizard_id', 'journal_id', 'Journal', required=True),
-        'period_id': fields.many2many('account.period', 'wizard_validate_account_move_period', 'wizard_id', 'period_id', 'Period', required=True, domain=[('state','<>','done')]),
+        'journal_ids': fields.many2many('account.journal', 'wizard_validate_account_move_journal', 'wizard_id', 'journal_id', 'Journal', required=True),
+        'period_ids': fields.many2many('account.period', 'wizard_validate_account_move_period', 'wizard_id', 'period_id', 'Period', required=True, domain=[('state','<>','done')]),
     }
 
     def validate_move(self, cr, uid, ids, context=None):
@@ -34,7 +34,7 @@ class validate_account_move(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids[0], context=context)
-        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','in',tuple(data['journal_id'])),('period_id','in',tuple(data['period_id']))])
+        ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_ids','in',tuple(data['journal_ids'])),('period_ids','in',tuple(data['period_ids']))])
         if not ids_move:
             raise osv.except_osv(_('Warning!'), _('Specified journals do not have any account move entries in draft state for the specified periods.'))
         obj_move.button_validate(cr, uid, ids_move, context=context)

diff --git a/addons/account/wizard/account_validate_move_view.xml b/addons/account/wizard/account_validate_move_view.xml
index 6a9b1e1..5f22ccb 100644 (file)
--- a/addons/account/wizard/account_validate_move_view.xml
+++ b/addons/account/wizard/account_validate_move_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <form string="Post Journal Entries" version="7.0">
                     <group>
-                        <field name="journal_id"/>
-                        <field name="period_id"/>
+                        <field name="journal_ids"/>
+                        <field name="period_ids"/>
                     </group>
                     <footer>
                         <button string="Approve" name="validate_move" type="object" class="oe_highlight"/>