[MERGE] forward port branch 9.0 up to bc14f30ecc4

4 files changed, 22 insertions, 20 deletions

diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index 3b4387ebfab..1eedaf8437c 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -153,6 +153,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 a2e3285db4f..6d7434b65bd 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -22,9 +22,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"/>
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_template_data.xml b/addons/l10n_cr/data/account_template_data.xml
index ba4ac297c0e..fcc4426b84a 100644
--- a/addons/l10n_cr/data/account_template_data.xml
+++ b/addons/l10n_cr/data/account_template_data.xml
@@ -8,7 +8,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">