Merge lp:~acsone-openerp/account-analytic/account_analytic_required-test_suite-sbi into lp:~account-core-editors/account-analytic/7.0

[Stéphane Bidoul (Acsone)]

Add a test suite for account_analytic_required, and fix a small hole in the policy check (when changing analytic account after creating the move line, the policy would not be checked).

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the work, Stéphane.

Regards.

review: Approve (code review)

[Alexis de Lattre (alexis-via)]

Nice update. Thank you Stefan.

I am pushing to you a branch with pep8 stuff and the additional of the field in the tree view (and not just form view).

review: Approve (code review and tests)

[Alexis de Lattre (alexis-via)]

There it is : https://code.launchpad.net/~akretion-team/account-analytic/account-analytic-required-pep8/+merge/216497

[lp:~acsone-openerp/account-analytic/account_analytic_required-test_suite-sbi]

19. By Stéphane Bidoul (Acsone) on 2014-04-19

[MRG] flake8 long lines + add policy in tree view from Alexis de Lattre

20. By Stéphane Bidoul (Acsone) on 2014-04-19

[IMP] comments in test suite + long lines __openerp__.py

[Alexis de Lattre (alexis-via)]

OK, let's go and merge it in the main branch now :)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

review: Approve

=== modified file 'account_analytic_required/__init__.py'
--- account_analytic_required/__init__.py	2012-11-21 08:56:48 +0000
+++ account_analytic_required/__init__.py	2014-04-19 10:20:35 +0000
@@ -21,4 +21,4 @@
 ##############################################################################
 
 
-import account
+from . import account
 
=== modified file 'account_analytic_required/__openerp__.py'
--- account_analytic_required/__openerp__.py	2013-04-23 14:25:48 +0000
+++ account_analytic_required/__openerp__.py	2014-04-19 10:20:35 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Account analytic required module for OpenERP
-#    Copyright (C) 2011 Akretion (http://www.akretion.com). All Rights Reserved
+#    Copyright (C) 2011 Akretion (http://www.akretion.com)
 #    @author Alexis de Lattre <[e-mail]>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -22,15 +22,24 @@
 
 
 {
-    'name': 'Account analytic required',
+    'name': 'Account Analytic Required',
     'version': '0.2',
-    'category': 'Generic Modules/Accounting',
+    'category': 'Analytic Accounting',
     'license': 'AGPL-3',
-    'description': """This module adds an option "analytic policy" on account types. You have the choice between 3 policies : always, never and optional.
-
-For example, if you want to have an analytic account on all your expenses, set the policy to "always" for the account type "expense" ; then, if you try to save an account move line with an account of type "expense" without analytic account, you will get an error message.
-
-Module developped by Alexis de Lattre <[e-mail]> during the Akretion-Camptocamp code sprint of June 2011.
+    'description': """
+Account Analytic Required
+=========================
+
+This module adds an option *analytic policy* on account types.
+You have the choice between 3 policies : *always*, *never* and *optional*.
+
+For example, if you want to have an analytic account on all your expenses,
+set the policy to *always* for the account type *expense* ; then, if you
+try to save an account move line with an account of type *expense*
+without analytic account, you will get an error message.
+
+Module developped by Alexis de Lattre <[e-mail]>
+during the Akretion-Camptocamp code sprint of June 2011.
 """,
     'author': 'Akretion',
     'website': 'http://www.akretion.com/',
@@ -39,4 +48,3 @@
     'installable': True,
     'active': False,
 }
-
 
=== modified file 'account_analytic_required/account.py'
--- account_analytic_required/account.py	2013-04-23 14:25:48 +0000
+++ account_analytic_required/account.py	2014-04-19 10:20:35 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Account analytic required module for OpenERP
-#    Copyright (C) 2011 Akretion (http://www.akretion.com). All Rights Reserved
+#    Copyright (C) 2011 Akretion (http://www.akretion.com)
 #    @author Alexis de Lattre <[e-mail]>
 #    Developped during the Akretion-Camptocamp code sprint of June 2011
 #
@@ -22,43 +22,82 @@
 ##############################################################################
 
 from openerp.osv import orm, fields
-from tools.translate import _
+from openerp.tools.translate import _
 
 
 class account_account_type(orm.Model):
     _inherit = "account.account.type"
 
     _columns = {
-        'analytic_policy' : fields.selection([
+        'analytic_policy': fields.selection([
             ('optional', 'Optional'),
             ('always', 'Always'),
             ('never', 'Never')
-            ], 'Policy for analytic account', help="Set the policy for analytic accounts : if you select 'Optional', the accountant is free to put an analytic account on an account move line with this type of account ; if you select 'Always', the accountant will get an error message if there is no analytic account ; if you select 'Never', the accountant will get an error message if an analytic account is present."),
+            ], 'Policy for analytic account',
+            help="Set the policy for analytic accounts : if you select "
+            "'Optional', the accountant is free to put an analytic account "
+            "on an account move line with this type of account ; if you "
+            "select 'Always', the accountant will get an error message if "
+            "there is no analytic account ; if you select 'Never', the "
+            "accountant will get an error message if an analytic account "
+            "is present."),
     }
 
     _defaults = {
-        'analytic_policy': lambda *a: 'optional',
+        'analytic_policy': 'optional',
         }
 
 
 class account_move_line(orm.Model):
     _inherit = "account.move.line"
 
-    def check_analytic_required(self, cr, uid, vals, context=None):
-        if 'account_id' in vals and (vals.get('debit', 0.0) != 0.0 or vals.get('credit', 0.0) != 0.0):
-            account = self.pool.get('account.account').browse(cr, uid, vals['account_id'], context=context)
-            if account.user_type.analytic_policy == 'always' and not vals.get('analytic_account_id', False):
-                raise orm.except_orm(_('Error :'), _("Analytic policy is set to 'Always' with account %s '%s' but the analytic account is missing in the account move line with label '%s'." % (account.code, account.name, vals.get('name', False))))
-            elif account.user_type.analytic_policy == 'never' and vals.get('analytic_account_id', False):
-                cur_analytic_account = self.pool.get('account.analytic.account').read(cr, uid, vals['analytic_account_id'], ['name', 'code'], context=context)
-                raise orm.except_orm(_('Error :'), _("Analytic policy is set to 'Never' with account %s '%s' but the account move line with label '%s' has an analytic account %s '%s'." % (account.code, account.name, vals.get('name', False), cur_analytic_account['code'], cur_analytic_account['name'])))
+    def check_analytic_required(self, cr, uid, ids, vals, context=None):
+        if 'account_id' in vals or 'analytic_account_id' in vals or \
+                'debit' in vals or 'credit' in vals:
+            if isinstance(ids, (int, long)):
+                ids = [ids]
+            for move_line in self.browse(cr, uid, ids, context):
+                if move_line.debit == 0 and move_line.credit == 0:
+                    continue
+                analytic_policy = \
+                    move_line.account_id.user_type.analytic_policy
+                if analytic_policy == 'always' and \
+                        not move_line.analytic_account_id:
+                    raise orm.except_orm(
+                        _('Error :'),
+                        _("Analytic policy is set to 'Always' with account "
+                            "%s '%s' but the analytic account is missing in "
+                            "the account move line with label '%s'.")
+                        % (
+                            move_line.account_id.code,
+                            move_line.account_id.name,
+                            move_line.name))
+                elif analytic_policy == 'never' and \
+                        move_line.analytic_account_id:
+                    raise orm.except_orm(
+                        _('Error :'),
+                        _("Analytic policy is set to 'Never' with account %s "
+                            "'%s' but the account move line with label '%s' "
+                            "has an analytic account %s '%s'.")
+                        % (
+                            move_line.account_id.code,
+                            move_line.account_id.name,
+                            move_line.name,
+                            move_line.analytic_account_id.code,
+                            move_line.analytic_account_id.name))
         return True
 
     def create(self, cr, uid, vals, context=None, check=True):
-        self.check_analytic_required(cr, uid, vals, context=context)
-        return super(account_move_line, self).create(cr, uid, vals, context=context, check=check)
-
-    def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
-        self.check_analytic_required(cr, uid, vals, context=context)
-        return super(account_move_line, self).write(cr, uid, ids, vals, context=context, check=check, update_check=update_check)
-
+        line_id = super(account_move_line, self).create(
+            cr, uid, vals, context=context, check=check)
+        self.check_analytic_required(cr, uid, line_id, vals, context=context)
+        return line_id
+
+    def write(
+            self, cr, uid, ids, vals, context=None, check=True,
+            update_check=True):
+        res = super(account_move_line, self).write(
+            cr, uid, ids, vals, context=context, check=check,
+            update_check=update_check)
+        self.check_analytic_required(cr, uid, ids, vals, context=context)
+        return res
 
=== modified file 'account_analytic_required/account_view.xml'
--- account_analytic_required/account_view.xml	2012-11-21 08:56:48 +0000
+++ account_analytic_required/account_view.xml	2014-04-19 10:20:35 +0000
@@ -15,7 +15,18 @@
     <field name="inherit_id" ref="account.view_account_type_form" />
     <field name="arch"  type="xml">
         <field name="code" position="after">
-                <field name="analytic_policy" />
+            <field name="analytic_policy" />
+        </field>
+    </field>
+</record>
+
+<record id="view_account_type_tree" model="ir.ui.view">
+    <field name="name">account_analytic_required.account_type_tree</field>
+    <field name="model">account.account.type</field>
+    <field name="inherit_id" ref="account.view_account_type_tree" />
+    <field name="arch"  type="xml">
+        <field name="code" position="after">
+            <field name="analytic_policy" />
         </field>
     </field>
 </record>
 
=== added directory 'account_analytic_required/tests'
=== added file 'account_analytic_required/tests/__init__.py'
--- account_analytic_required/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ account_analytic_required/tests/__init__.py	2014-04-19 10:20:35 +0000
@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account analytic required module for OpenERP
+#    Copyright (C) 2014 Acsone (http://acsone.eu). All Rights Reserved
+#    @author Stéphane Bidoul <[e-mail]>
+#
+#    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/>.
+#
+##############################################################################
+
+from . import test_account_analytic_required
+
+fast_suite = [
+]
+
+checks = [
+    test_account_analytic_required,
+]
 
=== added file 'account_analytic_required/tests/test_account_analytic_required.py'
--- account_analytic_required/tests/test_account_analytic_required.py	1970-01-01 00:00:00 +0000
+++ account_analytic_required/tests/test_account_analytic_required.py	2014-04-19 10:20:35 +0000
@@ -0,0 +1,130 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    Account analytic required module for OpenERP
+#    Copyright (C) 2014 Acsone (http://acsone.eu). All Rights Reserved
+#    @author Stéphane Bidoul <[e-mail]>
+#
+#    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/>.
+#
+##############################################################################
+
+from datetime import datetime
+
+from openerp.tests import common
+from openerp.osv import orm
+
+
+class test_account_analytic_required(common.TransactionCase):
+
+    def setUp(self):
+        super(test_account_analytic_required, self).setUp()
+        self.account_obj = self.registry('account.account')
+        self.account_type_obj = self.registry('account.account.type')
+        self.move_obj = self.registry('account.move')
+        self.move_line_obj = self.registry('account.move.line')
+        self.analytic_account_obj = self.registry('account.analytic.account')
+        self.analytic_account_id = self.analytic_account_obj.create(
+            self.cr, self.uid, {'name': 'test aa', 'type': 'normal'})
+
+    def _create_move(self, with_analytic, amount=100):
+        date = datetime.now()
+        period_id = self.registry('account.period').find(
+            self.cr, self.uid, date,
+            context={'account_period_prefer_normal': True})[0]
+        move_vals = {
+            'journal_id': self.ref('account.sales_journal'),
+            'period_id': period_id,
+            'date': date,
+        }
+        move_id = self.move_obj.create(self.cr, self.uid, move_vals)
+        move_line_id = self.move_line_obj.create(
+            self.cr, self.uid,
+            {'move_id': move_id,
+             'name': '/',
+             'debit': 0,
+             'credit': amount,
+             'account_id': self.ref('account.a_sale'),
+             'analytic_account_id':
+             self.analytic_account_id if with_analytic else False})
+        self.move_line_obj.create(
+            self.cr, self.uid,
+            {'move_id': move_id,
+             'name': '/',
+             'debit': amount,
+             'credit': 0,
+             'account_id': self.ref('account.a_recv')})
+        return move_line_id
+
+    def _set_analytic_policy(self, policy, aref='account.a_sale'):
+        account_type = self.account_obj.browse(self.cr, self.uid,
+                                               self.ref(aref)).user_type
+        self.account_type_obj.write(self.cr, self.uid, account_type.id,
+                                    {'analytic_policy': policy})
+
+    def test_optional(self):
+        self._create_move(with_analytic=False)
+        self._create_move(with_analytic=True)
+
+    def test_always_no_analytic(self):
+        self._set_analytic_policy('always')
+        with self.assertRaises(orm.except_orm):
+            self._create_move(with_analytic=False)
+
+    def test_always_no_analytic_0(self):
+        # accept missing analytic account when debit=credit=0
+        self._set_analytic_policy('always')
+        self._create_move(with_analytic=False, amount=0)
+
+    def test_always_with_analytic(self):
+        self._set_analytic_policy('always')
+        self._create_move(with_analytic=True)
+
+    def test_never_no_analytic(self):
+        self._set_analytic_policy('never')
+        self._create_move(with_analytic=False)
+
+    def test_never_with_analytic(self):
+        self._set_analytic_policy('never')
+        with self.assertRaises(orm.except_orm):
+            self._create_move(with_analytic=True)
+
+    def test_never_with_analytic_0(self):
+        # accept analytic when debit=credit=0
+        self._set_analytic_policy('never')
+        self._create_move(with_analytic=True, amount=0)
+
+    def test_always_remove_analytic(self):
+        # remove partner when policy is always
+        self._set_analytic_policy('always')
+        line_id = self._create_move(with_analytic=True)
+        with self.assertRaises(orm.except_orm):
+            self.move_line_obj.write(self.cr, self.uid, line_id,
+                                     {'analytic_account_id': False})
+
+    def test_change_account(self):
+        self._set_analytic_policy('always', aref='account.a_expense')
+        line_id = self._create_move(with_analytic=False)
+        # change account to a_expense with policy always but missing
+        # analytic_account
+        with self.assertRaises(orm.except_orm):
+            self.move_line_obj.write(
+                self.cr, self.uid, line_id,
+                {'account_id': self.ref('account.a_expense')})
+        # change account to a_expense with policy always
+        # with analytic account -> ok
+        self.move_line_obj.write(
+            self.cr, self.uid, line_id, {
+                'account_id': self.ref('account.a_expense'),
+                'analytic_account_id': self.analytic_account_id})