Merge lp:~camptocamp/project-reporting/7.0-fix-dissociate-lep into lp:~project-core-editors/project-reporting/7.0

[Leonardo Pistone]

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

You've changed the name of the key in project_billing_utils/analytic.py as I suggested yesterday evening, but forgot to change it in project_billing_utils/wizard/dissociate_aal.py (line 127 of the diff below), which means the branch in the current state no longer fixes lp:1266850

Stylistically I'm not fond of the blank line between class definition line and docstring, or the blank line at the end of the docstring (but I won't fight over this).

review: Needs Fixing (code review, no test)

[Leonardo Pistone (lepistone)]

Thanks for your review Alexandre.

1. We changed the key passed in "vals", but the key in the context is still the same. So that LGTM.

2. I followed http://www.python.org/dev/peps/pep-0257/#multi-line-docstrings "Insert a blank line before and after all docstrings (one-line or multi-line) that document a class"

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

LGTM

review: Approve (code review)

[Matthieu Dietrich @ camptocamp (mdietrich-c2c)]

LGTM, tested locally.

review: Approve (code review, test)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

review: Approve (code review, no test)

=== modified file 'project_billing_utils/__init__.py'
--- project_billing_utils/__init__.py	2013-06-20 15:17:21 +0000
+++ project_billing_utils/__init__.py	2014-01-07 17:14:34 +0000
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Joël Grand-Guillaume
-#    Copyright 2010 Camptocamp SA
+#    Author: Joël Grand-Guillaume, Leonardo Pistone
+#    Copyright 2010-2014 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,4 +22,5 @@
 import project
 import wizard
 import invoice
+import analytic  # noqa
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'project_billing_utils/analytic.py'
--- project_billing_utils/analytic.py	1970-01-01 00:00:00 +0000
+++ project_billing_utils/analytic.py	2014-01-07 17:14:34 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Leonardo Pistone
+#    Copyright 2014 Camptocamp SA
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+"""Changes to allow the dissociate analytic lines wizard to work."""
+
+from openerp.osv import orm
+
+
+class account_analytic_line(orm.Model):
+
+    """Hack the analytic line to optionally skip the invoice check."""
+
+    _inherit = 'account.analytic.line'
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """Put a key in the vals, since we have no context. Return super."""
+        if context.get('skip_invoice_check'):
+            vals['_x_vals_skip_invoice_check'] = True
+
+        return super(account_analytic_line, self).write(
+            cr, uid, ids, vals, context=context)
+
+    def _check_inv(self, cr, uid, ids, vals):
+        """Optionally skip invoice check. Return boolean."""
+        if '_x_vals_skip_invoice_check' in vals:
+            del vals['_x_vals_skip_invoice_check']
+            return True
+        return super(account_analytic_line, self)._check_inv(
+            cr, uid, ids, vals)

=== modified file 'project_billing_utils/wizard/dissociate_aal.py'
--- project_billing_utils/wizard/dissociate_aal.py	2013-10-31 15:31:39 +0000
+++ project_billing_utils/wizard/dissociate_aal.py	2014-01-07 17:14:34 +0000
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    Author: Joël Grand-Guillaume
-#    Copyright 2010 Camptocamp SA
+#    Author: Joël Grand-Guillaume, Leonardo Pistone
+#    Copyright 2010-2014 Camptocamp SA
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,30 +18,33 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+"""Introduce a wizard to dissociate an Analytic Line from an Invoice."""
 from openerp.osv import orm
 
 
 class DissociateInvoice(orm.TransientModel):
+
+    """Wizard to dissociate an Analytic Line from an Invoice."""
+
     _name = 'dissociate.aal.to.invoice'
     _description = 'Dissociate Analytic Lines'
 
     def dissociate_aal(self, cr, uid, ids, context=None):
+        """Dissociate invoice from the line and return {}.
+
+        This is necessary because the module hr_timesheet_invoice introduces
+        a check that we want to avoid.
+
+        """
         if context is None:
             context = {}
+
         aal_obj = self.pool.get(context['active_model'])
-        aal_ids = context.get('active_ids', False)
-        if isinstance(ids, list):
-            req_id = ids[0]
-        else:
-            req_id = ids
-        ids2 = []
-        for id in aal_ids:
-            ids2.append(id)
-        # Use of SQL here cause otherwise the ORM won't allow to modify the invoiced AAL
-        # which is exactly what we want !
-        query = "UPDATE account_analytic_line SET invoice_id = NULL WHERE id IN %s"
-        cr.execute(query, (tuple(ids2),))
-
+        ctx = context.copy()
+        ctx['skip_invoice_check'] = True
+        aal_obj.write(cr, uid, context['active_ids'], {
+            'invoice_id': False
+        }, ctx)
         return {}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: