diff --git a/addons/l10n_ar/demo/account_customer_invoice_demo.xml b/addons/l10n_ar/demo/account_customer_invoice_demo.xml
index 034833cfc93..13ff737c23f 100644
--- a/addons/l10n_ar/demo/account_customer_invoice_demo.xml
+++ b/addons/l10n_ar/demo/account_customer_invoice_demo.xml
@@ -80,7 +80,6 @@
     <!-- Invoice to cerro castor, fiscal position changes taxes to exempt -->
     <record id="demo_invoice_6" model="account.move">
         <field name="partner_id" ref="res_partner_cerrocastor"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Operaciones exentas')], limit=1).id"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
@@ -101,7 +100,6 @@
     <record id="demo_invoice_7" model="account.move">
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-03'"/>
@@ -200,7 +198,6 @@
     <record id="demo_invoice_14" model="account.move">
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-20'"/>
@@ -215,7 +212,6 @@
     <record id="demo_invoice_15" model="account.move">
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-20'"/>
@@ -230,7 +226,6 @@
     <record id="demo_invoice_16" model="account.move">
         <field name="partner_id" ref="res_partner_expresso"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">out_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-22'"/>
@@ -273,6 +268,22 @@
         <value model="account.move.line" eval="obj().search([('move_id', 'in', [ref('demo_invoice_1'), ref('demo_invoice_2'), ref('demo_invoice_3'), ref('demo_invoice_4'), ref('demo_invoice_5'), ref('demo_invoice_6'), ref('demo_invoice_7'), ref('demo_invoice_8'), ref('demo_invoice_10'), ref('demo_invoice_11'), ref('demo_invoice_12'), ref('demo_invoice_13'), ref('demo_invoice_14'), ref('demo_invoice_15'), ref('demo_invoice_16'), ref('demo_invoice_17'), ref('demo_invoice_18')])]).ids"/>
     </function>
 
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_invoice_6')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_invoice_7')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_invoice_14')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_invoice_15')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_invoice_16')]"/>
+    </function>
+
     <function model="account.move" name="_recompute_dynamic_lines" context="{'check_move_validity': False}">
         <value eval="[ref('demo_invoice_1'), ref('demo_invoice_2'), ref('demo_invoice_3'), ref('demo_invoice_4'), ref('demo_invoice_5'), ref('demo_invoice_6'), ref('demo_invoice_7'), ref('demo_invoice_8'), ref('demo_invoice_10'), ref('demo_invoice_11'), ref('demo_invoice_12'), ref('demo_invoice_13'), ref('demo_invoice_14'), ref('demo_invoice_15'), ref('demo_invoice_16'), ref('demo_invoice_17'), ref('demo_invoice_18')]"/>
         <value eval="True"/>
diff --git a/addons/l10n_ar/demo/account_supplier_invoice_demo.xml b/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
index 2d44970f97a..e9e0285e174 100644
--- a/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
+++ b/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
@@ -6,7 +6,6 @@
     <!-- Invoice from gritti support service, auto fiscal position set VAT Not Applicable -->
     <record id="demo_sup_invoice_1" model="account.move">
         <field name="partner_id" ref="res_partner_gritti_agrimensura"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras IVA no corresponde')], limit=1).id"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
@@ -87,7 +86,6 @@
     <record id="demo_sup_invoice_6" model="account.move">
         <field name="partner_id" ref="res_partner_odoo"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-26'"/>
@@ -101,7 +99,6 @@
     <record id="demo_sup_invoice_7" model="account.move">
         <field name="partner_id" ref="res_partner_odoo"/>
         <field name="invoice_user_id" ref="base.user_demo"/>
-        <field name="fiscal_position_id" model="account.fiscal.position" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Compras / Ventas al exterior')], limit=1).id"/>
         <field name="invoice_payment_term_id" ref="account.account_payment_term_end_following_month"/>
         <field name="type">in_invoice</field>
         <field name="invoice_date" eval="time.strftime('%Y-%m')+'-27'"/>
@@ -219,37 +216,6 @@
         <field name="account_id" model="account.move.line" eval="obj().env.ref('product.product_category_all').property_account_income_categ_id.id"/>
     </record>
 
-    <!-- TODO add this once odoo tell us how manual taxes are encoded -->
-    <!-- <record id="demo_despacho_1_tax_line_1" model="account.move.tax">
-        <field name="amount">2138.0</field>
-        <field name="sequence">99</field>
-        <field name="manual" eval="True"/>
-        <field name="move_id" ref="demo_despacho_1"/>
-        <field name="tax_id" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Percepción Ganancias Sufrida'), ('type_tax_use', '=', 'purchase')], limit=1).id"/>
-        <field name="name" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Percepción Ganancias Sufrida'), ('type_tax_use', '=', 'purchase')], limit=1).name"/>
-        <field name="account_id" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Percepción Ganancias Sufrida'), ('type_tax_use', '=', 'purchase')], limit=1).account_id.id"/>
-    </record>
-
-    <record id="demo_despacho_1_tax_line_2" model="account.move.tax">
-        <field name="amount">890.84</field>
-        <field name="sequence">99</field>
-        <field name="manual" eval="True"/>
-        <field name="move_id" ref="demo_despacho_1"/>
-        <field name="tax_id" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Percepción IIBB CABA Sufrida'), ('type_tax_use', '=', 'purchase')], limit=1).id"/>
-        <field name="name" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Percepción IIBB CABA Sufrida'), ('type_tax_use', '=', 'purchase')], limit=1).name"/>
-        <field name="account_id" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'Percepción IIBB CABA Sufrida'), ('type_tax_use', '=', 'purchase')], limit=1).account_id.id"/>
-    </record>
-
-    <record id="demo_despacho_1_tax_line_3" model="account.move.tax">
-        <field name="amount">7126.67</field>
-        <field name="sequence">99</field>
-        <field name="manual" eval="True"/>
-        <field name="move_id" ref="demo_despacho_1"/>
-        <field name="tax_id" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA Adicional 20%'), ('type_tax_use', '=', 'purchase')], limit=1).id"/>
-        <field name="name" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA Adicional 20%'), ('type_tax_use', '=', 'purchase')], limit=1).name"/>
-        <field name="account_id" model="account.tax" eval="obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA Adicional 20%'), ('type_tax_use', '=', 'purchase')], limit=1).account_id.id"/>
-    </record> -->
-
     <record id="demo_sup_invoice_1" model="account.move">
         <field name="l10n_latam_document_number">0001-00000008</field>
     </record>
@@ -275,6 +241,31 @@
         <field name="l10n_latam_document_number">16052IC04000605L</field>
     </record>
 
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_1')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_2')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_3')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_4')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_5')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_6')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_sup_invoice_7')]"/>
+    </function>
+    <function model="account.move" name="_onchange_partner_id" context="{'check_move_validity': False}">
+        <value eval="[ref('demo_despacho_1')]"/>
+    </function>
+
     <function model="account.move.line" name="_onchange_product_id" context="{'check_move_validity': False}">
         <value model="account.move.line" eval="obj().search([('move_id', 'in', [ref('demo_sup_invoice_1'), ref('demo_sup_invoice_2'), ref('demo_sup_invoice_3'), ref('demo_sup_invoice_4'), ref('demo_sup_invoice_5'), ref('demo_sup_invoice_6'), ref('demo_sup_invoice_7')])]).ids"/>
     </function>
diff --git a/addons/l10n_ar/demo/res_partner_demo.xml b/addons/l10n_ar/demo/res_partner_demo.xml
index 398143d31f9..ebba240b4e3 100644
--- a/addons/l10n_ar/demo/res_partner_demo.xml
+++ b/addons/l10n_ar/demo/res_partner_demo.xml
@@ -133,7 +133,7 @@
         <field name="website">http://www.foreign-inc.com</field>
         <field name='l10n_latam_identification_type_id' ref="l10n_ar.it_cuit"/>
         <field name='vat'>30222222229</field>
-        <field name='l10n_ar_afip_responsibility_type_id' ref="l10n_ar.res_IVARI"/>
+        <field name='l10n_ar_afip_responsibility_type_id' ref="l10n_ar.res_EXT"/>
     </record>
 
     <!-- "MiPyme" IVA Inscripto -->