From 6b96e5024af628e501f5348068ef3c98919aca95 Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Thu, 13 Sep 2018 11:06:31 +0200
Subject: [PATCH 1/2] [IMP] account: forbid making a 'bank & cash' account
 reconcilable

Making a bank account reconcilable is a very common mistake, and leads to confusing and useless data (the move lines made on this account) to be displayed in the reconciliation widget. With this commit, we make sure the user cannot make this mistake anymore.
---
 addons/account/models/account.py      | 2 ++
 addons/account/views/account_view.xml | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index 6ceb5ba19b1..dd519baf5ce 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -136,6 +136,8 @@ class AccountAccount(models.Model):
     def onchange_internal_type(self):
         if self.internal_type in ('receivable', 'payable'):
             self.reconcile = True
+        if self.internal_type == 'liquidity':
+            self.reconcile = False
 
     @api.multi
     @api.depends('name', 'code')
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index ae7680d05e0..42bd931795c 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -21,9 +21,9 @@
                              <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
                              <field name="currency_id" options="{'no_create': True}" groups="base.group_multi_currency"/>
                              <field name="internal_type" invisible="1" readonly="1"/>
-                             <label for="reconcile"/>
-                             <div>
-                                <field name="reconcile"/> 
+                             <label for="reconcile" attrs="{'invisible': [('internal_type','=','liquidity')]}"/>
+                             <div attrs="{'invisible': [('internal_type','=','liquidity')]}">
+                                <field name="reconcile"/>
                                 <button name="action_open_reconcile" class="oe_link" type="object" string=" -> Reconcile" attrs="{'invisible': [('reconcile', '=', False)]}"/>
                              </div>
                              <field name="deprecated"/>

From bc14f30ecc4cc3c5d7a37c47b5d58673ec273e70 Mon Sep 17 00:00:00 2001
From: Olivier Colson <oco@odoo.com>
Date: Tue, 25 Sep 2018 10:19:51 +0200
Subject: [PATCH 2/2] [FIX] l10n_co, l10n_cr: make 'bank & cash' accounts not
 reconcilable

Accounts of this type should not be reconcilable. When making payments, only the counterpart line should be, in some receivable or payable account.
---
 .../l10n_co/data/account.account.template.csv | 32 +++++++++----------
 .../l10n_cr/data/account_account_template.xml |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/l10n_co/data/account.account.template.csv b/addons/l10n_co/data/account.account.template.csv
index 1c001f33f35..0686d9b52ab 100644
--- a/addons/l10n_co/data/account.account.template.csv
+++ b/addons/l10n_co/data/account.account.template.csv
@@ -1,20 +1,20 @@
 id,code,name,reconcile,user_type_id:id,chart_template_id:id
-co_puc_110505,110505,caja general,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_110510,110510,cajas menores,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_110515,110515,moneda extranjera,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_111005,111005,moneda nacional,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_111010,111010,moneda extranjera,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_111505,111505,moneda nacional,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_111510,111510,moneda extranjera,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112005,112005,bancos,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112010,112010,corporaciones de ahorro y vivienda,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112015,112015,organismos cooperativos financieros,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112505,112505,rotatorios moneda nacional,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112510,112510,rotatorios moneda extranjera,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112515,112515,especiales moneda nacional,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112520,112520,especiales moneda extranjera,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112525,112525,de amortización moneda nacional,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
-co_puc_112530,112530,de amortización moneda extranjera,TRUE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_110505,110505,caja general,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_110510,110510,cajas menores,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_110515,110515,moneda extranjera,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_111005,111005,moneda nacional,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_111010,111010,moneda extranjera,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_111505,111505,moneda nacional,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_111510,111510,moneda extranjera,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112005,112005,bancos,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112010,112010,corporaciones de ahorro y vivienda,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112015,112015,organismos cooperativos financieros,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112505,112505,rotatorios moneda nacional,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112510,112510,rotatorios moneda extranjera,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112515,112515,especiales moneda nacional,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112520,112520,especiales moneda extranjera,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112525,112525,de amortización moneda nacional,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
+co_puc_112530,112530,de amortización moneda extranjera,FALSE,account.data_account_type_liquidity,l10n_co_chart_template_generic
 co_puc_120505,120505,"agricultura, ganadería, caza y silvicultura",FALSE,account.data_account_type_current_assets,l10n_co_chart_template_generic
 co_puc_120510,120510,pesca,FALSE,account.data_account_type_current_assets,l10n_co_chart_template_generic
 co_puc_120515,120515,explotación de minas y canteras,FALSE,account.data_account_type_current_assets,l10n_co_chart_template_generic
diff --git a/addons/l10n_cr/data/account_account_template.xml b/addons/l10n_cr/data/account_account_template.xml
index f2307029bc8..295598924f1 100644
--- a/addons/l10n_cr/data/account_account_template.xml
+++ b/addons/l10n_cr/data/account_account_template.xml
@@ -20,7 +20,7 @@
             <field name="code">0-111301</field>
             <field name="name">0-Cuenta PayPal 1</field>
             <field name="user_type_id" ref="account.data_account_type_liquidity"/>
-            <field name="reconcile" eval="True"/>
+            <field name="reconcile" eval="False"/>
             <field name="chart_template_id" ref="account_chart_template_0"/>
         </record>
         <record id="account_account_template_0_111401" model="account.account.template">