Merge lp:~camptocamp/banking-addons/bank-statement-reconcile-7.0-account_easy_reconcile-analytic-account into lp:banking-addons/bank-statement-reconcile-70

[Guewen Baconnier @ Camptocamp]

Allow to set an analytic account on write-off entries created during reconciliations.

[Pedro Manuel Baeza (pedro.baeza)]

Please put False default to avoid extrange values (browse_null or similar) on dictionary on l.32:

'analytic_account_id': (rec_method.analytic_account_id and
                        rec_method.analytic_account_id.id or False),

Regards.

review: Needs Fixing (code review)

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

> Please put False default to avoid extrange values (browse_null or similar) on
> dictionary on l.32:
>
> 'analytic_account_id': (rec_method.analytic_account_id and
> rec_method.analytic_account_id.id or False),
>
> Regards.

The code is similar to the other lines around. Also, what would be the problem to have a browse_null here?

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Guewen, I don't remember exactly the actual reason for that, but there is a possible side effect that somebody pointed me on another MP at the same time I reviewed this (maybe you were even involved in that review also).

Regards.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Hello Pedro, I don't see either how it could return browse_null.

IMO, we could even simply write

'analytic_account_id': rec_method.analytic_account_id.id,

As if rec_method.analytic_account_id is browse_null
rec_method.analytic_account_id.id would return False

But LGTM like this.

review: Approve (code review, no test)

[Pedro Manuel Baeza (pedro.baeza)]

Yeah, I would probably remember bad the issue.

Regards.

review: Approve (code review)

[Ana Juaristi Olalde (ajuaristio)]

LGTM

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/bank-statement-reconcile. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

[Leonardo Pistone (lepistone)]

Ported to Github

https://github.com/OCA/bank-statement-reconcile/pull/9

review: Needs Resubmitting

Unmerged revisions

138. By Guewen Baconnier @ Camptocamp on 2014-03-27

In account_easy_reconcile, now write-off entries can be created with an analytic account

=== modified file 'account_easy_reconcile/base_reconciliation.py'
--- account_easy_reconcile/base_reconciliation.py	2013-01-04 08:39:10 +0000
+++ account_easy_reconcile/base_reconciliation.py	2014-03-27 09:26:20 +0000
@@ -188,6 +188,9 @@
             period_id = self.pool.get('account.period').find(
                 cr, uid, dt=date, context=context)[0]
 
+            if rec.analytic_account_id:
+                rec_ctx['analytic_id'] = rec.analytic_account_id.id
+
             ml_obj.reconcile(
                 cr, uid,
                 line_ids,
 
=== modified file 'account_easy_reconcile/easy_reconcile.py'
--- account_easy_reconcile/easy_reconcile.py	2013-02-13 15:54:48 +0000
+++ account_easy_reconcile/easy_reconcile.py	2014-03-27 09:26:20 +0000
@@ -56,6 +56,9 @@
                 required=True,
                 string='Date of reconciliation'),
             'filter': fields.char('Filter', size=128),
+            'analytic_account_id': fields.many2one(
+                'account.analytic.account', 'Analytic Account',
+                help="Analytic account for the write-off"),
     }
 
     _defaults = {
@@ -198,6 +201,8 @@
                                     rec_method.account_lost_id.id),
                 'account_profit_id': (rec_method.account_profit_id and
                                       rec_method.account_profit_id.id),
+                'analytic_account_id': (rec_method.analytic_account_id and
+                                        rec_method.analytic_account_id.id),
                 'journal_id': (rec_method.journal_id and
                                rec_method.journal_id.id),
                 'date_base_on': rec_method.date_base_on,
 
=== modified file 'account_easy_reconcile/easy_reconcile.xml'
--- account_easy_reconcile/easy_reconcile.xml	2013-02-13 15:54:48 +0000
+++ account_easy_reconcile/easy_reconcile.xml	2014-03-27 09:26:20 +0000
@@ -124,6 +124,7 @@
                 <field name="account_lost_id" attrs="{'required':[('write_off','>',0)]}"/>
                 <field name="account_profit_id" attrs="{'required':[('write_off','>',0)]}"/>
                 <field name="journal_id" attrs="{'required':[('write_off','>',0)]}"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="date_base_on"/>
             </form>
         </field>
@@ -141,6 +142,7 @@
                 <field name="account_lost_id" attrs="{'required':[('write_off','>',0)]}"/>
                 <field name="account_profit_id" attrs="{'required':[('write_off','>',0)]}"/>
                 <field name="journal_id" attrs="{'required':[('write_off','>',0)]}"/>
+                <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                 <field name="date_base_on"/>
             </tree>
         </field>