Merge lp:~unifield-team/unifield-wm/UF_2056 into lp:unifield-wm

[jftempo]

=== modified file 'account_corrections/account_wizard_view.xml'
--- account_corrections/account_wizard_view.xml	2013-06-10 09:19:10 +0000
+++ account_corrections/account_wizard_view.xml	2013-09-11 14:35:26 +0000
@@ -42,7 +42,6 @@
                     <group colspan="4" col="6">
                         <label string ="" colspan="1"/>
                         <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="gtk-undo" string="Reverse" name="action_reverse" type="object" attrs="{'invisible': [('from_register', '=', True)]}"/>
                         <button icon="gtk-redo" string="Correct" name="action_confirm" type="object"/>
                     </group>
                     <field name="from_register" invisible="1"/>

=== modified file 'account_corrections/wizard/journal_items_corrections.py'
--- account_corrections/wizard/journal_items_corrections.py	2013-06-10 09:19:10 +0000
+++ account_corrections/wizard/journal_items_corrections.py	2013-09-11 14:35:26 +0000
@@ -266,27 +266,28 @@
             res += 4
         return res
 
-    def action_reverse(self, cr, uid, ids, context=None):
-        """
-        Do a reverse from the lines attached to this wizard
-        NB: The reverse is done on the first correction journal found (type = 'correction')
-        """
-        # Verifications
-        if not context:
-            context = {}
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        # Verify that date is superior to line's date
-        for wiz in self.browse(cr, uid, ids, context=context):
-            if wiz.move_line_id and wiz.move_line_id.date:
-                if not wiz.date >= wiz.move_line_id.date:
-                    raise osv.except_osv(_('Warning'), _('Please insert a correction date from the entry date onwards.'))
-        # Retrieve values
-        wizard = self.browse(cr, uid, ids[0], context=context)
-        aml_obj = self.pool.get('account.move.line')
-        # Do reverse
-        res, move_ids = aml_obj.reverse_move(cr, uid, [wizard.move_line_id.id], wizard.date, context=context)
-        return {'type': 'ir.actions.act_window_close', 'success_move_line_ids': res}
+    # UF-2056: Delete reverse button
+#    def action_reverse(self, cr, uid, ids, context=None):
+#        """
+#        Do a reverse from the lines attached to this wizard
+#        NB: The reverse is done on the first correction journal found (type = 'correction')
+#        """
+#        # Verifications
+#        if not context:
+#            context = {}
+#        if isinstance(ids, (int, long)):
+#            ids = [ids]
+#        # Verify that date is superior to line's date
+#        for wiz in self.browse(cr, uid, ids, context=context):
+#            if wiz.move_line_id and wiz.move_line_id.date:
+#                if not wiz.date >= wiz.move_line_id.date:
+#                    raise osv.except_osv(_('Warning'), _('Please insert a correction date from the entry date onwards.'))
+#        # Retrieve values
+#        wizard = self.browse(cr, uid, ids[0], context=context)
+#        aml_obj = self.pool.get('account.move.line')
+#        # Do reverse
+#        res, move_ids = aml_obj.reverse_move(cr, uid, [wizard.move_line_id.id], wizard.date, context=context)
+#        return {'type': 'ir.actions.act_window_close', 'success_move_line_ids': res}
 
     def action_confirm(self, cr, uid, ids, context=None, distrib_id=False):
         """