[MERGE] forward port branch 10.0 up to 69af1df70a4

6 files changed, 98 insertions, 85 deletions

diff --git a/addons/account_asset/models/account_asset.py b/addons/account_asset/models/account_asset.py
index 2663bff2d00..2dd11c42fa6 100644
--- a/addons/account_asset/models/account_asset.py
+++ b/addons/account_asset/models/account_asset.py
@@ -217,7 +217,14 @@ class AccountAssetAsset(models.Model):
                 # depreciation_date = 1st of January of purchase year if annual valuation, 1st of
                 # purchase month in other cases
                 if self.method_period >= 12:
-                    asset_date = datetime.strptime(self.date[:4] + '-01-01', DF).date()
+                    if self.company_id.fiscalyear_last_month:
+                        asset_date = date(year=int(self.date[:4]),
+                                                   month=self.company_id.fiscalyear_last_month,
+                                                   day=self.company_id.fiscalyear_last_day) + \
+                                     relativedelta(days=1) + \
+                                     relativedelta(year=int(self.date[:4]))  # e.g. 2018-12-31 +1 -> 2019
+                    else:
+                        asset_date = datetime.strptime(self.date[:4] + '-01-01', DF).date()
                 else:
                     asset_date = datetime.strptime(self.date[:7] + '-01', DF).date()
                 # if we already have some previous validated entries, starting date isn't 1st January but last entry + method period
diff --git a/addons/l10n_be_intrastat/wizard/xml_decl.py b/addons/l10n_be_intrastat/wizard/xml_decl.py
index 80d7d617ef4..aaf67485a11 100644
--- a/addons/l10n_be_intrastat/wizard/xml_decl.py
+++ b/addons/l10n_be_intrastat/wizard/xml_decl.py
@@ -176,7 +176,7 @@ class XmlDeclaration(models.TransientModel):
             if inv_line.invoice_id.intrastat_country_id:
                 excnt = inv_line.invoice_id.intrastat_country_id.code
             else:
-                excnt = inv_line.invoice_id.partner_id.country_id.code
+                excnt = inv_line.invoice_id.partner_shipping_id.country_id.code or inv_line.invoice_id.partner_id.country_id.code
 
             #Check region
             #If purchase, comes from purchase order, linked to a location,
diff --git a/addons/l10n_es/data/account_account_template_data.xml b/addons/l10n_es/data/account_account_template_data.xml
index 455d8132f04..9f4fe8955db 100644
--- a/addons/l10n_es/data/account_account_template_data.xml
+++ b/addons/l10n_es/data/account_account_template_data.xml
@@ -14,413 +14,413 @@
             <field name="code">101</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Fondo social</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_102_child" model="account.account.template">
             <field name="code">102</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Capital</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_108_child" model="account.account.template">
             <field name="code">108</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acciones o participaciones propias en situaciones especiales</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_109_child" model="account.account.template">
             <field name="code">109</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acciones o participaciones propias para reducción de capital</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_110_child" model="account.account.template">
             <field name="code">110</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Prima de emisión o asunción</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_112_child" model="account.account.template">
             <field name="code">112</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reserva legal</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_113_child" model="account.account.template">
             <field name="code">113</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reservas voluntarias</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1140_child" model="account.account.template">
             <field name="code">1140</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reservas para acciones o participaciones de la sociedad dominante</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1141_child" model="account.account.template">
             <field name="code">1141</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reservas estatutarias</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1142_child" model="account.account.template">
             <field name="code">1142</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reserva por capital amortizado</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1144_child" model="account.account.template">
             <field name="code">1144</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Reservas por acciones propias aceptadas en garantía</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_118_child" model="account.account.template">
             <field name="code">118</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Aportaciones de socios o propietarios</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_119_child" model="account.account.template">
             <field name="code">119</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Diferencias por ajuste del capital a euros</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_131_child" model="account.account.template">
             <field name="code">131</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Donaciones y legados de capital</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1370_child" model="account.account.template">
             <field name="code">1370</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Ingresos fiscales por diferencias permanentes a distribuir en varios ejercicios</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1371_child" model="account.account.template">
             <field name="code">1371</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Ingresos fiscales por deducciones y bonificaciones a distribuir en varios ejercicios</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_equity"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_141_child" model="account.account.template">
             <field name="code">141</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Provisión para impuestos</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_142_child" model="account.account.template">
             <field name="code">142</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Provisión para otras responsabilidades</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_143_child" model="account.account.template">
             <field name="code">143</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Provisión por desmantelamiento, retiro o rehabilitación del inmovilizado</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_145_child" model="account.account.template">
             <field name="code">145</field>
             <field name="reconcile" eval="True"/>
             <field name="name">Provisión para actuaciones medioambientales</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_150_child" model="account.account.template">
             <field name="code">150</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acciones o participaciones consideradas como pasivos financieros</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1533_child" model="account.account.template">
             <field name="code">1533</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos no exigidos, empresas del grupo</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1534_child" model="account.account.template">
             <field name="code">1534</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos no exigidos, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1535_child" model="account.account.template">
             <field name="code">1535</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Desembolsos no exigidos, otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1536_child" model="account.account.template">
             <field name="code">1536</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otros desembolsos no exigidos</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1543_child" model="account.account.template">
             <field name="code">1543</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Aportaciones no dinerarias pendientes, empresas del grupo</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1544_child" model="account.account.template">
             <field name="code">1544</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Aportaciones no dinerarias pendientes, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1545_child" model="account.account.template">
             <field name="code">1545</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Aportaciones no dinerarias pendientes, otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1546_child" model="account.account.template">
             <field name="code">1546</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras aportaciones no dinerarias pendientes</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1603_child" model="account.account.template">
             <field name="code">1603</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas con entidades de crédito vinculadas, empresas del grupo</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1604_child" model="account.account.template">
             <field name="code">1604</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas con entidades de crédito vinculadas, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1605_child" model="account.account.template">
             <field name="code">1605</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas con otras entidades de crédito vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1613_child" model="account.account.template">
             <field name="code">1613</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Proveedores de inmovilizado, empresas del grupo</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1614_child" model="account.account.template">
             <field name="code">1614</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Proveedores de inmovilizado, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1615_child" model="account.account.template">
             <field name="code">1615</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Proveedores de inmovilizado, otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1623_child" model="account.account.template">
             <field name="code">1623</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acreedores por arrendamiento financiero, empresas de grupo</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1624_child" model="account.account.template">
             <field name="code">1624</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acreedores por arrendamiento financiero, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1625_child" model="account.account.template">
             <field name="code">1625</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acreedores por arrendamiento financiero, otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1633_child" model="account.account.template">
             <field name="code">1633</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras deudas, empresas del grupo</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1634_child" model="account.account.template">
             <field name="code">1634</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras deudas, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_1635_child" model="account.account.template">
             <field name="code">1635</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Otras deudas, con otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_170_child" model="account.account.template">
             <field name="code">170</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas con entidades de crédito</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_171_child" model="account.account.template">
             <field name="code">171</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_172_child" model="account.account.template">
             <field name="code">172</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas transformables en subvenciones, donaciones y legados</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_173_child" model="account.account.template">
             <field name="code">173</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Proveedores de inmovilizado</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_174_child" model="account.account.template">
             <field name="code">174</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acreedores por arrendamiento financiero</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_175_child" model="account.account.template">
             <field name="code">175</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Efectos a pagar</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_176_child" model="account.account.template">
             <field name="code">176</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Pasivos por derivados financieros</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_177_child" model="account.account.template">
             <field name="code">177</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Obligaciones y bonos</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_179_child" model="account.account.template">
             <field name="code">179</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Deudas representadas en otros valores negociables</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_180_child" model="account.account.template">
             <field name="code">180</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Fianzas recibidas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_181_child" model="account.account.template">
             <field name="code">181</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Anticipos recibidos por ventas o prestaciones de servicios</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_185_child" model="account.account.template">
             <field name="code">185</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Depósitos recibidos</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_190_child" model="account.account.template">
             <field name="code">190</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acciones o participaciones emitidas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_192_child" model="account.account.template">
             <field name="code">192</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Suscriptores de acciones</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_194_child" model="account.account.template">
             <field name="code">194</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Capital emitido pendiente de inscripción</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_195_child" model="account.account.template">
             <field name="code">195</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_197_child" model="account.account.template">
             <field name="code">197</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Suscriptores de acciones consideradas como pasivos financieros</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_199_child" model="account.account.template">
             <field name="code">199</field>
             <field name="reconcile" eval="False"/>
             <field name="name">Acciones o participaciones emitidas consideradas como pasivos financieros pendientes de inscripción</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_non_current_liabilities"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_200_child" model="account.account.template">
@@ -1244,9 +1244,9 @@
         </record>
         <record id="pgc_401_child" model="account.account.template">
             <field name="code">401</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Proveedores, efectos comerciales a pagar</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4030_child" model="account.account.template">
@@ -1286,30 +1286,30 @@
         </record>
         <record id="pgc_404_child" model="account.account.template">
             <field name="code">404</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Proveedores, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_405_child" model="account.account.template">
             <field name="code">405</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Proveedores, otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_406_child" model="account.account.template">
             <field name="code">406</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Envases y embalajes a devolver a proveedores</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_407_child" model="account.account.template">
             <field name="code">407</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Anticipos a proveedores</field>
-            <field name="user_type_id" ref="account.data_account_type_current_liabilities"/>
+            <field name="user_type_id" ref="account.data_account_type_payable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4100_child" model="account.account.template">
@@ -1398,9 +1398,9 @@
         </record>
         <record id="pgc_432_child" model="account.account.template">
             <field name="code">432</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Clientes, operaciones de factoring</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4330_child" model="account.account.template">
@@ -1454,37 +1454,37 @@
         </record>
         <record id="pgc_434_child" model="account.account.template">
             <field name="code">434</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Clientes, empresas asociadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_435_child" model="account.account.template">
             <field name="code">435</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Clientes, otras partes vinculadas</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_436_child" model="account.account.template">
             <field name="code">436</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Clientes de dudoso cobro</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_437_child" model="account.account.template">
             <field name="code">437</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Envases y embalajes a devolver por clientes</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_438_child" model="account.account.template">
             <field name="code">438</field>
-            <field name="reconcile" eval="False"/>
+            <field name="reconcile" eval="True"/>
             <field name="name">Anticipos de clientes</field>
-            <field name="user_type_id" ref="account.data_account_type_current_assets"/>
+            <field name="user_type_id" ref="account.data_account_type_receivable"/>
             <field name="chart_template_id" ref="l10n_es.account_chart_template_common"/>
         </record>
         <record id="pgc_4400_child" 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 dcbb27ad163..507c9a37da3 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -407,6 +407,12 @@ class PosOrder(models.Model):
                 # for debugging and support purposes
                 _logger.exception('Reconciliation did not work for order %s', order.name)
 
+    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':
+            return self.filtered(lambda order: order.state in filter_states and order.partner_id)
+        return self.filtered(lambda order: order.state in filter_states)
+
     def _default_session(self):
         return self.env['pos.session'].search([('state', '=', 'opened'), ('user_id', '=', self.env.uid)], limit=1)
 
diff --git a/addons/point_of_sale/models/pos_session.py b/addons/point_of_sale/models/pos_session.py
index 6f683d23638..ca0710de6ef 100644
--- a/addons/point_of_sale/models/pos_session.py
+++ b/addons/point_of_sale/models/pos_session.py
@@ -31,7 +31,7 @@ class PosSession(models.Model):
                 if order.state not in ('paid'):
                     raise UserError(_("You cannot confirm all orders of this session, because they don't have the 'paid' status"))
                 order.action_pos_order_done()
-            orders_to_reconcile = session.order_ids.filtered(lambda order: order.state in ['invoiced', 'done'] and order.partner_id)
+            orders_to_reconcile = session.order_ids._filtered_for_reconciliation()
             orders_to_reconcile.sudo()._reconcile_payments()
 
     config_id = fields.Many2one(
diff --git a/addons/report_intrastat/report/report_intrastat_report.py b/addons/report_intrastat/report/report_intrastat_report.py
index 40dd21df0a8..012fd84ea1b 100644
--- a/addons/report_intrastat/report/report_intrastat_report.py
+++ b/addons/report_intrastat/report/report_intrastat_report.py
@@ -66,7 +66,7 @@ class ReportIntrastat(models.Model):
                     left join report_intrastat_code intrastat on pt.intrastat_id = intrastat.id
                     left join (res_partner inv_address
                         left join res_country inv_country on (inv_country.id = inv_address.country_id))
-                    on (inv_address.id = inv.partner_id)
+                    on (inv_address.id = coalesce(inv.partner_shipping_id, inv.partner_id))
                 where
                     inv.state in ('open','paid')
                     and inv_line.product_id is not null