diff --git a/addons/l10n_ar/__manifest__.py b/addons/l10n_ar/__manifest__.py
index 04eb946e6cd..e2d10bfab25 100644
--- a/addons/l10n_ar/__manifest__.py
+++ b/addons/l10n_ar/__manifest__.py
@@ -85,9 +85,8 @@ Master Data:
         'data/uom_uom_data.xml',
         'data/l10n_latam.document.type.csv',
         'data/res_partner_data.xml',
-        'data/res_currency_data.xml',
+        'data/res.currency.csv',
         'data/res.country.csv',
-        'data/res_country_data.xml',
         'views/account_move_view.xml',
         'views/res_partner_view.xml',
         'views/res_company_view.xml',
diff --git a/addons/l10n_ar/data/res.country.csv b/addons/l10n_ar/data/res.country.csv
index 31e51526094..53e887cf3b7 100644
--- a/addons/l10n_ar/data/res.country.csv
+++ b/addons/l10n_ar/data/res.country.csv
@@ -1,49 +1,212 @@
-id,l10n_ar_afip_code/id
-base.al,401
-base.ao,149
-base.ar,200
-base.am,349
-base.aw,242
-base.au,501
-base.at,405
-base.az,350
-base.bs,239
-base.bd,345
-base.bb,201
-base.bo,202
-base.bg,407
-base.ca,204
-base.cl,208
-base.cn,310
-base.co,205
-base.cr,206
-base.cu,207
-base.dm,233
-base.ec,210
-base.sv,211
-base.ee,440
-base.ge,351
-base.hk,341
-base.in,315
-base.id,316
-base.ir,318
-base.il,319
-base.kw,323
-base.la,324
-base.li,418
-base.mt,420
-base.md,443
-base.mc,421
-base.mn,329
-base.me,453
-base.nr,503
-base.np,330
-base.pw,516
-base.pt,425
-base.sm,428
-base.rs,454
-base.es,410
-base.tk,699
-base.to,519
-base.tv,517
-base.uy,225
+id,l10n_ar_afip_code,l10n_ar_natural_vat,l10n_ar_legal_entity_vat,l10n_ar_other_vat
+base.af,,50000003015,55000003017,51600003015
+base.al,401,50000004011,55000004013,51600004011
+base.dz,,50000001020,55000001022,51600001020
+base.as,,50000006952,55000006954,51600006952
+base.ad,,50000004046,55000004048,51600004046
+base.ao,149,50000001497,55000001499,51600001497
+base.ai,,50000006529,55000006520,51600006529
+base.ag,,50000002256,55000002258,51600002256
+base.am,349,50000006022,55000006024,51600006022
+base.aw,242,50000006537,55000006539,51600006537
+base.au,501,50000004992,55000004994,51600004992
+base.at,405,50000004054,55000004056,51600004054
+base.az,350,50000003902,55000003904,51600003902
+base.bs,239,50000002906,55000002908,51600002906
+base.bh,,50000003031,55000003033,51600003031
+base.bd,345,50000003457,55000003459,51600003457
+base.bb,201,50000002019,55000002010,51600002019
+base.by,,50000004399,55000004390,51600004399
+base.be,,50000004062,55000004064,51600004062
+base.bz,,50000002361,55000002363,51600002361
+base.bj,,50000001624,55000001626,51600001624
+base.bm,,50000006634,55000006636,51600006634
+base.bt,,50000002825,55000002827,51600002825
+base.bo,202,50000000040,55000000042,51600000040
+base.ba,,50000004461,55000004463,51600004461
+base.bw,,50000001039,55000001030,51600001039
+base.br,,50000000059,55000000050,51600000059
+base.bn,,50000003910,55000003912,51600003910
+base.bg,407,50000004070,55000004072,51600004070
+base.bf,,50000001012,55000001014,51600001012
+base.bi,,50000001047,55000001049,51600001047
+base.kh,,50000003066,55000003068,51600003066
+base.cm,,50000001055,55000001057,51600001055
+base.ca,204,50000002043,55000002045,51600002043
+base.cv,,50000001500,55000001502,51600001500
+base.ky,,50000006715,55000006717,51600006715
+base.cf,,50000001071,55000001073,51600001071
+base.td,,50000001535,55000001537,51600001535
+base.cl,208,50000000032,55000000034,51600000032
+base.cn,310,50000003104,55000003106,51600003104
+base.cx,,50000006723,55000006725,51600006723
+base.cc,,50000006731,55000006733,51600006731
+base.co,205,50000002051,55000002053,51600002051
+base.km,,50000001896,55000001898,51600001896
+base.cg,,50000001527,55000001529,51600001527
+base.ck,,50000006545,55000006547,51600006545
+base.cr,206,50000001586,55000001588,51600001586
+base.ci,,50000001101,55000001103,51600001101
+base.hr,,50000006030,55000006032,51600006030
+base.cu,207,50000002396,55000002398,51600002396
+base.cy,,50000003112,55000003114,51600003112
+base.cz,,50000006057,55000006059,51600006057
+base.dk,,50000004097,55000004099,51600004097
+base.dj,,50000001861,55000001863,51600001861
+base.dm,233,50000002337,55000002339,51600002337
+base.do,,50000002094,55000002096,51600002094
+base.ec,210,50000002426,55000002428,51600002426
+base.eg,,50000001136,55000001138,51600001136
+base.sv,211,50000002116,55000002118,51600002116
+base.gq,,50000001195,55000001197,51600001195
+base.er,,50000001853,55000001855,51600001853
+base.ee,440,50000004402,55000004404,51600004402
+base.et,,50000001144,55000001146,51600001144
+base.fo,,50000006065,55000006067,51600006065
+base.fj,,50000005123,55000005125,51600005123
+base.fi,,50000004119,55000004110,51600004119
+base.fr,,50000004127,55000004129,51600004127
+base.pf,,50000006561,55000006563,51600006561
+base.ga,,50000001152,55000001154,51600001152
+base.gm,,50000001160,55000001162,51600001160
+base.ge,351,50000003880,55000003882,51600003880
+base.de,,50000004380,55000004382,51600004380
+base.gh,,50000001179,55000001170,51600001179
+base.gi,,50000006650,55000006652,51600006650
+base.gr,,50000004135,55000004137,51600004135
+base.gl,,50000006669,55000006660,51600006669
+base.gd,,50000002882,55000002884,51600002884
+base.gu,,50000006677,55000006679,51600006677
+base.gt,,50000002132,55000002134,51600002132
+base.gn,,50000001187,55000001189,51600001187
+base.gw,,50000001845,55000001847,51600001845
+base.gy,,50000002140,55000002142,51600002140
+base.ht,,50000002159,55000002150,51600002159
+base.va,,50000004313,55000004315,51600004313
+base.hn,,50000002167,55000002169,51600002167
+base.hk,341,50000006685,55000006687,51600006685
+base.hu,,50000004143,55000004145,51600004143
+base.is,,50000003813,55000003815,51600003813
+base.in,315,50000003155,55000003157,51600003155
+base.id,316,50000003163,55000003165,51600003163
+base.ir,318,50000002930,55000002932,51600002930
+base.ie,,50000004151,55000004153,51600004151
+base.il,319,50000002876,55000002878,51600002876
+base.it,,50000003546,55000003548,51600003546
+base.jm,,50000002175,55000002177,51600002175
+base.jp,,50000003201,55000003203,51600003201
+base.jo,,50000003007,55000003009,51600003007
+base.kz,,50000003929,55000003920,51600003929
+base.ke,,50000001209,55000001200,51600001209
+base.ki,,50000005166,55000005168,51600005166
+base.kw,323,50000003236,55000003238,51600003236
+base.kg,,50000003937,55000003939,51600003937
+base.la,324,50000003244,55000003246,51600003244
+base.lv,,50000004410,55000004412,51600004410
+base.lb,,50000003252,55000003254,51600003252
+base.ls,,50000001217,55000001219,51600001217
+base.lr,,50000001225,55000001227,51600001225
+base.ly,,50000001233,55000001235,51600001233
+base.li,418,50000004186,55000004188,51600004186
+base.lt,,50000004429,55000004420,51600004429
+base.lu,,50000004194,55000004196,51600004194
+base.mo,,50000003449,55000003440,51600003449
+base.mk,,50000004909,55000004900,51600004909
+base.mg,,50000001241,55000001243,51600001241
+base.mw,,50000001543,55000001545,51600001543
+base.my,,50000003260,55000003262,51600003260
+base.mv,,50000003279,55000003270,51600003279
+base.ml,,50000001632,55000001634,51600001632
+base.mt,420,50000004364,55000004366,51600004364
+base.mh,,50000005204,55000005206,51600005204
+base.mr,,50000001292,55000001294,51600001292
+base.mu,,50000001284,55000001286,51600001284
+base.mx,,50000002183,55000002185,51600002183
+base.fm,,50000005905,55000005907,51600005905
+base.md,443,50000004437,55000004439,51600004437
+base.mc,421,50000004216,55000004218,51600004216
+base.mn,329,50000003295,55000003297,51600003295
+base.ms,,50000006863,55000006865,51600006863
+base.ma,,50000001276,55000001278,51600001276
+base.mz,,50000001519,55000001510,51600001519
+base.mm,,50000002841,55000002843,51600002841
+base.na,,50000001837,55000001839,51600001837
+base.nr,503,50000005034,55000005036,51600005034
+base.np,330,50000003309,55000003300,51600003309
+base.nl,,50000004232,55000004234,51600004232
+base.nz,,50000005042,55000005044,51600005042
+base.ni,,50000002191,55000002193,51600002191
+base.ne,,50000001306,55000001308,51600001306
+base.ng,,50000001314,55000001316,51600001314
+base.nu,,50000006871,55000006873,51600006871
+base.mp,,50000005212,55000005214,51600005212
+base.kp,,50000003082,55000003084,51600003082
+base.no,,50000004224,55000004226,51600004224
+base.om,,50000003287,55000003289,51600003287
+base.pk,,50000003325,55000003327,51600003325
+base.pw,516,50000005913,55000005915,51600005913
+base.pa,,50000002205,55000002207,51600002205
+base.pg,,50000005131,55000005133,51600005131
+base.py,,50000000024,55000000026,51600000024
+base.pe,,50000002221,55000002223,51600002221
+base.ph,,50000003120,55000003122,51600003120
+base.pn,,50000006901,55000006903,51600006901
+base.pl,,50000004240,55000004242,51600004240
+base.pt,425,50000004259,55000004250,51600004259
+base.pr,,50000002213,55000002215,51600002213
+base.qa,,50000002981,55000002983,51600002981
+base.ro,,50000004275,55000004277,51600004275
+base.ru,,50000006014,55000006016,51600006014
+base.rw,,50000001330,55000001332,51600001330
+base.sh,,50000006979,55000006970,51600006979
+base.kn,,50000002892,55000002894,51600002892
+base.lc,,50000002345,55000002347,51600002345
+base.vc,,50000002353,55000002355,51600002353
+base.ws,,50000005069,55000005069,51600005069
+base.sm,428,50000004283,55000004285,51600004283
+base.st,,50000001829,55000001820,51600001829
+base.sa,,50000003023,55000003025,51600003023
+base.sn,,50000001349,55000001340,51600001349
+base.sc,,50000001810,55000001812,51600001810
+base.sl,,50000001357,55000001359,51600001357
+base.sg,,50000003333,55000003335,51600003333
+base.si,,50000004496,55000004498,51600004496
+base.sb,,50000005182,55000005184,51600005182
+base.so,,50000001365,55000001367,51600001365
+base.za,,50000001713,55000001715,51600001713
+base.kr,,50000003090,55000003092,51600003090
+base.es,410,50000004100,55000004102,51600004100
+base.lk,,50000003074,55000003076,51600003074
+base.sd,,50000001381,55000001383,51600001381
+base.sr,,50000002329,55000002320,51600002329
+base.sz,,50000001373,55000001375,51600001373
+base.se,,50000004291,55000004293,51600004291
+base.ch,,50000004305,55000004307,51600004305
+base.sy,,50000003341,55000003343,51600003341
+base.tw,,50000003139,55000003130,51600003139
+base.tj,,50000003899,55000003890,51600003899
+base.tz,,50000001551,55000001553,51600001551
+base.th,,50000002914,55000002916,51600002914
+base.tg,,50000001403,55000001405,51600001403
+base.tk,699,50000006995,55000006997,51600006995
+base.to,519,50000005190,55000005192,51600005190
+base.tt,,50000002434,55000002436,51600002434
+base.tn,,50000001411,55000001413,51600001411
+base.tr,,50000003503,55000003505,51600003503
+base.tm,,50000003554,55000003556,51600003554
+base.tc,,50000006782,55000006784,51600006782
+base.tv,517,50000005174,55000005176,51600005174
+base.ug,,50000001705,55000001707,51600001705
+base.ua,,50000006049,55000006040,51600006049
+base.ae,,50000003317,55000003319,51600003317
+base.uk,,50000004267,55000004269,51600004267
+base.us,,50000002124,55000002126,51600002124
+base.uy,225,,55000000018,51600000016
+base.uz,,50000003562,55000003564,51600003562
+base.vu,,50000005050,55000005052,51600005050
+base.ve,,50000002264,55000002266,51600002264
+base.vn,,50000003376,55000003378,51600003376
+base.vg,,50000006820,55000006822,51600006820
+base.ye,,50000003392,55000003394,51600003392
+base.zm,,50000001446,55000001448,51600001446
+base.zw,,50000001322,55000001324,51600001322
diff --git a/addons/l10n_ar/data/res.currency.csv b/addons/l10n_ar/data/res.currency.csv
new file mode 100644
index 00000000000..80771bc6363
--- /dev/null
+++ b/addons/l10n_ar/data/res.currency.csv
@@ -0,0 +1,46 @@
+id,l10n_ar_afip_code
+base.ARS,PES
+base.EUR,60
+base.USD,DOL
+base.ANG,28
+base.AUD,26
+base.BOB,31
+base.BRL,12
+base.CAD,18
+base.CHF,09
+base.CLP,33
+base.CNY,64
+base.COP,32
+base.CZK,24
+base.DKK,14
+base.DOP,42
+base.ECS,36
+base.EGP,46
+base.GBP,21
+base.GTQ,55
+base.HKD,51
+base.HNL,63
+base.HUF,56
+base.ILS,30
+base.INR,62
+base.ITL,04
+base.JMD,53
+base.JPY,19
+base.KWD,59
+base.MAD,45
+base.MXN,10
+base.NIO,44
+base.NOK,15
+base.PAB,43
+base.PEN,35
+base.PLN,61
+base.PYG,29
+base.RON,40
+base.SAR,47
+base.SEK,16
+base.SGD,52
+base.THB,57
+base.TWD,54
+base.UYU,11
+base.VEF,23
+base.ZAR,34
diff --git a/addons/l10n_ar/data/res_country_data.xml b/addons/l10n_ar/data/res_country_data.xml
deleted file mode 100644
index 25c77a1763c..00000000000
--- a/addons/l10n_ar/data/res_country_data.xml
+++ /dev/null
@@ -1,1081 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo noupdate="True">
-    <record model="res.country" id="base.ar">
-        <field name="vat_label">CUIT</field>
-    </record>
-    <record model='res.country' id='base.ad'>
-        <field name='l10n_ar_legal_entity_vat'>55000004048</field>
-        <field name='l10n_ar_natural_vat'>50000004046</field>
-        <field name='l10n_ar_other_vat'>51600004046</field>
-    </record>
-    <record model='res.country' id='base.ae'>
-        <field name='l10n_ar_legal_entity_vat'>55000003319</field>
-        <field name='l10n_ar_natural_vat'>50000003317</field>
-        <field name='l10n_ar_other_vat'>51600003317</field>
-    </record>
-    <record model='res.country' id='base.af'>
-        <field name='l10n_ar_legal_entity_vat'>55000003017</field>
-        <field name='l10n_ar_natural_vat'>50000003015</field>
-        <field name='l10n_ar_other_vat'>51600003015</field>
-    </record>
-    <record model='res.country' id='base.ag'>
-        <field name='l10n_ar_legal_entity_vat'>55000002258</field>
-        <field name='l10n_ar_natural_vat'>50000002256</field>
-        <field name='l10n_ar_other_vat'>51600002256</field>
-    </record>
-    <record model='res.country' id='base.ai'>
-        <field name='l10n_ar_legal_entity_vat'>55000006520</field>
-        <field name='l10n_ar_natural_vat'>50000006529</field>
-        <field name='l10n_ar_other_vat'>51600006529</field>
-    </record>
-    <record model='res.country' id='base.al'>
-        <field name='l10n_ar_legal_entity_vat'>55000004013</field>
-        <field name='l10n_ar_natural_vat'>50000004011</field>
-        <field name='l10n_ar_other_vat'>51600004011</field>
-    </record>
-    <record model='res.country' id='base.am'>
-        <field name='l10n_ar_legal_entity_vat'>55000006024</field>
-        <field name='l10n_ar_natural_vat'>50000006022</field>
-        <field name='l10n_ar_other_vat'>51600006022</field>
-    </record>
-    <record model='res.country' id='base.ao'>
-        <field name='l10n_ar_legal_entity_vat'>55000001499</field>
-        <field name='l10n_ar_natural_vat'>50000001497</field>
-        <field name='l10n_ar_other_vat'>51600001497</field>
-    </record>
-    <record model='res.country' id='base.as'>
-        <field name='l10n_ar_legal_entity_vat'>55000006954</field>
-        <field name='l10n_ar_natural_vat'>50000006952</field>
-        <field name='l10n_ar_other_vat'>51600006952</field>
-    </record>
-    <record model='res.country' id='base.at'>
-        <field name='l10n_ar_legal_entity_vat'>55000004056</field>
-        <field name='l10n_ar_natural_vat'>50000004054</field>
-        <field name='l10n_ar_other_vat'>51600004054</field>
-    </record>
-    <record model='res.country' id='base.au'>
-        <field name='l10n_ar_legal_entity_vat'>55000004994</field>
-        <field name='l10n_ar_natural_vat'>50000004992</field>
-        <field name='l10n_ar_other_vat'>51600004992</field>
-    </record>
-    <record model='res.country' id='base.aw'>
-        <field name='l10n_ar_legal_entity_vat'>55000006539</field>
-        <field name='l10n_ar_natural_vat'>50000006537</field>
-        <field name='l10n_ar_other_vat'>51600006537</field>
-    </record>
-    <record model='res.country' id='base.az'>
-        <field name='l10n_ar_legal_entity_vat'>55000003904</field>
-        <field name='l10n_ar_natural_vat'>50000003902</field>
-        <field name='l10n_ar_other_vat'>51600003902</field>
-    </record>
-    <record model='res.country' id='base.ba'>
-        <field name='l10n_ar_legal_entity_vat'>55000004463</field>
-        <field name='l10n_ar_natural_vat'>50000004461</field>
-        <field name='l10n_ar_other_vat'>51600004461</field>
-    </record>
-    <record model='res.country' id='base.bb'>
-        <field name='l10n_ar_legal_entity_vat'>55000002010</field>
-        <field name='l10n_ar_natural_vat'>50000002019</field>
-        <field name='l10n_ar_other_vat'>51600002019</field>
-    </record>
-    <record model='res.country' id='base.bd'>
-        <field name='l10n_ar_legal_entity_vat'>55000003459</field>
-        <field name='l10n_ar_natural_vat'>50000003457</field>
-        <field name='l10n_ar_other_vat'>51600003457</field>
-    </record>
-    <record model='res.country' id='base.be'>
-        <field name='l10n_ar_legal_entity_vat'>55000004064</field>
-        <field name='l10n_ar_natural_vat'>50000004062</field>
-        <field name='l10n_ar_other_vat'>51600004062</field>
-    </record>
-    <record model='res.country' id='base.bf'>
-        <field name='l10n_ar_legal_entity_vat'>55000001014</field>
-        <field name='l10n_ar_natural_vat'>50000001012</field>
-        <field name='l10n_ar_other_vat'>51600001012</field>
-    </record>
-    <record model='res.country' id='base.bg'>
-        <field name='l10n_ar_legal_entity_vat'>55000004072</field>
-        <field name='l10n_ar_natural_vat'>50000004070</field>
-        <field name='l10n_ar_other_vat'>51600004070</field>
-    </record>
-    <record model='res.country' id='base.bh'>
-        <field name='l10n_ar_legal_entity_vat'>55000003033</field>
-        <field name='l10n_ar_natural_vat'>50000003031</field>
-        <field name='l10n_ar_other_vat'>51600003031</field>
-    </record>
-    <record model='res.country' id='base.bi'>
-        <field name='l10n_ar_legal_entity_vat'>55000001049</field>
-        <field name='l10n_ar_natural_vat'>50000001047</field>
-        <field name='l10n_ar_other_vat'>51600001047</field>
-    </record>
-    <record model='res.country' id='base.bj'>
-        <field name='l10n_ar_legal_entity_vat'>55000001626</field>
-        <field name='l10n_ar_natural_vat'>50000001624</field>
-        <field name='l10n_ar_other_vat'>51600001624</field>
-    </record>
-    <record model='res.country' id='base.bm'>
-        <field name='l10n_ar_legal_entity_vat'>55000006636</field>
-        <field name='l10n_ar_natural_vat'>50000006634</field>
-        <field name='l10n_ar_other_vat'>51600006634</field>
-    </record>
-    <record model='res.country' id='base.bn'>
-        <field name='l10n_ar_legal_entity_vat'>55000003912</field>
-        <field name='l10n_ar_natural_vat'>50000003910</field>
-        <field name='l10n_ar_other_vat'>51600003910</field>
-    </record>
-    <record model='res.country' id='base.bo'>
-        <field name='l10n_ar_legal_entity_vat'>55000000042</field>
-        <field name='l10n_ar_natural_vat'>50000000040</field>
-        <field name='l10n_ar_other_vat'>51600000040</field>
-    </record>
-    <record model='res.country' id='base.br'>
-        <field name='l10n_ar_legal_entity_vat'>55000000050</field>
-        <field name='l10n_ar_natural_vat'>50000000059</field>
-        <field name='l10n_ar_other_vat'>51600000059</field>
-    </record>
-    <record model='res.country' id='base.bs'>
-        <field name='l10n_ar_legal_entity_vat'>55000002908</field>
-        <field name='l10n_ar_natural_vat'>50000002906</field>
-        <field name='l10n_ar_other_vat'>51600002906</field>
-    </record>
-    <record model='res.country' id='base.bt'>
-        <field name='l10n_ar_legal_entity_vat'>55000002827</field>
-        <field name='l10n_ar_natural_vat'>50000002825</field>
-        <field name='l10n_ar_other_vat'>51600002825</field>
-    </record>
-    <record model='res.country' id='base.bw'>
-        <field name='l10n_ar_legal_entity_vat'>55000001030</field>
-        <field name='l10n_ar_natural_vat'>50000001039</field>
-        <field name='l10n_ar_other_vat'>51600001039</field>
-    </record>
-    <record model='res.country' id='base.by'>
-        <field name='l10n_ar_legal_entity_vat'>55000004390</field>
-        <field name='l10n_ar_natural_vat'>50000004399</field>
-        <field name='l10n_ar_other_vat'>51600004399</field>
-    </record>
-    <record model='res.country' id='base.bz'>
-        <field name='l10n_ar_legal_entity_vat'>55000002363</field>
-        <field name='l10n_ar_natural_vat'>50000002361</field>
-        <field name='l10n_ar_other_vat'>51600002361</field>
-    </record>
-    <record model='res.country' id='base.ca'>
-        <field name='l10n_ar_legal_entity_vat'>55000002045</field>
-        <field name='l10n_ar_natural_vat'>50000002043</field>
-        <field name='l10n_ar_other_vat'>51600002043</field>
-    </record>
-    <record model='res.country' id='base.cc'>
-        <field name='l10n_ar_legal_entity_vat'>55000006733</field>
-        <field name='l10n_ar_natural_vat'>50000006731</field>
-        <field name='l10n_ar_other_vat'>51600006731</field>
-    </record>
-    <record model='res.country' id='base.cf'>
-        <field name='l10n_ar_legal_entity_vat'>55000001073</field>
-        <field name='l10n_ar_natural_vat'>50000001071</field>
-        <field name='l10n_ar_other_vat'>51600001071</field>
-    </record>
-    <record model='res.country' id='base.cg'>
-        <field name='l10n_ar_legal_entity_vat'>55000001529</field>
-        <field name='l10n_ar_natural_vat'>50000001527</field>
-        <field name='l10n_ar_other_vat'>51600001527</field>
-    </record>
-    <record model='res.country' id='base.ch'>
-        <field name='l10n_ar_legal_entity_vat'>55000004307</field>
-        <field name='l10n_ar_natural_vat'>50000004305</field>
-        <field name='l10n_ar_other_vat'>51600004305</field>
-    </record>
-    <record model='res.country' id='base.ci'>
-        <field name='l10n_ar_legal_entity_vat'>55000001103</field>
-        <field name='l10n_ar_natural_vat'>50000001101</field>
-        <field name='l10n_ar_other_vat'>51600001101</field>
-    </record>
-    <record model='res.country' id='base.ck'>
-        <field name='l10n_ar_legal_entity_vat'>55000006547</field>
-        <field name='l10n_ar_natural_vat'>50000006545</field>
-        <field name='l10n_ar_other_vat'>51600006545</field>
-    </record>
-    <record model='res.country' id='base.cl'>
-        <field name='l10n_ar_legal_entity_vat'>55000000034</field>
-        <field name='l10n_ar_natural_vat'>50000000032</field>
-        <field name='l10n_ar_other_vat'>51600000032</field>
-    </record>
-    <record model='res.country' id='base.cm'>
-        <field name='l10n_ar_legal_entity_vat'>55000001057</field>
-        <field name='l10n_ar_natural_vat'>50000001055</field>
-        <field name='l10n_ar_other_vat'>51600001055</field>
-    </record>
-    <record model='res.country' id='base.cn'>
-        <field name='l10n_ar_legal_entity_vat'>55000003106</field>
-        <field name='l10n_ar_natural_vat'>50000003104</field>
-        <field name='l10n_ar_other_vat'>51600003104</field>
-    </record>
-    <record model='res.country' id='base.co'>
-        <field name='l10n_ar_legal_entity_vat'>55000002053</field>
-        <field name='l10n_ar_natural_vat'>50000002051</field>
-        <field name='l10n_ar_other_vat'>51600002051</field>
-    </record>
-    <record model='res.country' id='base.cr'>
-        <field name='l10n_ar_legal_entity_vat'>55000001588</field>
-        <field name='l10n_ar_natural_vat'>50000001586</field>
-        <field name='l10n_ar_other_vat'>51600001586</field>
-    </record>
-    <record model='res.country' id='base.cu'>
-        <field name='l10n_ar_legal_entity_vat'>55000002398</field>
-        <field name='l10n_ar_natural_vat'>50000002396</field>
-        <field name='l10n_ar_other_vat'>51600002396</field>
-    </record>
-    <record model='res.country' id='base.cv'>
-        <field name='l10n_ar_legal_entity_vat'>55000001502</field>
-        <field name='l10n_ar_natural_vat'>50000001500</field>
-        <field name='l10n_ar_other_vat'>51600001500</field>
-    </record>
-    <record model='res.country' id='base.cx'>
-        <field name='l10n_ar_legal_entity_vat'>55000006725</field>
-        <field name='l10n_ar_natural_vat'>50000006723</field>
-        <field name='l10n_ar_other_vat'>51600006723</field>
-    </record>
-    <record model='res.country' id='base.cy'>
-        <field name='l10n_ar_legal_entity_vat'>55000003114</field>
-        <field name='l10n_ar_natural_vat'>50000003112</field>
-        <field name='l10n_ar_other_vat'>51600003112</field>
-    </record>
-    <record model='res.country' id='base.cz'>
-        <field name='l10n_ar_legal_entity_vat'>55000006059</field>
-        <field name='l10n_ar_natural_vat'>50000006057</field>
-        <field name='l10n_ar_other_vat'>51600006057</field>
-    </record>
-    <record model='res.country' id='base.de'>
-        <field name='l10n_ar_legal_entity_vat'>55000004382</field>
-        <field name='l10n_ar_natural_vat'>50000004380</field>
-        <field name='l10n_ar_other_vat'>51600004380</field>
-    </record>
-    <record model='res.country' id='base.dj'>
-        <field name='l10n_ar_legal_entity_vat'>55000001863</field>
-        <field name='l10n_ar_natural_vat'>50000001861</field>
-        <field name='l10n_ar_other_vat'>51600001861</field>
-    </record>
-    <record model='res.country' id='base.dk'>
-        <field name='l10n_ar_legal_entity_vat'>55000004099</field>
-        <field name='l10n_ar_natural_vat'>50000004097</field>
-        <field name='l10n_ar_other_vat'>51600004097</field>
-    </record>
-    <record model='res.country' id='base.dm'>
-        <field name='l10n_ar_legal_entity_vat'>55000002339</field>
-        <field name='l10n_ar_natural_vat'>50000002337</field>
-        <field name='l10n_ar_other_vat'>51600002337</field>
-    </record>
-    <record model='res.country' id='base.do'>
-        <field name='l10n_ar_legal_entity_vat'>55000002096</field>
-        <field name='l10n_ar_natural_vat'>50000002094</field>
-        <field name='l10n_ar_other_vat'>51600002094</field>
-    </record>
-    <record model='res.country' id='base.dz'>
-        <field name='l10n_ar_legal_entity_vat'>55000001022</field>
-        <field name='l10n_ar_natural_vat'>50000001020</field>
-        <field name='l10n_ar_other_vat'>51600001020</field>
-    </record>
-    <record model='res.country' id='base.ec'>
-        <field name='l10n_ar_legal_entity_vat'>55000002428</field>
-        <field name='l10n_ar_natural_vat'>50000002426</field>
-        <field name='l10n_ar_other_vat'>51600002426</field>
-    </record>
-    <record model='res.country' id='base.ee'>
-        <field name='l10n_ar_legal_entity_vat'>55000004404</field>
-        <field name='l10n_ar_natural_vat'>50000004402</field>
-        <field name='l10n_ar_other_vat'>51600004402</field>
-    </record>
-    <record model='res.country' id='base.eg'>
-        <field name='l10n_ar_legal_entity_vat'>55000001138</field>
-        <field name='l10n_ar_natural_vat'>50000001136</field>
-        <field name='l10n_ar_other_vat'>51600001136</field>
-    </record>
-    <record model='res.country' id='base.er'>
-        <field name='l10n_ar_legal_entity_vat'>55000001855</field>
-        <field name='l10n_ar_natural_vat'>50000001853</field>
-        <field name='l10n_ar_other_vat'>51600001853</field>
-    </record>
-    <record model='res.country' id='base.es'>
-        <field name='l10n_ar_legal_entity_vat'>55000004102</field>
-        <field name='l10n_ar_natural_vat'>50000004100</field>
-        <field name='l10n_ar_other_vat'>51600004100</field>
-    </record>
-    <record model='res.country' id='base.et'>
-        <field name='l10n_ar_legal_entity_vat'>55000001146</field>
-        <field name='l10n_ar_natural_vat'>50000001144</field>
-        <field name='l10n_ar_other_vat'>51600001144</field>
-    </record>
-    <record model='res.country' id='base.fi'>
-        <field name='l10n_ar_legal_entity_vat'>55000004110</field>
-        <field name='l10n_ar_natural_vat'>50000004119</field>
-        <field name='l10n_ar_other_vat'>51600004119</field>
-    </record>
-    <record model='res.country' id='base.fj'>
-        <field name='l10n_ar_legal_entity_vat'>55000005125</field>
-        <field name='l10n_ar_natural_vat'>50000005123</field>
-        <field name='l10n_ar_other_vat'>51600005123</field>
-    </record>
-    <record model='res.country' id='base.fm'>
-        <field name='l10n_ar_legal_entity_vat'>55000005907</field>
-        <field name='l10n_ar_natural_vat'>50000005905</field>
-        <field name='l10n_ar_other_vat'>51600005905</field>
-    </record>
-    <record model='res.country' id='base.fo'>
-        <field name='l10n_ar_legal_entity_vat'>55000006067</field>
-        <field name='l10n_ar_natural_vat'>50000006065</field>
-        <field name='l10n_ar_other_vat'>51600006065</field>
-    </record>
-    <record model='res.country' id='base.fr'>
-        <field name='l10n_ar_legal_entity_vat'>55000004129</field>
-        <field name='l10n_ar_natural_vat'>50000004127</field>
-        <field name='l10n_ar_other_vat'>51600004127</field>
-    </record>
-    <record model='res.country' id='base.ga'>
-        <field name='l10n_ar_legal_entity_vat'>55000001154</field>
-        <field name='l10n_ar_natural_vat'>50000001152</field>
-        <field name='l10n_ar_other_vat'>51600001152</field>
-    </record>
-    <record model='res.country' id='base.uk'><!-- gb -->
-        <field name='l10n_ar_legal_entity_vat'>55000004269</field>
-        <field name='l10n_ar_natural_vat'>50000004267</field>
-        <field name='l10n_ar_other_vat'>51600004267</field>
-    </record>
-    <record model='res.country' id='base.gd'>
-        <field name='l10n_ar_legal_entity_vat'>55000002884</field>
-        <field name='l10n_ar_natural_vat'>50000002882</field>
-        <field name='l10n_ar_other_vat'>51600002884</field>
-    </record>
-    <record model='res.country' id='base.ge'>
-        <field name='l10n_ar_legal_entity_vat'>55000003882</field>
-        <field name='l10n_ar_natural_vat'>50000003880</field>
-        <field name='l10n_ar_other_vat'>51600003880</field>
-    </record>
-    <record model='res.country' id='base.gh'>
-        <field name='l10n_ar_legal_entity_vat'>55000001170</field>
-        <field name='l10n_ar_natural_vat'>50000001179</field>
-        <field name='l10n_ar_other_vat'>51600001179</field>
-    </record>
-    <record model='res.country' id='base.gi'>
-        <field name='l10n_ar_legal_entity_vat'>55000006652</field>
-        <field name='l10n_ar_natural_vat'>50000006650</field>
-        <field name='l10n_ar_other_vat'>51600006650</field>
-    </record>
-    <record model='res.country' id='base.gl'>
-        <field name='l10n_ar_legal_entity_vat'>55000006660</field>
-        <field name='l10n_ar_natural_vat'>50000006669</field>
-        <field name='l10n_ar_other_vat'>51600006669</field>
-    </record>
-    <record model='res.country' id='base.gm'>
-        <field name='l10n_ar_legal_entity_vat'>55000001162</field>
-        <field name='l10n_ar_natural_vat'>50000001160</field>
-        <field name='l10n_ar_other_vat'>51600001160</field>
-    </record>
-    <record model='res.country' id='base.gn'>
-        <field name='l10n_ar_legal_entity_vat'>55000001189</field>
-        <field name='l10n_ar_natural_vat'>50000001187</field>
-        <field name='l10n_ar_other_vat'>51600001187</field>
-    </record>
-    <record model='res.country' id='base.gq'>
-        <field name='l10n_ar_legal_entity_vat'>55000001197</field>
-        <field name='l10n_ar_natural_vat'>50000001195</field>
-        <field name='l10n_ar_other_vat'>51600001195</field>
-    </record>
-    <record model='res.country' id='base.gr'>
-        <field name='l10n_ar_legal_entity_vat'>55000004137</field>
-        <field name='l10n_ar_natural_vat'>50000004135</field>
-        <field name='l10n_ar_other_vat'>51600004135</field>
-    </record>
-    <record model='res.country' id='base.gt'>
-        <field name='l10n_ar_legal_entity_vat'>55000002134</field>
-        <field name='l10n_ar_natural_vat'>50000002132</field>
-        <field name='l10n_ar_other_vat'>51600002132</field>
-    </record>
-    <record model='res.country' id='base.gu'>
-        <field name='l10n_ar_legal_entity_vat'>55000006679</field>
-        <field name='l10n_ar_natural_vat'>50000006677</field>
-        <field name='l10n_ar_other_vat'>51600006677</field>
-    </record>
-    <record model='res.country' id='base.gw'>
-        <field name='l10n_ar_legal_entity_vat'>55000001847</field>
-        <field name='l10n_ar_natural_vat'>50000001845</field>
-        <field name='l10n_ar_other_vat'>51600001845</field>
-    </record>
-    <record model='res.country' id='base.gy'>
-        <field name='l10n_ar_legal_entity_vat'>55000002142</field>
-        <field name='l10n_ar_natural_vat'>50000002140</field>
-        <field name='l10n_ar_other_vat'>51600002140</field>
-    </record>
-    <record model='res.country' id='base.hk'>
-        <field name='l10n_ar_legal_entity_vat'>55000003416</field>
-        <field name='l10n_ar_natural_vat'>50000003414</field>
-        <field name='l10n_ar_other_vat'>51600003414</field>
-    </record>
-    <record model='res.country' id='base.hk'>
-        <field name='l10n_ar_legal_entity_vat'>55000006687</field>
-        <field name='l10n_ar_natural_vat'>50000006685</field>
-        <field name='l10n_ar_other_vat'>51600006685</field>
-    </record>
-    <record model='res.country' id='base.hn'>
-        <field name='l10n_ar_legal_entity_vat'>55000002169</field>
-        <field name='l10n_ar_natural_vat'>50000002167</field>
-        <field name='l10n_ar_other_vat'>51600002167</field>
-    </record>
-    <record model='res.country' id='base.hr'>
-        <field name='l10n_ar_legal_entity_vat'>55000006032</field>
-        <field name='l10n_ar_natural_vat'>50000006030</field>
-        <field name='l10n_ar_other_vat'>51600006030</field>
-    </record>
-    <record model='res.country' id='base.ht'>
-        <field name='l10n_ar_legal_entity_vat'>55000002150</field>
-        <field name='l10n_ar_natural_vat'>50000002159</field>
-        <field name='l10n_ar_other_vat'>51600002159</field>
-    </record>
-    <record model='res.country' id='base.hu'>
-        <field name='l10n_ar_legal_entity_vat'>55000004145</field>
-        <field name='l10n_ar_natural_vat'>50000004143</field>
-        <field name='l10n_ar_other_vat'>51600004143</field>
-    </record>
-    <record model='res.country' id='base.id'>
-        <field name='l10n_ar_legal_entity_vat'>55000003165</field>
-        <field name='l10n_ar_natural_vat'>50000003163</field>
-        <field name='l10n_ar_other_vat'>51600003163</field>
-    </record>
-    <record model='res.country' id='base.ie'>
-        <field name='l10n_ar_legal_entity_vat'>55000004153</field>
-        <field name='l10n_ar_natural_vat'>50000004151</field>
-        <field name='l10n_ar_other_vat'>51600004151</field>
-    </record>
-    <record model='res.country' id='base.il'>
-        <field name='l10n_ar_legal_entity_vat'>55000002878</field>
-        <field name='l10n_ar_natural_vat'>50000002876</field>
-        <field name='l10n_ar_other_vat'>51600002876</field>
-    </record>
-    <record model='res.country' id='base.in'>
-        <field name='l10n_ar_legal_entity_vat'>55000003157</field>
-        <field name='l10n_ar_natural_vat'>50000003155</field>
-        <field name='l10n_ar_other_vat'>51600003155</field>
-    </record>
-    <record model='res.country' id='base.ir'>
-        <field name='l10n_ar_legal_entity_vat'>55000002932</field>
-        <field name='l10n_ar_natural_vat'>50000002930</field>
-        <field name='l10n_ar_other_vat'>51600002930</field>
-    </record>
-    <record model='res.country' id='base.is'>
-        <field name='l10n_ar_legal_entity_vat'>55000003815</field>
-        <field name='l10n_ar_natural_vat'>50000003813</field>
-        <field name='l10n_ar_other_vat'>51600003813</field>
-    </record>
-    <record model='res.country' id='base.it'>
-        <field name='l10n_ar_legal_entity_vat'>55000003548</field>
-        <field name='l10n_ar_natural_vat'>50000003546</field>
-        <field name='l10n_ar_other_vat'>51600003546</field>
-    </record>
-    <record model='res.country' id='base.jm'>
-        <field name='l10n_ar_legal_entity_vat'>55000002177</field>
-        <field name='l10n_ar_natural_vat'>50000002175</field>
-        <field name='l10n_ar_other_vat'>51600002175</field>
-    </record>
-    <record model='res.country' id='base.jo'>
-        <field name='l10n_ar_legal_entity_vat'>55000003009</field>
-        <field name='l10n_ar_natural_vat'>50000003007</field>
-        <field name='l10n_ar_other_vat'>51600003007</field>
-    </record>
-    <record model='res.country' id='base.jp'>
-        <field name='l10n_ar_legal_entity_vat'>55000003203</field>
-        <field name='l10n_ar_natural_vat'>50000003201</field>
-        <field name='l10n_ar_other_vat'>51600003201</field>
-    </record>
-    <record model='res.country' id='base.ke'>
-        <field name='l10n_ar_legal_entity_vat'>55000001200</field>
-        <field name='l10n_ar_natural_vat'>50000001209</field>
-        <field name='l10n_ar_other_vat'>51600001209</field>
-    </record>
-    <record model='res.country' id='base.kg'>
-        <field name='l10n_ar_legal_entity_vat'>55000003939</field>
-        <field name='l10n_ar_natural_vat'>50000003937</field>
-        <field name='l10n_ar_other_vat'>51600003937</field>
-    </record>
-    <record model='res.country' id='base.kh'>
-        <field name='l10n_ar_legal_entity_vat'>55000003068</field>
-        <field name='l10n_ar_natural_vat'>50000003066</field>
-        <field name='l10n_ar_other_vat'>51600003066</field>
-    </record>
-    <record model='res.country' id='base.ki'>
-        <field name='l10n_ar_legal_entity_vat'>55000005168</field>
-        <field name='l10n_ar_natural_vat'>50000005166</field>
-        <field name='l10n_ar_other_vat'>51600005166</field>
-    </record>
-    <record model='res.country' id='base.km'>
-        <field name='l10n_ar_legal_entity_vat'>55000001898</field>
-        <field name='l10n_ar_natural_vat'>50000001896</field>
-        <field name='l10n_ar_other_vat'>51600001896</field>
-    </record>
-    <record model='res.country' id='base.kn'>
-        <field name='l10n_ar_legal_entity_vat'>55000002894</field>
-        <field name='l10n_ar_natural_vat'>50000002892</field>
-        <field name='l10n_ar_other_vat'>51600002892</field>
-    </record>
-    <record model='res.country' id='base.kp'>
-        <field name='l10n_ar_legal_entity_vat'>55000003084</field>
-        <field name='l10n_ar_natural_vat'>50000003082</field>
-        <field name='l10n_ar_other_vat'>51600003082</field>
-    </record>
-    <record model='res.country' id='base.kr'>
-        <field name='l10n_ar_legal_entity_vat'>55000003092</field>
-        <field name='l10n_ar_natural_vat'>50000003090</field>
-        <field name='l10n_ar_other_vat'>51600003090</field>
-    </record>
-    <record model='res.country' id='base.kw'>
-        <field name='l10n_ar_legal_entity_vat'>55000003238</field>
-        <field name='l10n_ar_natural_vat'>50000003236</field>
-        <field name='l10n_ar_other_vat'>51600003236</field>
-    </record>
-    <record model='res.country' id='base.ky'>
-        <field name='l10n_ar_legal_entity_vat'>55000006717</field>
-        <field name='l10n_ar_natural_vat'>50000006715</field>
-        <field name='l10n_ar_other_vat'>51600006715</field>
-    </record>
-    <record model='res.country' id='base.kz'>
-        <field name='l10n_ar_legal_entity_vat'>55000003920</field>
-        <field name='l10n_ar_natural_vat'>50000003929</field>
-        <field name='l10n_ar_other_vat'>51600003929</field>
-    </record>
-    <record model='res.country' id='base.la'>
-        <field name='l10n_ar_legal_entity_vat'>55000003246</field>
-        <field name='l10n_ar_natural_vat'>50000003244</field>
-        <field name='l10n_ar_other_vat'>51600003244</field>
-    </record>
-    <record model='res.country' id='base.lb'>
-        <field name='l10n_ar_legal_entity_vat'>55000003254</field>
-        <field name='l10n_ar_natural_vat'>50000003252</field>
-        <field name='l10n_ar_other_vat'>51600003252</field>
-    </record>
-    <record model='res.country' id='base.lc'>
-        <field name='l10n_ar_legal_entity_vat'>55000002347</field>
-        <field name='l10n_ar_natural_vat'>50000002345</field>
-        <field name='l10n_ar_other_vat'>51600002345</field>
-    </record>
-    <record model='res.country' id='base.li'>
-        <field name='l10n_ar_legal_entity_vat'>55000004188</field>
-        <field name='l10n_ar_natural_vat'>50000004186</field>
-        <field name='l10n_ar_other_vat'>51600004186</field>
-    </record>
-    <record model='res.country' id='base.lk'>
-        <field name='l10n_ar_legal_entity_vat'>55000003076</field>
-        <field name='l10n_ar_natural_vat'>50000003074</field>
-        <field name='l10n_ar_other_vat'>51600003074</field>
-    </record>
-    <record model='res.country' id='base.lr'>
-        <field name='l10n_ar_legal_entity_vat'>55000001227</field>
-        <field name='l10n_ar_natural_vat'>50000001225</field>
-        <field name='l10n_ar_other_vat'>51600001225</field>
-    </record>
-    <record model='res.country' id='base.ls'>
-        <field name='l10n_ar_legal_entity_vat'>55000001219</field>
-        <field name='l10n_ar_natural_vat'>50000001217</field>
-        <field name='l10n_ar_other_vat'>51600001217</field>
-    </record>
-    <record model='res.country' id='base.lt'>
-        <field name='l10n_ar_legal_entity_vat'>55000004420</field>
-        <field name='l10n_ar_natural_vat'>50000004429</field>
-        <field name='l10n_ar_other_vat'>51600004429</field>
-    </record>
-    <record model='res.country' id='base.lu'>
-        <field name='l10n_ar_legal_entity_vat'>55000004196</field>
-        <field name='l10n_ar_natural_vat'>50000004194</field>
-        <field name='l10n_ar_other_vat'>51600004194</field>
-    </record>
-    <record model='res.country' id='base.lv'>
-        <field name='l10n_ar_legal_entity_vat'>55000004412</field>
-        <field name='l10n_ar_natural_vat'>50000004410</field>
-        <field name='l10n_ar_other_vat'>51600004410</field>
-    </record>
-    <record model='res.country' id='base.ly'>
-        <field name='l10n_ar_legal_entity_vat'>55000001235</field>
-        <field name='l10n_ar_natural_vat'>50000001233</field>
-        <field name='l10n_ar_other_vat'>51600001233</field>
-    </record>
-    <record model='res.country' id='base.ma'>
-        <field name='l10n_ar_legal_entity_vat'>55000001278</field>
-        <field name='l10n_ar_natural_vat'>50000001276</field>
-        <field name='l10n_ar_other_vat'>51600001276</field>
-    </record>
-    <record model='res.country' id='base.mc'>
-        <field name='l10n_ar_legal_entity_vat'>55000004218</field>
-        <field name='l10n_ar_natural_vat'>50000004216</field>
-        <field name='l10n_ar_other_vat'>51600004216</field>
-    </record>
-    <record model='res.country' id='base.md'>
-        <field name='l10n_ar_legal_entity_vat'>55000004439</field>
-        <field name='l10n_ar_natural_vat'>50000004437</field>
-        <field name='l10n_ar_other_vat'>51600004437</field>
-    </record>
-    <record model='res.country' id='base.mg'>
-        <field name='l10n_ar_legal_entity_vat'>55000001243</field>
-        <field name='l10n_ar_natural_vat'>50000001241</field>
-        <field name='l10n_ar_other_vat'>51600001241</field>
-    </record>
-    <record model='res.country' id='base.mh'>
-        <field name='l10n_ar_legal_entity_vat'>55000005206</field>
-        <field name='l10n_ar_natural_vat'>50000005204</field>
-        <field name='l10n_ar_other_vat'>51600005204</field>
-    </record>
-    <record model='res.country' id='base.mk'>
-        <field name='l10n_ar_legal_entity_vat'>55000004323</field>
-        <field name='l10n_ar_natural_vat'>50000004321</field>
-        <field name='l10n_ar_other_vat'>51600004321</field>
-    </record>
-    <record model='res.country' id='base.mk'>
-        <field name='l10n_ar_legal_entity_vat'>55000004900</field>
-        <field name='l10n_ar_natural_vat'>50000004909</field>
-        <field name='l10n_ar_other_vat'>51600004909</field>
-    </record>
-    <record model='res.country' id='base.ml'>
-        <field name='l10n_ar_legal_entity_vat'>55000001634</field>
-        <field name='l10n_ar_natural_vat'>50000001632</field>
-        <field name='l10n_ar_other_vat'>51600001632</field>
-    </record>
-    <record model='res.country' id='base.mm'>
-        <field name='l10n_ar_legal_entity_vat'>55000002843</field>
-        <field name='l10n_ar_natural_vat'>50000002841</field>
-        <field name='l10n_ar_other_vat'>51600002841</field>
-    </record>
-    <record model='res.country' id='base.mn'>
-        <field name='l10n_ar_legal_entity_vat'>55000003297</field>
-        <field name='l10n_ar_natural_vat'>50000003295</field>
-        <field name='l10n_ar_other_vat'>51600003295</field>
-    </record>
-    <record model='res.country' id='base.mo'>
-        <field name='l10n_ar_legal_entity_vat'>55000003440</field>
-        <field name='l10n_ar_natural_vat'>50000003449</field>
-        <field name='l10n_ar_other_vat'>51600003449</field>
-    </record>
-    <record model='res.country' id='base.mp'>
-        <field name='l10n_ar_legal_entity_vat'>55000005214</field>
-        <field name='l10n_ar_natural_vat'>50000005212</field>
-        <field name='l10n_ar_other_vat'>51600005212</field>
-    </record>
-    <record model='res.country' id='base.mr'>
-        <field name='l10n_ar_legal_entity_vat'>55000001294</field>
-        <field name='l10n_ar_natural_vat'>50000001292</field>
-        <field name='l10n_ar_other_vat'>51600001292</field>
-    </record>
-    <record model='res.country' id='base.ms'>
-        <field name='l10n_ar_legal_entity_vat'>55000006865</field>
-        <field name='l10n_ar_natural_vat'>50000006863</field>
-        <field name='l10n_ar_other_vat'>51600006863</field>
-    </record>
-    <record model='res.country' id='base.mt'>
-        <field name='l10n_ar_legal_entity_vat'>55000004366</field>
-        <field name='l10n_ar_natural_vat'>50000004364</field>
-        <field name='l10n_ar_other_vat'>51600004364</field>
-    </record>
-    <record model='res.country' id='base.mu'>
-        <field name='l10n_ar_legal_entity_vat'>55000001286</field>
-        <field name='l10n_ar_natural_vat'>50000001284</field>
-        <field name='l10n_ar_other_vat'>51600001284</field>
-    </record>
-    <record model='res.country' id='base.mv'>
-        <field name='l10n_ar_legal_entity_vat'>55000003270</field>
-        <field name='l10n_ar_natural_vat'>50000003279</field>
-        <field name='l10n_ar_other_vat'>51600003279</field>
-    </record>
-    <record model='res.country' id='base.mw'>
-        <field name='l10n_ar_legal_entity_vat'>55000001545</field>
-        <field name='l10n_ar_natural_vat'>50000001543</field>
-        <field name='l10n_ar_other_vat'>51600001543</field>
-    </record>
-    <record model='res.country' id='base.mx'>
-        <field name='l10n_ar_legal_entity_vat'>55000002185</field>
-        <field name='l10n_ar_natural_vat'>50000002183</field>
-        <field name='l10n_ar_other_vat'>51600002183</field>
-    </record>
-    <record model='res.country' id='base.my'>
-        <field name='l10n_ar_legal_entity_vat'>55000003262</field>
-        <field name='l10n_ar_natural_vat'>50000003260</field>
-        <field name='l10n_ar_other_vat'>51600003260</field>
-    </record>
-    <record model='res.country' id='base.mz'>
-        <field name='l10n_ar_legal_entity_vat'>55000001510</field>
-        <field name='l10n_ar_natural_vat'>50000001519</field>
-        <field name='l10n_ar_other_vat'>51600001519</field>
-    </record>
-    <record model='res.country' id='base.na'>
-        <field name='l10n_ar_legal_entity_vat'>55000001839</field>
-        <field name='l10n_ar_natural_vat'>50000001837</field>
-        <field name='l10n_ar_other_vat'>51600001837</field>
-    </record>
-    <record model='res.country' id='base.ne'>
-        <field name='l10n_ar_legal_entity_vat'>55000001308</field>
-        <field name='l10n_ar_natural_vat'>50000001306</field>
-        <field name='l10n_ar_other_vat'>51600001306</field>
-    </record>
-    <record model='res.country' id='base.ng'>
-        <field name='l10n_ar_legal_entity_vat'>55000001316</field>
-        <field name='l10n_ar_natural_vat'>50000001314</field>
-        <field name='l10n_ar_other_vat'>51600001314</field>
-    </record>
-    <record model='res.country' id='base.ni'>
-        <field name='l10n_ar_legal_entity_vat'>55000002193</field>
-        <field name='l10n_ar_natural_vat'>50000002191</field>
-        <field name='l10n_ar_other_vat'>51600002191</field>
-    </record>
-    <record model='res.country' id='base.nl'>
-        <field name='l10n_ar_legal_entity_vat'>55000004234</field>
-        <field name='l10n_ar_natural_vat'>50000004232</field>
-        <field name='l10n_ar_other_vat'>51600004232</field>
-    </record>
-    <record model='res.country' id='base.no'>
-        <field name='l10n_ar_legal_entity_vat'>55000004226</field>
-        <field name='l10n_ar_natural_vat'>50000004224</field>
-        <field name='l10n_ar_other_vat'>51600004224</field>
-    </record>
-    <record model='res.country' id='base.np'>
-        <field name='l10n_ar_legal_entity_vat'>55000003300</field>
-        <field name='l10n_ar_natural_vat'>50000003309</field>
-        <field name='l10n_ar_other_vat'>51600003309</field>
-    </record>
-    <record model='res.country' id='base.nr'>
-        <field name='l10n_ar_legal_entity_vat'>55000005036</field>
-        <field name='l10n_ar_natural_vat'>50000005034</field>
-        <field name='l10n_ar_other_vat'>51600005034</field>
-    </record>
-    <record model='res.country' id='base.nu'>
-        <field name='l10n_ar_legal_entity_vat'>55000006873</field>
-        <field name='l10n_ar_natural_vat'>50000006871</field>
-        <field name='l10n_ar_other_vat'>51600006871</field>
-    </record>
-    <record model='res.country' id='base.nz'>
-        <field name='l10n_ar_legal_entity_vat'>55000005044</field>
-        <field name='l10n_ar_natural_vat'>50000005042</field>
-        <field name='l10n_ar_other_vat'>51600005042</field>
-    </record>
-    <record model='res.country' id='base.om'>
-        <field name='l10n_ar_legal_entity_vat'>55000003289</field>
-        <field name='l10n_ar_natural_vat'>50000003287</field>
-        <field name='l10n_ar_other_vat'>51600003287</field>
-    </record>
-    <record model='res.country' id='base.pa'>
-        <field name='l10n_ar_legal_entity_vat'>55000002207</field>
-        <field name='l10n_ar_natural_vat'>50000002205</field>
-        <field name='l10n_ar_other_vat'>51600002205</field>
-    </record>
-    <record model='res.country' id='base.pe'>
-        <field name='l10n_ar_legal_entity_vat'>55000002223</field>
-        <field name='l10n_ar_natural_vat'>50000002221</field>
-        <field name='l10n_ar_other_vat'>51600002221</field>
-    </record>
-    <record model='res.country' id='base.pf'>
-        <field name='l10n_ar_legal_entity_vat'>55000006563</field>
-        <field name='l10n_ar_natural_vat'>50000006561</field>
-        <field name='l10n_ar_other_vat'>51600006561</field>
-    </record>
-    <record model='res.country' id='base.pg'>
-        <field name='l10n_ar_legal_entity_vat'>55000005133</field>
-        <field name='l10n_ar_natural_vat'>50000005131</field>
-        <field name='l10n_ar_other_vat'>51600005131</field>
-    </record>
-    <record model='res.country' id='base.ph'>
-        <field name='l10n_ar_legal_entity_vat'>55000003122</field>
-        <field name='l10n_ar_natural_vat'>50000003120</field>
-        <field name='l10n_ar_other_vat'>51600003120</field>
-    </record>
-    <record model='res.country' id='base.pk'>
-        <field name='l10n_ar_legal_entity_vat'>55000003327</field>
-        <field name='l10n_ar_natural_vat'>50000003325</field>
-        <field name='l10n_ar_other_vat'>51600003325</field>
-    </record>
-    <record model='res.country' id='base.pl'>
-        <field name='l10n_ar_legal_entity_vat'>55000004242</field>
-        <field name='l10n_ar_natural_vat'>50000004240</field>
-        <field name='l10n_ar_other_vat'>51600004240</field>
-    </record>
-    <record model='res.country' id='base.pn'>
-        <field name='l10n_ar_legal_entity_vat'>55000006903</field>
-        <field name='l10n_ar_natural_vat'>50000006901</field>
-        <field name='l10n_ar_other_vat'>51600006901</field>
-    </record>
-    <record model='res.country' id='base.pr'>
-        <field name='l10n_ar_legal_entity_vat'>55000002215</field>
-        <field name='l10n_ar_natural_vat'>50000002213</field>
-        <field name='l10n_ar_other_vat'>51600002213</field>
-    </record>
-    <record model='res.country' id='base.pt'>
-        <field name='l10n_ar_legal_entity_vat'>55000004250</field>
-        <field name='l10n_ar_natural_vat'>50000004259</field>
-        <field name='l10n_ar_other_vat'>51600004259</field>
-    </record>
-    <record model='res.country' id='base.pw'>
-        <field name='l10n_ar_legal_entity_vat'>55000005915</field>
-        <field name='l10n_ar_natural_vat'>50000005913</field>
-        <field name='l10n_ar_other_vat'>51600005913</field>
-    </record>
-    <record model='res.country' id='base.py'>
-        <field name='l10n_ar_legal_entity_vat'>55000000026</field>
-        <field name='l10n_ar_natural_vat'>50000000024</field>
-        <field name='l10n_ar_other_vat'>51600000024</field>
-    </record>
-    <record model='res.country' id='base.qa'>
-        <field name='l10n_ar_legal_entity_vat'>55000002983</field>
-        <field name='l10n_ar_natural_vat'>50000002981</field>
-        <field name='l10n_ar_other_vat'>51600002981</field>
-    </record>
-    <record model='res.country' id='base.ro'>
-        <field name='l10n_ar_legal_entity_vat'>55000004277</field>
-        <field name='l10n_ar_natural_vat'>50000004275</field>
-        <field name='l10n_ar_other_vat'>51600004275</field>
-    </record>
-    <record model='res.country' id='base.ru'>
-        <field name='l10n_ar_legal_entity_vat'>55000006016</field>
-        <field name='l10n_ar_natural_vat'>50000006014</field>
-        <field name='l10n_ar_other_vat'>51600006014</field>
-    </record>
-    <record model='res.country' id='base.rw'>
-        <field name='l10n_ar_legal_entity_vat'>55000001332</field>
-        <field name='l10n_ar_natural_vat'>50000001330</field>
-        <field name='l10n_ar_other_vat'>51600001330</field>
-    </record>
-    <record model='res.country' id='base.sa'>
-        <field name='l10n_ar_legal_entity_vat'>55000003025</field>
-        <field name='l10n_ar_natural_vat'>50000003023</field>
-        <field name='l10n_ar_other_vat'>51600003023</field>
-    </record>
-    <record model='res.country' id='base.sb'>
-        <field name='l10n_ar_legal_entity_vat'>55000005184</field>
-        <field name='l10n_ar_natural_vat'>50000005182</field>
-        <field name='l10n_ar_other_vat'>51600005182</field>
-    </record>
-    <record model='res.country' id='base.sc'>
-        <field name='l10n_ar_legal_entity_vat'>55000001812</field>
-        <field name='l10n_ar_natural_vat'>50000001810</field>
-        <field name='l10n_ar_other_vat'>51600001810</field>
-    </record>
-    <record model='res.country' id='base.sd'>
-        <field name='l10n_ar_legal_entity_vat'>55000001383</field>
-        <field name='l10n_ar_natural_vat'>50000001381</field>
-        <field name='l10n_ar_other_vat'>51600001381</field>
-    </record>
-    <record model='res.country' id='base.se'>
-        <field name='l10n_ar_legal_entity_vat'>55000004293</field>
-        <field name='l10n_ar_natural_vat'>50000004291</field>
-        <field name='l10n_ar_other_vat'>51600004291</field>
-    </record>
-    <record model='res.country' id='base.sg'>
-        <field name='l10n_ar_legal_entity_vat'>55000003335</field>
-        <field name='l10n_ar_natural_vat'>50000003333</field>
-        <field name='l10n_ar_other_vat'>51600003333</field>
-    </record>
-    <record model='res.country' id='base.sh'>
-        <field name='l10n_ar_legal_entity_vat'>55000006628</field>
-        <field name='l10n_ar_natural_vat'>50000006626</field>
-        <field name='l10n_ar_other_vat'>51600006626</field>
-    </record>
-    <record model='res.country' id='base.sh'>
-        <field name='l10n_ar_legal_entity_vat'>55000006946</field>
-        <field name='l10n_ar_natural_vat'>50000006944</field>
-        <field name='l10n_ar_other_vat'>51600006944</field>
-    </record>
-    <record model='res.country' id='base.sh'>
-        <field name='l10n_ar_legal_entity_vat'>55000006970</field>
-        <field name='l10n_ar_natural_vat'>50000006979</field>
-        <field name='l10n_ar_other_vat'>51600006979</field>
-    </record>
-    <record model='res.country' id='base.si'>
-        <field name='l10n_ar_legal_entity_vat'>55000004498</field>
-        <field name='l10n_ar_natural_vat'>50000004496</field>
-        <field name='l10n_ar_other_vat'>51600004496</field>
-    </record>
-    <record model='res.country' id='base.sl'>
-        <field name='l10n_ar_legal_entity_vat'>55000001359</field>
-        <field name='l10n_ar_natural_vat'>50000001357</field>
-        <field name='l10n_ar_other_vat'>51600001357</field>
-    </record>
-    <record model='res.country' id='base.sm'>
-        <field name='l10n_ar_legal_entity_vat'>55000004285</field>
-        <field name='l10n_ar_natural_vat'>50000004283</field>
-        <field name='l10n_ar_other_vat'>51600004283</field>
-    </record>
-    <record model='res.country' id='base.sn'>
-        <field name='l10n_ar_legal_entity_vat'>55000001340</field>
-        <field name='l10n_ar_natural_vat'>50000001349</field>
-        <field name='l10n_ar_other_vat'>51600001349</field>
-    </record>
-    <record model='res.country' id='base.so'>
-        <field name='l10n_ar_legal_entity_vat'>55000001367</field>
-        <field name='l10n_ar_natural_vat'>50000001365</field>
-        <field name='l10n_ar_other_vat'>51600001365</field>
-    </record>
-    <record model='res.country' id='base.sr'>
-        <field name='l10n_ar_legal_entity_vat'>55000002320</field>
-        <field name='l10n_ar_natural_vat'>50000002329</field>
-        <field name='l10n_ar_other_vat'>51600002329</field>
-    </record>
-    <record model='res.country' id='base.st'>
-        <field name='l10n_ar_legal_entity_vat'>55000001820</field>
-        <field name='l10n_ar_natural_vat'>50000001829</field>
-        <field name='l10n_ar_other_vat'>51600001829</field>
-    </record>
-    <record model='res.country' id='base.sv'>
-        <field name='l10n_ar_legal_entity_vat'>55000002118</field>
-        <field name='l10n_ar_natural_vat'>50000002116</field>
-        <field name='l10n_ar_other_vat'>51600002116</field>
-    </record>
-    <record model='res.country' id='base.sy'>
-        <field name='l10n_ar_legal_entity_vat'>55000003343</field>
-        <field name='l10n_ar_natural_vat'>50000003341</field>
-        <field name='l10n_ar_other_vat'>51600003341</field>
-    </record>
-    <record model='res.country' id='base.sz'>
-        <field name='l10n_ar_legal_entity_vat'>55000001375</field>
-        <field name='l10n_ar_natural_vat'>50000001373</field>
-        <field name='l10n_ar_other_vat'>51600001373</field>
-    </record>
-    <record model='res.country' id='base.tc'>
-        <field name='l10n_ar_legal_entity_vat'>55000006784</field>
-        <field name='l10n_ar_natural_vat'>50000006782</field>
-        <field name='l10n_ar_other_vat'>51600006782</field>
-    </record>
-    <record model='res.country' id='base.td'>
-        <field name='l10n_ar_legal_entity_vat'>55000001537</field>
-        <field name='l10n_ar_natural_vat'>50000001535</field>
-        <field name='l10n_ar_other_vat'>51600001535</field>
-    </record>
-    <record model='res.country' id='base.tg'>
-        <field name='l10n_ar_legal_entity_vat'>55000001405</field>
-        <field name='l10n_ar_natural_vat'>50000001403</field>
-        <field name='l10n_ar_other_vat'>51600001403</field>
-    </record>
-    <record model='res.country' id='base.th'>
-        <field name='l10n_ar_legal_entity_vat'>55000002916</field>
-        <field name='l10n_ar_natural_vat'>50000002914</field>
-        <field name='l10n_ar_other_vat'>51600002914</field>
-    </record>
-    <record model='res.country' id='base.tj'>
-        <field name='l10n_ar_legal_entity_vat'>55000003890</field>
-        <field name='l10n_ar_natural_vat'>50000003899</field>
-        <field name='l10n_ar_other_vat'>51600003899</field>
-    </record>
-    <record model='res.country' id='base.tk'>
-        <field name='l10n_ar_legal_entity_vat'>55000006997</field>
-        <field name='l10n_ar_natural_vat'>50000006995</field>
-        <field name='l10n_ar_other_vat'>51600006995</field>
-    </record>
-    <record model='res.country' id='base.tm'>
-        <field name='l10n_ar_legal_entity_vat'>55000003556</field>
-        <field name='l10n_ar_natural_vat'>50000003554</field>
-        <field name='l10n_ar_other_vat'>51600003554</field>
-    </record>
-    <record model='res.country' id='base.tn'>
-        <field name='l10n_ar_legal_entity_vat'>55000001413</field>
-        <field name='l10n_ar_natural_vat'>50000001411</field>
-        <field name='l10n_ar_other_vat'>51600001411</field>
-    </record>
-    <record model='res.country' id='base.to'>
-        <field name='l10n_ar_legal_entity_vat'>55000005192</field>
-        <field name='l10n_ar_natural_vat'>50000005190</field>
-        <field name='l10n_ar_other_vat'>51600005190</field>
-    </record>
-    <record model='res.country' id='base.tr'>
-        <field name='l10n_ar_legal_entity_vat'>55000003505</field>
-        <field name='l10n_ar_natural_vat'>50000003503</field>
-        <field name='l10n_ar_other_vat'>51600003503</field>
-    </record>
-    <record model='res.country' id='base.tt'>
-        <field name='l10n_ar_legal_entity_vat'>55000002436</field>
-        <field name='l10n_ar_natural_vat'>50000002434</field>
-        <field name='l10n_ar_other_vat'>51600002434</field>
-    </record>
-    <record model='res.country' id='base.tv'>
-        <field name='l10n_ar_legal_entity_vat'>55000005176</field>
-        <field name='l10n_ar_natural_vat'>50000005174</field>
-        <field name='l10n_ar_other_vat'>51600005174</field>
-    </record>
-    <record model='res.country' id='base.tw'>
-        <field name='l10n_ar_legal_entity_vat'>55000003130</field>
-        <field name='l10n_ar_natural_vat'>50000003139</field>
-        <field name='l10n_ar_other_vat'>51600003139</field>
-    </record>
-    <record model='res.country' id='base.tz'>
-        <field name='l10n_ar_legal_entity_vat'>55000001553</field>
-        <field name='l10n_ar_natural_vat'>50000001551</field>
-        <field name='l10n_ar_other_vat'>51600001551</field>
-    </record>
-    <record model='res.country' id='base.ua'>
-        <field name='l10n_ar_legal_entity_vat'>55000006040</field>
-        <field name='l10n_ar_natural_vat'>50000006049</field>
-        <field name='l10n_ar_other_vat'>51600006049</field>
-    </record>
-    <record model='res.country' id='base.ug'>
-        <field name='l10n_ar_legal_entity_vat'>55000001707</field>
-        <field name='l10n_ar_natural_vat'>50000001705</field>
-        <field name='l10n_ar_other_vat'>51600001705</field>
-    </record>
-    <record model='res.country' id='base.us'>
-        <field name='l10n_ar_legal_entity_vat'>55000002126</field>
-        <field name='l10n_ar_natural_vat'>50000002124</field>
-        <field name='l10n_ar_other_vat'>51600002124</field>
-    </record>
-    <record model='res.country' id='base.uy'>
-        <field name='l10n_ar_legal_entity_vat'>55000000018</field>
-        <field name='l10n_ar_natural_vat'></field>
-        <field name='l10n_ar_other_vat'>51600000016</field>
-    </record>
-    <record model='res.country' id='base.uz'>
-        <field name='l10n_ar_legal_entity_vat'>55000003564</field>
-        <field name='l10n_ar_natural_vat'>50000003562</field>
-        <field name='l10n_ar_other_vat'>51600003562</field>
-    </record>
-    <record model='res.country' id='base.va'>
-        <field name='l10n_ar_legal_entity_vat'>55000004315</field>
-        <field name='l10n_ar_natural_vat'>50000004313</field>
-        <field name='l10n_ar_other_vat'>51600004313</field>
-    </record>
-    <record model='res.country' id='base.vc'>
-        <field name='l10n_ar_legal_entity_vat'>55000002355</field>
-        <field name='l10n_ar_natural_vat'>50000002353</field>
-        <field name='l10n_ar_other_vat'>51600002353</field>
-    </record>
-    <record model='res.country' id='base.ve'>
-        <field name='l10n_ar_legal_entity_vat'>55000002266</field>
-        <field name='l10n_ar_natural_vat'>50000002264</field>
-        <field name='l10n_ar_other_vat'>51600002264</field>
-    </record>
-    <record model='res.country' id='base.vg'>
-        <field name='l10n_ar_legal_entity_vat'>55000006822</field>
-        <field name='l10n_ar_natural_vat'>50000006820</field>
-        <field name='l10n_ar_other_vat'>51600006820</field>
-    </record>
-    <record model='res.country' id='base.vn'>
-        <field name='l10n_ar_legal_entity_vat'>55000003378</field>
-        <field name='l10n_ar_natural_vat'>50000003376</field>
-        <field name='l10n_ar_other_vat'>51600003376</field>
-    </record>
-    <record model='res.country' id='base.vu'>
-        <field name='l10n_ar_legal_entity_vat'>55000005052</field>
-        <field name='l10n_ar_natural_vat'>50000005050</field>
-        <field name='l10n_ar_other_vat'>51600005050</field>
-    </record>
-    <record model='res.country' id='base.ws'>
-        <field name='l10n_ar_legal_entity_vat'>55000005069</field>
-        <field name='l10n_ar_natural_vat'>50000005069</field>
-        <field name='l10n_ar_other_vat'>51600005069</field>
-    </record>
-    <record model='res.country' id='base.ye'>
-        <field name='l10n_ar_legal_entity_vat'>55000003394</field>
-        <field name='l10n_ar_natural_vat'>50000003392</field>
-        <field name='l10n_ar_other_vat'>51600003392</field>
-    </record>
-    <record model='res.country' id='base.za'>
-        <field name='l10n_ar_legal_entity_vat'>55000001715</field>
-        <field name='l10n_ar_natural_vat'>50000001713</field>
-        <field name='l10n_ar_other_vat'>51600001713</field>
-    </record>
-    <record model='res.country' id='base.zm'>
-        <field name='l10n_ar_legal_entity_vat'>55000001448</field>
-        <field name='l10n_ar_natural_vat'>50000001446</field>
-        <field name='l10n_ar_other_vat'>51600001446</field>
-    </record>
-    <record model='res.country' id='base.zw'>
-        <field name='l10n_ar_legal_entity_vat'>55000001324</field>
-        <field name='l10n_ar_natural_vat'>50000001322</field>
-        <field name='l10n_ar_other_vat'>51600001322</field>
-    </record>
-</odoo>
diff --git a/addons/l10n_ar/data/res_currency_data.xml b/addons/l10n_ar/data/res_currency_data.xml
deleted file mode 100644
index 451b12202a1..00000000000
--- a/addons/l10n_ar/data/res_currency_data.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<odoo noupdate="True">
-
-    <record model='res.currency' id='base.ARS'>
-        <field name="l10n_ar_afip_code">PES</field>
-        <field name="active" eval="True"/>
-    </record>
-    <record model='res.currency' id='base.AUD'>
-        <field name="l10n_ar_afip_code">026</field>
-    </record>
-    <record model='res.currency' id='base.CAD'>
-        <field name="l10n_ar_afip_code">018</field>
-    </record>
-    <record model='res.currency' id='base.GBP'>
-        <field name="l10n_ar_afip_code">021</field>
-    </record>
-    <record model='res.currency' id='base.JPY'>
-        <field name="l10n_ar_afip_code">019</field>
-    </record>
-    <record model='res.currency' id='base.MXN'>
-        <field name="l10n_ar_afip_code">010</field>
-    </record>
-    <record model='res.currency' id='base.USD'>
-        <field name="l10n_ar_afip_code">DOL</field>
-    </record>
-    <record model='res.currency' id='base.UYU'>
-        <field name="l10n_ar_afip_code">011</field>
-    </record>
-    <record model='res.currency' id='base.VEF'>
-        <field name="l10n_ar_afip_code">023</field>
-    </record>
-    <record model='res.currency' id='base.EUR'>
-        <field name="l10n_ar_afip_code">060</field>
-    </record>
-
-</odoo>
diff --git a/addons/l10n_ar/data/uom_uom_data.xml b/addons/l10n_ar/data/uom_uom_data.xml
index b18e04afbcb..0ecea0e00a0 100644
--- a/addons/l10n_ar/data/uom_uom_data.xml
+++ b/addons/l10n_ar/data/uom_uom_data.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <odoo noupdate="True">
+
+    <record model='uom.uom' id='uom.product_uom_kgm'>
+        <field name='l10n_ar_afip_code'>01</field>
+    </record>
+    <record model='uom.uom' id='uom.product_uom_meter'>
+        <field name='l10n_ar_afip_code'>02</field>
+    </record>
+    <record model='uom.uom' id='uom.product_uom_litre'>
+        <field name='l10n_ar_afip_code'>05</field>
+    </record>
+    <record model='uom.uom' id='uom.product_uom_unit'>
+        <field name='l10n_ar_afip_code'>07</field>
+    </record>
+    <record model='uom.uom' id='uom.product_uom_dozen'>
+        <field name='l10n_ar_afip_code'>09</field>
+    </record>
     <record model='uom.uom' id='uom.product_uom_cm'>
         <field name='l10n_ar_afip_code'>20</field>
     </record>
     <record model='uom.uom' id='uom.product_uom_day'>
         <field name='l10n_ar_afip_code'>98</field>
     </record>
-    <record model='uom.uom' id='uom.product_uom_dozen'>
-        <field name='l10n_ar_afip_code'>9</field>
-    </record>
     <record model='uom.uom' id='uom.product_uom_floz'>
         <field name='l10n_ar_afip_code'>98</field>
     </record>
@@ -27,21 +40,12 @@
     <record model='uom.uom' id='uom.product_uom_inch'>
         <field name='l10n_ar_afip_code'>98</field>
     </record>
-    <record model='uom.uom' id='uom.product_uom_kgm'>
-        <field name='l10n_ar_afip_code'>1</field>
-    </record>
     <record model='uom.uom' id='uom.product_uom_km'>
         <field name='l10n_ar_afip_code'>17</field>
     </record>
     <record model='uom.uom' id='uom.product_uom_lb'>
         <field name='l10n_ar_afip_code'>98</field>
     </record>
-    <record model='uom.uom' id='uom.product_uom_litre'>
-        <field name='l10n_ar_afip_code'>5</field>
-    </record>
-    <record model='uom.uom' id='uom.product_uom_meter'>
-        <field name='l10n_ar_afip_code'>2</field>
-    </record>
     <record model='uom.uom' id='uom.product_uom_mile'>
         <field name='l10n_ar_afip_code'>98</field>
     </record>
@@ -54,7 +58,4 @@
     <record model='uom.uom' id='uom.product_uom_ton'>
         <field name='l10n_ar_afip_code'>29</field>
     </record>
-    <record model='uom.uom' id='uom.product_uom_unit'>
-        <field name='l10n_ar_afip_code'>7</field>
-    </record>
 </odoo>
diff --git a/addons/l10n_ar/demo/account_supplier_invoice_demo.xml b/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
index a8b083e871b..2d44970f97a 100644
--- a/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
+++ b/addons/l10n_ar/demo/account_supplier_invoice_demo.xml
@@ -22,9 +22,9 @@
         ]"/>
     </record>
 
-    <!-- Invoice from Asustek with vat 21, 27 and 10,5 -->
+    <!-- Invoice from Foreign with vat 21, 27 and 10,5 -->
     <record id="demo_sup_invoice_2" model="account.move">
-        <field name="partner_id" ref="base.res_partner_1"/>
+        <field name="partner_id" ref="res_partner_foreign"/>
         <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>
@@ -37,9 +37,9 @@
         ]"/>
     </record>
 
-    <!-- Invoice from Asustek with vat zero and 21 -->
+    <!-- Invoice from Foreign with vat zero and 21 -->
     <record id="demo_sup_invoice_3" model="account.move">
-        <field name="partner_id" ref="base.res_partner_1"/>
+        <field name="partner_id" ref="res_partner_foreign"/>
         <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>
@@ -51,9 +51,9 @@
         ]"/>
     </record>
 
-    <!-- Invoice to Asustek with vat exempt and 21 -->
+    <!-- Invoice to Foreign with vat exempt and 21 -->
     <record id="demo_sup_invoice_4" model="account.move">
-        <field name="partner_id" ref="base.res_partner_1"/>
+        <field name="partner_id" ref="res_partner_foreign"/>
         <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>
@@ -65,9 +65,9 @@
         ]"/>
     </record>
 
-    <!-- Invoice to Asustek with all type of taxes  -->
+    <!-- Invoice to Foreign with all type of taxes  -->
     <record id="demo_sup_invoice_5" model="account.move">
-        <field name="partner_id" ref="base.res_partner_1"/>
+        <field name="partner_id" ref="res_partner_foreign"/>
         <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>
@@ -132,6 +132,7 @@
         <field name="product_id" ref="l10n_ar.product_product_quote_despacho"/>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA 21%'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('l10n_ar.product_product_quote_despacho').categ_id.property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_2" model="account.move.line" context="{'check_move_validity': False}">
         <field name="move_id" ref="demo_despacho_1"/>
@@ -141,6 +142,7 @@
         <field name="product_id" ref="l10n_ar.product_product_tasa_estadistica"/>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA 21%'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('l10n_ar.product_product_tasa_estadistica').categ_id.property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_3" model="account.move.line" context="{'check_move_validity': False}">
         <field name="move_id" ref="demo_despacho_1"/>
@@ -150,6 +152,7 @@
         <field name="product_id" ref="l10n_ar.product_product_arancel"/>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA No Gravado'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('l10n_ar.product_product_arancel').categ_id.property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_4" model="account.move.line" context="{'check_move_validity': False}">
         <field name="move_id" ref="demo_despacho_1"/>
@@ -159,6 +162,7 @@
         <field name="product_id" ref="l10n_ar.product_product_servicio_de_guarda"/>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA No Gravado'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('l10n_ar.product_product_servicio_de_guarda').categ_id.property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_5" model="account.move.line" context="{'check_move_validity': False}">
         <field name="name">FOB Total</field>
@@ -167,6 +171,7 @@
         <field name="quantity">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA 21%'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('product.product_category_all').property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_6" model="account.move.line" context="{'check_move_validity': False}">
         <field name="name">Flete</field>
@@ -175,6 +180,7 @@
         <field name="quantity">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA 21%'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('product.product_category_all').property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_7" model="account.move.line" context="{'check_move_validity': False}">
         <field name="name">Seguro</field>
@@ -183,6 +189,7 @@
         <field name="quantity">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA 21%'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('product.product_category_all').property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_8" model="account.move.line" context="{'check_move_validity': False}">
         <field name="name">-FOB Total</field>
@@ -191,6 +198,7 @@
         <field name="quantity">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA No Gravado'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('product.product_category_all').property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_9" model="account.move.line" context="{'check_move_validity': False}">
         <field name="name">-Flete</field>
@@ -199,6 +207,7 @@
         <field name="quantity">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA No Gravado'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <field name="account_id" model="account.move.line" eval="obj().env.ref('product.product_category_all').property_account_income_categ_id.id"/>
     </record>
     <record id="demo_despacho_1_line_10" model="account.move.line" context="{'check_move_validity': False}">
         <field name="name">-Seguro</field>
@@ -207,6 +216,7 @@
         <field name="quantity">1</field>
         <field name="product_uom_id" ref="uom.product_uom_unit"/>
         <field name="tax_ids" model="account.tax" eval="[(6, 0, obj().search([('company_id', '=', obj().env.ref('l10n_ar.company_ri').id), ('name', '=', 'IVA No Gravado'), ('type_tax_use', '=', 'purchase')], limit=1).ids)]"/>
+        <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 -->
diff --git a/addons/l10n_ar/demo/res_partner_demo.xml b/addons/l10n_ar/demo/res_partner_demo.xml
index 5981e43c369..7fc5aa34f27 100644
--- a/addons/l10n_ar/demo/res_partner_demo.xml
+++ b/addons/l10n_ar/demo/res_partner_demo.xml
@@ -118,40 +118,22 @@
         <field name='l10n_ar_afip_responsibility_type_id' ref="l10n_ar.res_IVA_LIB"/>
     </record>
 
-<!-- Default Partners -->
-
-        <!-- Main Partner -->
-    <record id="base.main_partner" model="res.partner">
-        <field name='l10n_latam_identification_type_id' ref="l10n_ar.it_cuit"/>
-        <field name='vat'>30111111118</field>
-    </record>
-
-        <!-- Wood Corner - Supplier -->
-    <record id="base.res_partner_1" model="res.partner">
+    <!-- Foreign Partner -->
+    <record id="res_partner_foreign" model="res.partner">
+        <field name="name">Foreign Inc</field>
+        <field eval="[(6, 0, [ref('base.res_partner_category_14'), ref('base.res_partner_category_12')])]" name="category_id"/>
+        <field name="is_company">1</field>
+        <field name="street">7841 Red Road</field>
+        <field name="city">San Francisco</field>
+        <field name="state_id" ref='base.state_us_5'/>
+        <field name="zip">95380</field>
+        <field name="country_id" ref="base.us"/>
+        <field name="email">foreing@example.com</field>
+        <field name="phone">(123)-456-7890</field>
+        <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"/>
     </record>
 
-        <!-- Deco Addict - Customer -->
-    <record id="base.res_partner_2" model="res.partner">
-        <field name='l10n_latam_identification_type_id' ref="l10n_ar.it_cuit"/>
-        <field name='vat'>30111111126</field>
-        <field name='l10n_ar_afip_responsibility_type_id' ref="l10n_ar.res_IVARI"/>
-    </record>
-
-        <!-- Azure Interior - Supplier/Customer -->
-    <record id="base.res_partner_12" model="res.partner">
-        <field name='l10n_latam_identification_type_id' ref="l10n_ar.it_cuit"/>
-        <field name='vat'>30888888884</field>
-        <field name='l10n_ar_afip_responsibility_type_id' ref="l10n_ar.res_IVARI"/>
-    </record>
-
-        <!-- Ready Mat - cliente exterior -->
-    <record id="base.res_partner_4" model="res.partner">
-        <field name='l10n_latam_identification_type_id' ref="l10n_latam_base.it_fid"/>
-        <field name='vat'>12345678</field>
-        <field name='l10n_ar_afip_responsibility_type_id' ref="l10n_ar.res_EXT"/>
-    </record>
-
 </odoo>
diff --git a/addons/l10n_ar/demo/respinsc_demo.xml b/addons/l10n_ar/demo/respinsc_demo.xml
index b6c31cc111a..cd0ec5c7c0c 100644
--- a/addons/l10n_ar/demo/respinsc_demo.xml
+++ b/addons/l10n_ar/demo/respinsc_demo.xml
@@ -47,6 +47,7 @@
             <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_ri"/>
             <field name='l10n_ar_afip_pos_system'>II_IM</field>
             <field name='l10n_ar_share_sequences' eval="True"/>
+            <field name='refund_sequence' eval="False"/>
         </record>
 
         <record id="sale_expo_journal_ri" model="account.journal">
@@ -58,6 +59,7 @@
             <field name='l10n_ar_afip_pos_number'>2</field>
             <field name='l10n_ar_afip_pos_partner_id' ref="l10n_ar.partner_ri"/>
             <field name='l10n_ar_afip_pos_system'>FEERCEL</field>
+            <field name='refund_sequence' eval="False"/>
         </record>
 
     </data>