diff --git a/addons/account/models/account.py b/addons/account/models/account.py
index 25e55a2ac89..5c98487b3fe 100644
--- a/addons/account/models/account.py
+++ b/addons/account/models/account.py
@@ -111,6 +111,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 a5a863c4aac..1fa9d5f0e93 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -22,8 +22,8 @@
                              <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>
+                             <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>
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">
diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 507c9a37da3..dedbc839d85 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -409,7 +409,7 @@ class PosOrder(models.Model):
 
     def _filtered_for_reconciliation(self):
         filter_states = ['invoiced', 'done']
-        if self.env['ir.config_parameter'].get_param('point_of_sale.order_reconcile_mode', 'all') == 'partner_only':
+        if self.env['ir.config_parameter'].sudo().get_param('point_of_sale.order_reconcile_mode', 'all') == 'partner_only':
             return self.filtered(lambda order: order.state in filter_states and order.partner_id)
         return self.filtered(lambda order: order.state in filter_states)
 
diff --git a/odoo/addons/base/res/res_country_data.xml b/odoo/addons/base/res/res_country_data.xml
index 4ce68ae1e03..e26af7bd80f 100644
--- a/odoo/addons/base/res/res_country_data.xml
+++ b/odoo/addons/base/res/res_country_data.xml
@@ -1708,6 +1708,7 @@
             <field file="base/static/img/country_flags/vn.png" name="image" type="base64" />
             <field name="currency_id" ref="VND" />
             <field eval="84" name="phone_code" />
+            <field eval="'%(street)s\n%(street2)s\n%(city)s\n%(name)s %(zip)s %(country_name)s'" name="address_format" />
         </record>
         <record id="vu" model="res.country">
             <field name="name">Vanuatu</field>