Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-70-fix-on-change-voucher into lp:banking-addons/bank-statement-reconcile-70

[Joël Grand-Guillaume @ camptocamp]

Statement ext collide with voucher for some on change. As it almost impossible to have a finance installation without voucher, we may add voucher as a dependence on statement ext in order to fix on change, and silent unwanted voucher behavior.

We also add the right periode computation for each line in the voucher, as it was previously done in the account_statement_ext_voucher. We mark also this one as deprecated.

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

If an other module has the same trouble the account_statement_ext addon onchange_partner_id is not "polite" and will not support the fact to have a None profile_id, maybe I should let the original signature

Nicolas

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

I reindented the patch a little bit.

LGTM.

review: Approve (code review, no test)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

As discussed internally, we should always include the voucher as it depends on "sale". I suggest that I made the following modification:

- Mark the account_satement_ext_voucher as deprecated
- Take the little patch that is inside and add it to account_statement_ext
- Let the dependance on account_voucher in account_statement_ext

The thing is we can't get rid of the voucher anymore in version 7.0 :(

review: Needs Fixing

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Missing voucher.py

[lp:~camptocamp/banking-addons/bank-statement-reconcile-70-fix-on-change-voucher]

81. By Joël Grand-Guillaume @ camptocamp on 2013-02-01

[ADD] Missing voucher.py file... Better with it, sorry.

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

account_statement_ext/__openerp__.py: you are changing the db model, please increment the version number.

l. 28: s/It also add/It also adds/

l. 66: are your sure about the copyright years?

l. 107-108: these lines can be removed as you are just passing the context to super().create

l. 145 and following: what are the effects of these changes on an instance with the module installed ?

review: Needs Fixing

[lp:~camptocamp/banking-addons/bank-statement-reconcile-70-fix-on-change-voucher]

82. By Nicolas Bessi - Camptocamp on 2013-02-04

[TYPO]

83. By Nicolas Bessi - Camptocamp on 2013-02-04

[FIX] version number

84. By Nicolas Bessi - Camptocamp on 2013-02-04

[IMP] dead code

85. By Nicolas Bessi - Camptocamp on 2013-02-04

[FIX] copyright year

[Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount)]

Hello,

I have fixed the branch following remarks. Setting addons as not installable should not have functional impact as it as been merged in statement ext addon. I do not know how the server will managed the fact of an installed module set to uninstallable. It will probably do nothing, but it may prevent the unsinstall of the addon

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

LGTM :-)

review: Approve (code review, no test)

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

review: Approve (code review, no test)

=== modified file 'account_statement_ext/__init__.py'
--- account_statement_ext/__init__.py	2012-12-20 13:37:01 +0000
+++ account_statement_ext/__init__.py	2013-02-04 15:23:22 +0000
@@ -22,3 +22,4 @@
 import statement
 import report
 import account
+import voucher
\ No newline at end of file

=== modified file 'account_statement_ext/__openerp__.py'
--- account_statement_ext/__openerp__.py	2012-12-20 13:37:01 +0000
+++ account_statement_ext/__openerp__.py	2013-02-04 15:23:22 +0000
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Author: Nicolas Bessi, Joel Grand-Guillaume
-#    Copyright 2011-2012 Camptocamp SA
+#    Copyright 2011-2013 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
@@ -20,14 +20,15 @@
 ##############################################################################
 
 {'name': "Bank statement extension and profiles",
- 'version': '1.1',
+ 'version': '1.2.0',
  'author': 'Camptocamp',
  'maintainer': 'Camptocamp',
  'category': 'Finance',
  'complexity': 'normal',
  'depends': [
      'account',
-     'report_webkit'
+     'report_webkit',
+     'account_voucher'
      ],
  'description': """
  Improve the basic bank statement, by adding various new features,
@@ -62,6 +63,8 @@
     all the erronous line in a same popup instead of raising and crashing on every step.
 
  4) Remove the period on the bank statement, and compute it for each line based on their date instead.
+    It also adds this feature in the voucher in order to compute the period correctly.
+
 
  5) Cancelling a bank statement is much more easy and will cancel all related entries, unreconcile them,
     and finally delete them.

=== modified file 'account_statement_ext/statement.py'
--- account_statement_ext/statement.py	2013-01-28 09:48:10 +0000
+++ account_statement_ext/statement.py	2013-02-04 15:23:22 +0000
@@ -551,7 +551,7 @@
             res['account_id'] = receiv_account
         return res
 
-    def onchange_partner_id(self, cr, uid, ids, partner_id, profile_id, context=None):
+    def onchange_partner_id(self, cr, uid, ids, partner_id, profile_id=None, context=None):
         """
         Override of the basic method as we need to pass the profile_id in the on_change_type
         call.
@@ -571,7 +571,9 @@
                 type = 'customer'
         res_type = self.onchange_type(cr, uid, ids, partner_id, type, profile_id, context=context)  # Chg
         if res_type['value'] and res_type['value'].get('account_id', False):
-            return {'value': {'type': type, 'account_id': res_type['value']['account_id']}}
+            return {'value': {'type': type,
+                              'account_id': res_type['value']['account_id'],
+                              'voucher_id': False}}
         return {'value': {'type': type}}
 
     def onchange_type(self, cr, uid, line_id, partner_id, type, profile_id, context=None):

=== added file 'account_statement_ext/voucher.py'
--- account_statement_ext/voucher.py	1970-01-01 00:00:00 +0000
+++ account_statement_ext/voucher.py	2013-02-04 15:23:22 +0000
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Joel Grand-Guillaume
+#    Copyright 2011-2013 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/>.
+#
+##############################################################################
+
+from openerp.osv.orm import Model
+
+
+class AccountVoucher(Model):
+
+    _inherit = 'account.voucher'
+
+    def _get_period(self, cr, uid, context=None):
+        """If period not in context, take it from the move lines"""
+        if not context.get('period_id') and context.get('move_line_ids'):
+            res = self.pool.get('account.move.line').browse(
+                    cr, uid, context.get('move_line_ids'), context=context)[0].period_id.id
+            context['period_id'] = res
+        elif context.get('date'):
+            periods = self.pool.get('account.period').find(
+                    cr, uid, dt=context['date'], context=context)
+            if periods:
+                context['period_id'] = periods[0]
+        return super(AccountVoucher, self)._get_period(cr, uid, context)
+
+    def create(self, cr, uid, values, context=None):
+        """If no period defined in values, ask it from moves."""
+        if context is None:
+            context = {}
+        if not values.get('period_id'):
+            ctx = dict(context, date=values.get('date'))
+            values['period_id'] = self._get_period(cr, uid, ctx)
+        return super(AccountVoucher, self).create(cr, uid, values, context)

=== modified file 'account_statement_ext_voucher/__init__.py'
--- account_statement_ext_voucher/__init__.py	2012-06-20 14:10:01 +0000
+++ account_statement_ext_voucher/__init__.py	2013-02-04 15:23:22 +0000
@@ -18,5 +18,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import statement_voucher

=== modified file 'account_statement_ext_voucher/__openerp__.py'
--- account_statement_ext_voucher/__openerp__.py	2013-01-10 15:09:55 +0000
+++ account_statement_ext_voucher/__openerp__.py	2013-02-04 15:23:22 +0000
@@ -30,8 +30,12 @@
      'account_voucher'
      ],
  'description': """
- This module is only needed when using account_bank_statement_ext with voucher in order to compute the period
+ This module is deprecated. It was only needed when using account_bank_statement_ext with voucher in order to compute the period
  correctly. This is mainly because with account_bank_statement_ext, the period is computed for each line.
+ 
+ Now, we include this in the account_statement_ext module and added a dependencies on account_voucher (mainly cause we can't get
+ rid of the voucher in version 7.0).
+ 
  """,
  'website': 'http://www.camptocamp.com',
  'init_xml': [],
@@ -40,9 +44,9 @@
  ],
  'demo_xml': [],
  'test': [],
- 'installable': True,
+ 'installable': False,
  'images': [],
- 'auto_install': True,
+ 'auto_install': False,
  'license': 'AGPL-3',
  
 }

=== removed file 'account_statement_ext_voucher/statement_voucher_view.xml'
--- account_statement_ext_voucher/statement_voucher_view.xml	2012-07-04 11:51:39 +0000
+++ account_statement_ext_voucher/statement_voucher_view.xml	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-
-        <record id="account_voucher.view_bank_statement_form_invoice" model="ir.ui.view">
-            <field name="name">account.bank.statement.invoice.form.inherit</field>
-            <field name="model">account.bank.statement</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="account.view_bank_statement_form"/>
-            <field name="arch" type="xml">
-              <field name="currency" invisible="1" position="after">
-              </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>