diff --git a/addons/l10n_hr/__init__.py b/addons/l10n_hr/__init__.py
index e559ab15644..4628f79342d 100644
--- a/addons/l10n_hr/__init__.py
+++ b/addons/l10n_hr/__init__.py
@@ -4,9 +4,9 @@
 #    OpenERP, Open Source Management Solution
 #    Module: l10n_hr
 #    Author: Goran Kliska
-#    mail:   gkliskaATgmail.com
+#    mail:   goran.kliska(AT)slobodni-programi.hr
 #    Copyright (C) 2011- Slobodni programi d.o.o., Zagreb
-#    Contributions: 
+#    Contributions:
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -24,4 +24,4 @@
 ##############################################################################
 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_hr/__openerp__.py b/addons/l10n_hr/__openerp__.py
index ec0f6269364..05c3d69593c 100644
--- a/addons/l10n_hr/__openerp__.py
+++ b/addons/l10n_hr/__openerp__.py
@@ -4,10 +4,10 @@
 #    OpenERP, Open Source Management Solution
 #    Module: l10n_hr
 #    Author: Goran Kliska
-#    mail:   gkliskaATgmail.com
+#    mail:   goran.kliska(AT)slobodni-programi.hr
 #    Copyright: Slobodni programi d.o.o., Zagreb
-#    Contributions: 
-#              Tomislav Bošnjaković, Storm Computers d.o.o. : 
+#    Contributions:
+#              Tomislav Bošnjaković, Storm Computers d.o.o. :
 #                 - account types
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -25,8 +25,8 @@
 ##############################################################################
 
 {
-    "name" : "Croatia - RRIF's 2012 chat of accounts",
-    "description" : """
+    "name": "Croatia - RRIF 2012 COA",
+    "description": """
 Croatian localisation.
 ======================
 
@@ -34,8 +34,8 @@ Author: Goran Kliska, Slobodni programi d.o.o., Zagreb
         http://www.slobodni-programi.hr
 
 Contributions:
-    Infokom d.o.o.
-    Storm Computers d.o.o.
+  Tomislav Bošnjaković, Storm Computers: tipovi konta
+  Ivan Vađić, Slobodni programi: tipovi konta
 
 Description:
 
@@ -45,39 +45,35 @@ RRIF-ov računski plan za poduzetnike za 2012.
 Vrste konta
 Kontni plan prema RRIF-u, dorađen u smislu kraćenja naziva i dodavanja analitika
 Porezne grupe prema poreznoj prijavi
-Porezi PDV-a
-Ostali porezi (samo češće korišteni) povezani s kontima kontnog plana
+Porezi PDV obrasca
+Ostali porezi 
+Osnovne fiskalne pozicije
 
 Izvori podataka:
  http://www.rrif.hr/dok/preuzimanje/rrif-rp2011.rar
  http://www.rrif.hr/dok/preuzimanje/rrif-rp2012.rar
 
-
-
 """,
-    "version" : "2012.1",
-    "author" : "OpenERP Croatian Community",
-    "category" : 'Localization/Account Charts',
-    "website": "https://code.launchpad.net/openobject-croatia" ,
+    "version": "12.2",
+    "author": "OpenERP Croatian Community",
+    "category": 'Localization/Account Charts',
+    "website": "https://code.launchpad.net/openobject-croatia",
 
     'depends': [
                 'account',
-                'base_vat',
-                'base_iban',
                 'account_chart',
-#               'account_coda',
                 ],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
                 'data/account.account.type.csv',
                 'data/account.tax.code.template.csv',
                 'data/account.account.template.csv',
+                'l10n_hr_chart_template.xml',
                 'l10n_hr_wizard.xml',
                 'data/account.tax.template.csv',
-                'data/fiscal_position.xml',
-                   ],
-    "demo_xml" : [],
-    'test' : [],
+                'data/fiscal_position_template.xml',
+            ],
+    "demo": [],
+    'test': [],
     "active": False,
     "installable": True,
 }
diff --git a/addons/l10n_hr/data/account.tax.template.csv b/addons/l10n_hr/data/account.tax.template.csv
index 7289e25a5e3..b038cebfc39 100644
--- a/addons/l10n_hr/data/account.tax.template.csv
+++ b/addons/l10n_hr/data/account.tax.template.csv
@@ -1,62 +1,50 @@
-"id","description","chart_template_id:id","name","amount","child_ids:id","parent_id:id","child_depend","type","account_collected_id:id","account_paid_id:id","type_tax_use","base_code_id:id","tax_code_id:id","ref_base_code_id:id","ref_tax_code_id:id","ref_tax_sign","tax_sign","base_sign","ref_base_sign","sequence"
-"rrif_pdv_25","PDV 25%","l10n_hr_chart_template_rrif","25% PDV","0.25",,,"False","percent","kp_rrif24003","kp_rrif24003","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","10"
-"rrif_pdv_25usl","PDV 25% Usluge","l10n_hr_chart_template_rrif","25% PDV usluge","0.25",,,"False","percent","kp_rrif24003","kp_rrif24003","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_23","PDV 23%","l10n_hr_chart_template_rrif","23% PDV","0.23",,,"False","percent","kp_rrif24002","kp_rrif24002","sale","pdv_code_o22","pdv_code_p22","pdv_code_o22","pdv_code_p22","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_23usl","PDV 23% Usluge","l10n_hr_chart_template_rrif","23% PDV usluge","0.23",,,"False","percent","kp_rrif24002","kp_rrif24002","sale","pdv_code_o22","pdv_code_p22","pdv_code_o22","pdv_code_p22","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_10","PDV 10%","l10n_hr_chart_template_rrif","10% PDV","0.10",,,"False","percent","kp_rrif24000","kp_rrif24000","sale","pdv_code_o21","pdv_code_p21","pdv_code_o21","pdv_code_p21","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_0","PDV  0%","l10n_hr_chart_template_rrif","0% PDV","0.00",,,"False","percent",,,"sale","pdv_code_o13",,"pdv_code_o13",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_avans_25","PDV za predujam 25%","l10n_hr_chart_template_rrif","25% PDV (za predujam)","0.25",,,"False","percent","kp_rrif24013","kp_rrif24013","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_avans_23","PDV za predujam 23%","l10n_hr_chart_template_rrif","23% PDV (za predujam)","0.23",,,"False","percent","kp_rrif24012","kp_rrif24012","sale","pdv_code_o22","pdv_code_p22","pdv_code_o22","pdv_code_p22","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_avans_10","PDV za predujam 10%","l10n_hr_chart_template_rrif","10% PDV (za predujam)","0.10",,,"False","percent","kp_rrif24010","kp_rrif24010","sale","pdv_code_o21","pdv_code_p21","pdv_code_o21","pdv_code_p21","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_avans_0","PDV za predujam 0%","l10n_hr_chart_template_rrif","0% PDV (za predujam)","0.00",,,"False","percent",,,"sale","pdv_code_o13",,"pdv_code_o13",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_nezar_isp_25","PDV po nezaračunanim isporukama 25%","l10n_hr_chart_template_rrif","25% PDV za nezaračunane isp.","0.25",,,"False","percent","kp_rrif24033","kp_rrif24033","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_nezar_isp_23","PDV po nezaračunanim isporukama 23%","l10n_hr_chart_template_rrif","23% PDV za nezaračunane isp.","0.23",,,"False","percent","kp_rrif24032","kp_rrif24032","sale","pdv_code_o22","pdv_code_p22","pdv_code_o22","pdv_code_p22","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_nezar_isp_10","PDV po nezaračunanim isporukama 10%","l10n_hr_chart_template_rrif","10% PDV za nezaračunane isp.","0.10",,,"False","percent","kp_rrif24030","kp_rrif24030","sale","pdv_code_o21","pdv_code_p21","pdv_code_o21","pdv_code_p21","1.0","1.0","1.0","1.0","100"
-"rrif_pdv_nezar_isp_0","PDV po nezaračunanim isporukama 0%","l10n_hr_chart_template_rrif","0% PDV za nezaračunane isp.","0.00",,,"False","percent",,,"sale","pdv_code_o13",,"pdv_code_o13",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_nepod_0","1. KOJE NE PODLIJEŽU OPOREZIVANJU (čl. 2. u svezi s čl. 5 i čl. 8 st. 7 Zakona)","l10n_hr_chart_template_rrif","0% Ne podliježe op.","0.00",,,"False","percent",,,"sale","pdv_code_o11",,"pdv_code_o11",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_osl_izvoz_0","2.1. IZVOZNE - s pravom na odbitak pretporeza (čl. 13. st. 1. toč. 1. i čl. 14. Zakona)","l10n_hr_chart_template_rrif","0% osl. izvozne","0.00",,,"False","percent",,,"sale","pdv_code_o121",,"pdv_code_o121",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_osl_medpri_0","2.2. U VEZI S MEĐUNARODNIM PRIJEVOZOM  (čl. 13.b Zakona)","l10n_hr_chart_template_rrif","0% osl. međ. prijevoz","0.00",,,"False","percent",,,"sale","pdv_code_o122",,"pdv_code_o122",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_osl_tuz_0","2.3. TUZEMNE - bez prava na odbitak pretporeza (čl. 11. i čl. 11a Zakona)","l10n_hr_chart_template_rrif","0% osl tuzemne","0.00",,,"False","percent",,,"sale","pdv_code_o123",,"pdv_code_o123",,"1.0","1.0","1.0","1.0","100"
-"rrif_pdv_osl_ost_0","2.4. OSTALO (čl. 13. st. 1. toč. 2. I čl. 13a Zakona) ","l10n_hr_chart_template_rrif","0% osl. ostalo","0.00",,,"False","percent",,,"sale","pdv_code_o124",,"pdv_code_o124",,"1.0","1.0","1.0","1.0","100"
-"rrif_pp_25","Pretporez 25% PDV","l10n_hr_chart_template_rrif","25% PDV pretporez","0.25",,,"False","percent","kp_rrif14003","kp_rrif14003","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","10"
-"rrif_pp_25usl","Pretporez 25% PDV Usluge","l10n_hr_chart_template_rrif","25% PDV pretporez usluge","0.25",,,"False","percent","kp_rrif14003","kp_rrif14003","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
-"rrif_pp_23","Pretporez 23% PDV","l10n_hr_chart_template_rrif","23% PDV pretporez","0.23",,,"False","percent","kp_rrif14002","kp_rrif14002","purchase","pdv_code_o32","pdv_code_p32","pdv_code_o32","pdv_code_p32","1.0","1.0","1.0","1.0","100"
-"rrif_pp_23usl","Pretporez 23% PDV Usluge","l10n_hr_chart_template_rrif","23% PDV pretporez usluge","0.23",,,"False","percent","kp_rrif14002","kp_rrif14002","purchase","pdv_code_o32","pdv_code_p32","pdv_code_o32","pdv_code_p32","1.0","1.0","1.0","1.0","100"
-"rrif_pp_10","Pretporez 10% PDV","l10n_hr_chart_template_rrif","10% PDV pretporez","0.10",,,"False","percent","kp_rrif14000","kp_rrif14000","purchase","pdv_code_o31","pdv_code_p31","pdv_code_o31","pdv_code_p31","1.0","1.0","1.0","1.0","100"
-"rrif_pp_0","Pretporez 0% PDV","l10n_hr_chart_template_rrif","0% PDV pretporez","0.00",,,"False","percent",,,"purchase","pdv_code_o391",,"pdv_code_o391",,"1.0","1.0","1.0","1.0","100"
-"rrif_pp_avans_25","Pretporez za predujam 25% PDV","l10n_hr_chart_template_rrif","25% PDV pretporez za predujam","0.25",,,"False","percent","kp_rrif14013","kp_rrif14013","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
-"rrif_pp_avans_23","Pretporez za predujam 23% PDV","l10n_hr_chart_template_rrif","23% PDV pretporez za predujam","0.23",,,"False","percent","kp_rrif14012","kp_rrif14012","purchase","pdv_code_o32","pdv_code_p32","pdv_code_o32","pdv_code_p32","1.0","1.0","1.0","1.0","100"
-"rrif_pp_avans_10","Pretporez za predujam 10% PDV","l10n_hr_chart_template_rrif","10% PDV pretporez za predujam","0.10",,,"False","percent","kp_rrif14010","kp_rrif14010","purchase","pdv_code_o31","pdv_code_p31","pdv_code_o31","pdv_code_p31","1.0","1.0","1.0","1.0","100"
-"rrif_pp_avans_0","Pretporez za predujam 0% PDV","l10n_hr_chart_template_rrif","0% PDV pretporez za predujam","0.00",,,"False","percent",,,"purchase","pdv_code_o391",,"pdv_code_o391",,"1.0","1.0","1.0","1.0","100"
-"rrif_pp_uvoz_25","Plaćeni PDV 25% pri uvozu dobara","l10n_hr_chart_template_rrif","25% uvoz dobara","0.25",,,"False","percent","kp_rrif14023","kp_rrif14023","purchase","pdv_code_o34","pdv_code_p34","pdv_code_o34","pdv_code_p34","1.0","1.0","1.0","1.0","100"
-"rrif_pp_uvoz_23","Plaćeni PDV 23% pri uvozu dobara","l10n_hr_chart_template_rrif","23% uvoz dobara","0.23",,,"False","percent","kp_rrif14022","kp_rrif14022","purchase","pdv_code_o34","pdv_code_p34","pdv_code_o34","pdv_code_p34","1.0","1.0","1.0","1.0","100"
-"rrif_pp_uvoz_10","Plaćeni PDV 10% pri uvozu dobara","l10n_hr_chart_template_rrif","10% uvoz dobara","0.10",,,"False","percent","kp_rrif14020","kp_rrif14020","purchase","pdv_code_o34","pdv_code_p34","pdv_code_o34","pdv_code_p34","1.0","1.0","1.0","1.0","100"
-"rrif_pp_uvoz_0","Plaćeni PDV 0% pri uvozu dobara","l10n_hr_chart_template_rrif","0% uvoz dobara","0.00",,,"False","percent",,,"purchase","pdv_code_o34",,"pdv_code_o34",,"1.0","1.0","1.0","1.0","100"
-"rrif_pp_ino_25","Plaćeni PDV 25% na usluge inozemnih poduzetnika","l10n_hr_chart_template_rrif","25% ino. usluge","0.25",,,"False","percent","kp_rrif14033","kp_rrif14033","purchase","pdv_code_o37","pdv_code_p37","pdv_code_o34","pdv_code_o37","1.0","1.0","1.0","1.0","100"
-"rrif_pp_ino_23","Plaćeni PDV 23% na usluge inozemnih poduzetnika","l10n_hr_chart_template_rrif","23% ino. usluge","0.23",,,"False","percent","kp_rrif14032","kp_rrif14032","purchase","pdv_code_o36","pdv_code_p36","pdv_code_o34","pdv_code_o37","1.0","1.0","1.0","1.0","100"
-"rrif_pp_ino_10","Plaćeni PDV 10% na usluge inozemnih poduzetnika","l10n_hr_chart_template_rrif","10% ino. usluge","0.10",,,"False","percent","kp_rrif14030","kp_rrif14030","purchase","pdv_code_o35","pdv_code_p35","pdv_code_o34","pdv_code_o35","1.0","1.0","1.0","1.0","100"
-"rrif_pp_R2_25","25% R-2 dobavljač","l10n_hr_chart_template_rrif","25% R-2 dobavljač","0.25",,,"False","percent","kp_rrif1409","kp_rrif1409","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
-"rrif_pp_R2_23","23% R-2 dobavljač","l10n_hr_chart_template_rrif","23% R-2 dobavljač","0.23",,,"False","percent","kp_rrif1408","kp_rrif1408","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
-"rrif_pp_uvoz_samopdv_25","Samo PDV kod uvoza 25%","l10n_hr_chart_template_rrif","Samo PDV kod uvoza 25%","0.25",,,"False","percent",,,"purchase","pdv_code_o913","pdv_code_p9202","pdv_code_o913","pdv_code_p9202","-1.0","-1.0","-1.0","-1.0","100"
-"rrif_pp_uvoz_samopdv_25usl","Samo PDV kod uvoza 25% usluge","l10n_hr_chart_template_rrif","Samo PDV kod uvoza 25% usluge","0.25",,,"False","percent",,,"purchase","pdv_code_o913","pdv_code_p9203","pdv_code_o913","pdv_code_p9203","-1.0","-1.0","-1.0","-1.0","100"
-"rrif_pp_uvoz_samopdv_23","Samo PDV kod uvoza 23%","l10n_hr_chart_template_rrif","Samo PDV kod uvoza 23%","0.23",,,"False","percent",,,"purchase","pdv_code_o912","pdv_code_p9203","pdv_code_o912","pdv_code_p9203","-1.0","-1.0","-1.0","-1.0","100"
-"rrif_ppdnp1_3070_1","pp 30% Nepriznat 70% Priznat","l10n_hr_chart_template_rrif","pp 30% Nepriznat 70% Priznat","1.0",,,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_30_2","pp 30% nepriznat","l10n_hr_chart_template_rrif","pp 30% nepriznat","0.30",,"rrif_ppdnp1_3070_1","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_30_3","pp 30% nep.(25%)","l10n_hr_chart_template_rrif","pp 30% nep.(25%)","0.25",,"rrif_ppdnp1_3070_30_2","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_70_2","pp 70% priznat","l10n_hr_chart_template_rrif","Pp 70% priznat","0.70",,"rrif_ppdnp1_3070_1","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_70_3","pp 70% priz.(25%)","l10n_hr_chart_template_rrif","Pp 70% priz.(25%)","0.25",,"rrif_ppdnp1_3070_70_2","False","percent","kp_rrif14002","kp_rrif14002","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_1","pp 70% Nepriznat 30% Priznat","l10n_hr_chart_template_rrif","pp 70% Nepriznat 30% Priznat","1.0",,,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_70_2","Pp 70% nepriznat","l10n_hr_chart_template_rrif","Pp 70% nepriznat","0.70",,"rrif_ppdnp1_7030_1","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_70_3","Pp 70% nep.(25%)","l10n_hr_chart_template_rrif","Pp 70% nep.(25%)","0.25",,"rrif_ppdnp1_7030_70_2","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_30_2","Pp 30% priznat","l10n_hr_chart_template_rrif","Pp 30% priznat","0.30",,"rrif_ppdnp1_7030_1","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_30_3","Pp 30% priz.(25%)","l10n_hr_chart_template_rrif","Pp 30% priz.(25%)","0.25",,"rrif_ppdnp1_7030_30_2","False","percent","kp_rrif14002","kp_rrif14002","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_1_r2","R2 pp 30% Nepriznat 70% Priznat","l10n_hr_chart_template_rrif","R2 pp 30% Nepriznat 70% Priznat","1.0",,,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_30_2_r2","R2 pp 30% nepriznat","l10n_hr_chart_template_rrif","R2 pp 30% nepriznat","0.30",,"rrif_ppdnp1_3070_1_r2","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_30_3_r2","R2 pp 30% nep.(25%)","l10n_hr_chart_template_rrif","R2 pp 30% nep.(25%)","0.25",,"rrif_ppdnp1_3070_30_2_r2","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_70_2_r2","R2 pp 70% priznat","l10n_hr_chart_template_rrif","R2 pp 70% priznat","0.70",,"rrif_ppdnp1_3070_1_r2","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_3070_70_3_r2","R2 pp 70% priz.(25%)","l10n_hr_chart_template_rrif","R2 pp 70% priz.(25%)","0.25",,"rrif_ppdnp1_3070_70_2_r2","False","percent","kp_rrif1408","kp_rrif1408","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_1_r2","R2 pp 70% Nepriznat 30% Priznat","l10n_hr_chart_template_rrif","R2 pp 70% Nepriznat 30% Priznat","1.0",,,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_70_2_r2","R2 Pp 70% nepriznat","l10n_hr_chart_template_rrif","R2 Pp 70% nepriznat","0.70",,"rrif_ppdnp1_7030_1_r2","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_70_3_r2","R2 Pp 70% nep.(25%)","l10n_hr_chart_template_rrif","R2 Pp 70% nep.(25%)","0.25",,"rrif_ppdnp1_7030_70_2_r2","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_30_2_r2","R2 Pp 30% priznat","l10n_hr_chart_template_rrif","R2 Pp 30% priznat","0.30",,"rrif_ppdnp1_7030_1_r2","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
-"rrif_ppdnp1_7030_30_3_r2","R2 Pp 30% priz.(25%)","l10n_hr_chart_template_rrif","R2 Pp 30% priz.(25%)","0.25",,"rrif_ppdnp1_7030_30_2_r2","False","percent","kp_rrif1408","kp_rrif1408","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
+"id","description","chart_template_id/id","name","amount","parent_id","child_depend","type","account_collected_id/id","account_paid_id/id","type_tax_use","base_code_id/id","tax_code_id/id","ref_base_code_id/id","ref_tax_code_id/id","ref_tax_sign","tax_sign","base_sign","ref_base_sign","sequence"
+"rrif_pdv_25","PDV 25%","l10n_hr_chart_template_rrif","25% PDV","0.25",,"False","percent","kp_rrif24003","kp_rrif24003","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","10"
+"rrif_pdv_25usl","PDV 25% Usluge","l10n_hr_chart_template_rrif","25% PDV usluge","0.25",,"False","percent","kp_rrif24003","kp_rrif24003","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","100"
+"rrif_pdv_10","PDV 10%","l10n_hr_chart_template_rrif","10% PDV","0.10",,"False","percent","kp_rrif24000","kp_rrif24000","sale","pdv_code_o21","pdv_code_p21","pdv_code_o21","pdv_code_p21","1.0","1.0","1.0","1.0","100"
+"rrif_pdv_0","PDV  0%","l10n_hr_chart_template_rrif","0% PDV","0.00",,"False","percent",,,"sale","pdv_code_o13",,"pdv_code_o13",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_avans_25","PDV za predujam 25%","l10n_hr_chart_template_rrif","25% PDV (za predujam)","0.25",,"False","percent","kp_rrif24013","kp_rrif24013","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","100"
+"rrif_pdv_avans_10","PDV za predujam 10%","l10n_hr_chart_template_rrif","10% PDV (za predujam)","0.10",,"False","percent","kp_rrif24010","kp_rrif24010","sale","pdv_code_o21","pdv_code_p21","pdv_code_o21","pdv_code_p21","1.0","1.0","1.0","1.0","100"
+"rrif_pdv_avans_0","PDV za predujam 0%","l10n_hr_chart_template_rrif","0% PDV (za predujam)","0.00",,"False","percent",,,"sale","pdv_code_o13",,"pdv_code_o13",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_nezar_isp_25","PDV po nezaračunanim isporukama 25%","l10n_hr_chart_template_rrif","25% PDV za nezaračunane isp.","0.25",,"False","percent","kp_rrif24033","kp_rrif24033","sale","pdv_code_o23","pdv_code_p23","pdv_code_o23","pdv_code_p23","1.0","1.0","1.0","1.0","100"
+"rrif_pdv_nezar_isp_10","PDV po nezaračunanim isporukama 10%","l10n_hr_chart_template_rrif","10% PDV za nezaračunane isp.","0.10",,"False","percent","kp_rrif24030","kp_rrif24030","sale","pdv_code_o21","pdv_code_p21","pdv_code_o21","pdv_code_p21","1.0","1.0","1.0","1.0","100"
+"rrif_pdv_nezar_isp_0","PDV po nezaračunanim isporukama 0%","l10n_hr_chart_template_rrif","0% PDV za nezaračunane isp.","0.00",,"False","percent",,,"sale","pdv_code_o13",,"pdv_code_o13",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_nepod_0","1. KOJE NE PODLIJEŽU OPOREZIVANJU (čl. 2. u svezi s čl. 5 i čl. 8 st. 7 Zakona)","l10n_hr_chart_template_rrif","0% Ne podliježe op.","0.00",,"False","percent",,,"sale","pdv_code_o11",,"pdv_code_o11",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_osl_izvoz_0","2.1. IZVOZNE - s pravom na odbitak pretporeza (čl. 13. st. 1. toč. 1. i čl. 14. Zakona)","l10n_hr_chart_template_rrif","0% osl. izvozne","0.00",,"False","percent",,,"sale","pdv_code_o121",,"pdv_code_o121",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_osl_medpri_0","2.2. U VEZI S MEĐUNARODNIM PRIJEVOZOM  (čl. 13.b Zakona)","l10n_hr_chart_template_rrif","0% osl. međ. prijevoz","0.00",,"False","percent",,,"sale","pdv_code_o122",,"pdv_code_o122",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_osl_tuz_0","2.3. TUZEMNE - bez prava na odbitak pretporeza (čl. 11. i čl. 11a Zakona)","l10n_hr_chart_template_rrif","0% osl tuzemne","0.00",,"False","percent",,,"sale","pdv_code_o123",,"pdv_code_o123",,"1.0","1.0","1.0","1.0","100"
+"rrif_pdv_osl_ost_0","2.4. OSTALO (čl. 13. st. 1. toč. 2. I čl. 13a Zakona) ","l10n_hr_chart_template_rrif","0% osl. ostalo","0.00",,"False","percent",,,"sale","pdv_code_o124",,"pdv_code_o124",,"1.0","1.0","1.0","1.0","100"
+"rrif_pp_25","Pretporez 25% PDV","l10n_hr_chart_template_rrif","25% PDV pretporez","0.25",,"False","percent","kp_rrif14003","kp_rrif14003","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","10"
+"rrif_pp_25usl","Pretporez 25% PDV Usluge","l10n_hr_chart_template_rrif","25% PDV pretporez usluge","0.25",,"False","percent","kp_rrif14003","kp_rrif14003","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
+"rrif_pp_10","Pretporez 10% PDV","l10n_hr_chart_template_rrif","10% PDV pretporez","0.10",,"False","percent","kp_rrif14000","kp_rrif14000","purchase","pdv_code_o31","pdv_code_p31","pdv_code_o31","pdv_code_p31","1.0","1.0","1.0","1.0","100"
+"rrif_pp_0","Pretporez 0% PDV","l10n_hr_chart_template_rrif","0% PDV pretporez","0.00",,"False","percent",,,"purchase","pdv_code_o391",,"pdv_code_o391",,"1.0","1.0","1.0","1.0","100"
+"rrif_pp_avans_25","Pretporez za predujam 25% PDV","l10n_hr_chart_template_rrif","25% PDV pretporez za predujam","0.25",,"False","percent","kp_rrif14013","kp_rrif14013","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
+"rrif_pp_avans_0","Pretporez za predujam 0% PDV","l10n_hr_chart_template_rrif","0% PDV pretporez za predujam","0.00",,"False","percent",,,"purchase","pdv_code_o391",,"pdv_code_o391",,"1.0","1.0","1.0","1.0","100"
+"rrif_pp_uvoz_25","Plaćeni PDV 25% pri uvozu dobara","l10n_hr_chart_template_rrif","25% uvoz dobara","0.25",,"False","percent","kp_rrif14023","kp_rrif14023","purchase","pdv_code_o34","pdv_code_p34","pdv_code_o34","pdv_code_p34","1.0","1.0","1.0","1.0","100"
+"rrif_pp_uvoz_10","Plaćeni PDV 10% pri uvozu dobara","l10n_hr_chart_template_rrif","10% uvoz dobara","0.10",,"False","percent","kp_rrif14020","kp_rrif14020","purchase","pdv_code_o34","pdv_code_p34","pdv_code_o34","pdv_code_p34","1.0","1.0","1.0","1.0","100"
+"rrif_pp_uvoz_0","Plaćeni PDV 0% pri uvozu dobara","l10n_hr_chart_template_rrif","0% uvoz dobara","0.00",,"False","percent",,,"purchase","pdv_code_o34",,"pdv_code_o34",,"1.0","1.0","1.0","1.0","100"
+"rrif_pp_ino_25","Plaćeni PDV 25% na usluge inozemnih poduzetnika","l10n_hr_chart_template_rrif","25% ino. usluge","0.25",,"False","percent","kp_rrif14033","kp_rrif14033","purchase","pdv_code_o37","pdv_code_p37","pdv_code_o34","pdv_code_o37","1.0","1.0","1.0","1.0","100"
+"rrif_pp_ino_10","Plaćeni PDV 10% na usluge inozemnih poduzetnika","l10n_hr_chart_template_rrif","10% ino. usluge","0.10",,"False","percent","kp_rrif14030","kp_rrif14030","purchase","pdv_code_o35","pdv_code_p35","pdv_code_o34","pdv_code_o35","1.0","1.0","1.0","1.0","100"
+"rrif_ppr2_25","25% R-2 dobavljač","l10n_hr_chart_template_rrif","25% R-2 dobavljač","0.25",,"False","percent","kp_rrif1409","kp_rrif1409","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
+"rrif_pp_uvoz_samopdv_25","Samo PDV kod uvoza 25%","l10n_hr_chart_template_rrif","Samo PDV kod uvoza 25%","0.25",,"False","percent",,,"purchase","pdv_code_o913","pdv_code_p9202","pdv_code_o913","pdv_code_p9202","-1.0","-1.0","-1.0","-1.0","100"
+"rrif_pp_uvoz_samopdv_25usl","Samo PDV kod uvoza 25% usluge","l10n_hr_chart_template_rrif","Samo PDV kod uvoza 25% usluge","0.25",,"False","percent",,,"purchase","pdv_code_o913","pdv_code_p9203","pdv_code_o913","pdv_code_p9203","-1.0","-1.0","-1.0","-1.0","100"
+"rrif_ppdnp1_3070_1","pp 30% Nepriznat 70% Priznat","l10n_hr_chart_template_rrif","pp 30% Nepriznat 70% Priznat","1.0",,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_30_2","pp 30% nepriznat","l10n_hr_chart_template_rrif","pp 30% nepriznat","0.30","pp 30% Nepriznat 70% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_30_3","pp 30% nep.(25%)","l10n_hr_chart_template_rrif","pp 30% nep.(25%)","0.25","pp 30% nepriznat","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_70_2","pp 70% priznat","l10n_hr_chart_template_rrif","Pp 70% priznat","0.70","pp 30% Nepriznat 70% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_70_3","pp 70% priz.(25%)","l10n_hr_chart_template_rrif","Pp 70% priz.(25%)","0.25","Pp 70% priznat","False","percent","kp_rrif14002","kp_rrif14002","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_1","pp 70% Nepriznat 30% Priznat","l10n_hr_chart_template_rrif","pp 70% Nepriznat 30% Priznat","1.0",,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_70_2","Pp 70% nepriznat","l10n_hr_chart_template_rrif","Pp 70% nepriznat","0.70","pp 70% Nepriznat 30% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_70_3","Pp 70% nep.(25%)","l10n_hr_chart_template_rrif","Pp 70% nep.(25%)","0.25","Pp 70% nepriznat","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_30_2","Pp 30% priznat","l10n_hr_chart_template_rrif","Pp 30% priznat","0.30","pp 70% Nepriznat 30% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_30_3","Pp 30% priz.(25%)","l10n_hr_chart_template_rrif","Pp 30% priz.(25%)","0.25","Pp 30% priznat","False","percent","kp_rrif14002","kp_rrif14002","purchase","pdv_code_o33","pdv_code_p33","pdv_code_o33","pdv_code_p33","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_1_r2","R2 pp 30% Nepriznat 70% Priznat","l10n_hr_chart_template_rrif","R2 pp 30% Nepriznat 70% Priznat","1.0",,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_30_2_r2","R2 pp 30% nepriznat","l10n_hr_chart_template_rrif","R2 pp 30% nepriznat","0.30","R2 pp 30% Nepriznat 70% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_30_3_r2","R2 pp 30% nep.(25%)","l10n_hr_chart_template_rrif","R2 pp 30% nep.(25%)","0.25","R2 pp 30% nepriznat","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_70_2_r2","R2 pp 70% priznat","l10n_hr_chart_template_rrif","R2 pp 70% priznat","0.70","R2 pp 30% Nepriznat 70% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_3070_70_3_r2","R2 pp 70% priz.(25%)","l10n_hr_chart_template_rrif","R2 pp 70% priz.(25%)","0.25","R2 pp 70% priznat","False","percent","kp_rrif1408","kp_rrif1408","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_1_r2","R2 pp 70% Nepriznat 30% Priznat","l10n_hr_chart_template_rrif","R2 pp 70% Nepriznat 30% Priznat","1.0",,"True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_70_2_r2","R2 Pp 70% nepriznat","l10n_hr_chart_template_rrif","R2 Pp 70% nepriznat","0.70","R2 pp 70% Nepriznat 30% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_70_3_r2","R2 Pp 70% nep.(25%)","l10n_hr_chart_template_rrif","R2 Pp 70% nep.(25%)","0.25","R2 Pp 70% nepriznat","False","percent",,,"purchase","pdv_code_o913","pdv_code_p913","pdv_code_o913","pdv_code_p913","1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_30_2_r2","R2 Pp 30% priznat","l10n_hr_chart_template_rrif","R2 Pp 30% priznat","0.30","R2 pp 70% Nepriznat 30% Priznat","True","percent",,,"purchase",,,,,"1.0","1.0","1.0","1.0","100"
+"rrif_ppdnp1_7030_30_3_r2","R2 Pp 30% priz.(25%)","l10n_hr_chart_template_rrif","R2 Pp 30% priz.(25%)","0.25","R2 Pp 30% priznat","False","percent","kp_rrif1408","kp_rrif1408","purchase","pdv_code_o92","pdv_code_p9201","pdv_code_o92","pdv_code_p9201","1.0","1.0","1.0","1.0","100"
diff --git a/addons/l10n_hr/data/fiscal_position.xml.backup b/addons/l10n_hr/data/fiscal_position.xml.backup
deleted file mode 100644
index 8386a0d9808..00000000000
--- a/addons/l10n_hr/data/fiscal_position.xml.backup
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-	<data noupdate="1">
-		<record id="account_fiscal_position_bescarinskazona0" model="account.fiscal.position">
-			<field name="name">Bescarinska zona</field>
-			<field name="company_id" ref="base.main_company"/>
-		</record>
-		<record id="account_fiscal_position_tax_0" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Bescarinska zona')]"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'Izuze\u0107e bescarinska zona')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV')]"/>
-		</record>
-		<record id="account_fiscal_position_tax_1" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Bescarinska zona')]"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'Izuze\u0107e bescarinska zona')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'10% PDV')]"/>
-		</record>
-	</data>
-	<data noupdate="1">
-		<record id="account_fiscal_position_domaipartnerir0" model="account.fiscal.position">
-			<field name="name">Domaći partneri R2</field>
-			<field name="company_id" ref="base.main_company"/>
-		</record>
-		<record id="account_fiscal_position_tax_2" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Doma\u0107i partneri R2')]"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'23% R-2 dobavlja\u010d')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_domaipartnerir1" model="account.fiscal.position">
-			<field name="name">Domaći partneri R1</field>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_stranipartneri0" model="account.fiscal.position">
-			<field name="name">Strani partneri</field>
-		</record>
-		<record id="account_fiscal_position_account_0" model="account.fiscal.position.account">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Strani partneri')]"/>
-			<field model="account.account" name="account_dest_id" search="[('name', '=', u'Kupci dobara iz inozemstva')]"/>
-			<field model="account.account" name="account_src_id" search="[('name', '=', u'Potra\u017eivanja od kupaca dobara')]"/>
-		</record>
-		<record id="account_fiscal_position_account_1" model="account.fiscal.position.account">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Strani partneri')]"/>
-			<field model="account.account" name="account_dest_id" search="[('name', '=', u'Dobavlja\u010di usluga')]"/>
-			<field model="account.account" name="account_src_id" search="[('name', '=', u'Dobavlja\u010di dobara')]"/>
-		</record>
-		<record id="account_fiscal_position_tax_3" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Strani partneri')]"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'Oslobo\u0111enje - izvoz')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV')]"/>
-		</record>
-		<record id="account_fiscal_position_tax_4" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Strani partneri')]"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'D-INO Uvoz')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_domaipartneriizvansustavapdva0" model="account.fiscal.position">
-			<field name="name">Domaći partneri izvan sustava PDV-a</field>
-		</record>
-		<record id="account_fiscal_position_tax_5" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Doma\u0107i partneri izvan sustava PDV-a')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV pretporez')]"/>
-		</record>
-		<record id="account_fiscal_position_tax_6" model="account.fiscal.position.tax">
-			<field model="account.fiscal.position" name="position_id" search="[('name', '=', u'Doma\u0107i partneri izvan sustava PDV-a')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'10% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_carinskauprava0" model="account.fiscal.position">
-			<field name="name">Carinska uprava</field>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_7" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_bescarinskazona0"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'Izuze\u0107e bescarinska zona')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_8" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_bescarinskazona0"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'Izuze\u0107e bescarinska zona')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'10% PDV')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_9" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_domaipartnerir0"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'23% R-2 dobavlja\u010d')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_10" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_domaipartneriizvansustavapdva0"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_11" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_domaipartneriizvansustavapdva0"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'10% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_12" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_stranipartneri0"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'Oslobo\u0111enje - izvoz')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_tax_13" model="account.fiscal.position.tax">
-			<field name="position_id" ref="account_fiscal_position_stranipartneri0"/>
-			<field model="account.tax" name="tax_dest_id" search="[('name', '=', u'D-INO Uvoz')]"/>
-			<field model="account.tax" name="tax_src_id" search="[('name', '=', u'23% PDV pretporez')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_account_2" model="account.fiscal.position.account">
-			<field name="position_id" ref="account_fiscal_position_stranipartneri0"/>
-			<field model="account.account" name="account_dest_id" search="[('name', '=', u'Kupci dobara iz inozemstva')]"/>
-			<field model="account.account" name="account_src_id" search="[('name', '=', u'Potra\u017eivanja od kupaca dobara')]"/>
-		</record>
-	</data>
-	<data>
-		<record id="account_fiscal_position_account_3" model="account.fiscal.position.account">
-			<field name="position_id" ref="account_fiscal_position_stranipartneri0"/>
-			<field model="account.account" name="account_dest_id" search="[('name', '=', u'Dobavlja\u010di usluga')]"/>
-			<field model="account.account" name="account_src_id" search="[('name', '=', u'Dobavlja\u010di dobara')]"/>
-		</record>
-	</data>
-</openerp>
\ No newline at end of file
diff --git a/addons/l10n_hr/data/fiscal_position.xml b/addons/l10n_hr/data/fiscal_position_template.xml
similarity index 50%
rename from addons/l10n_hr/data/fiscal_position.xml
rename to addons/l10n_hr/data/fiscal_position_template.xml
index df91a120a8b..5a74fc0cc2d 100644
--- a/addons/l10n_hr/data/fiscal_position.xml
+++ b/addons/l10n_hr/data/fiscal_position_template.xml
@@ -1,68 +1,82 @@
 <?xml version="1.0"  encoding="utf-8"?>
 <openerp>
-	<data>
-		<record id="account_fiscal_position_template_domairpartneri0" model="account.fiscal.position.template">
+	<data >
+		<record id="account_fiscal_position_template_rrif_domairpartneri0" model="account.fiscal.position.template">
 			<field name="chart_template_id" ref="l10n_hr_chart_template_rrif"/>
 			<field name="name">R1 partneri</field>
 		</record>
-	</data>
-	
-	<data>
-		<record id="account_fiscal_position_template_2" model="account.fiscal.position.template">
+
+		<record id="account_fiscal_position_template_rrif_2" model="account.fiscal.position.template">
 			<field name="chart_template_id" ref="l10n_hr_chart_template_rrif"/>
 			<field name="name">R2 partneri</field>
 		</record>
-		<record id="account_fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
-			<field name="position_id" ref="account_fiscal_position_template_2"/>
-			<field name="tax_dest_id" ref="rrif_pp_R2_25"/>
-			<field name="tax_src_id" ref="rrif_pp_25"/>
-		</record>
-		<record id="account_fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
-			<field name="position_id" ref="account_fiscal_position_template_2"/>
-			<field name="tax_dest_id" ref="rrif_pp_R2_25"/>
-			<field name="tax_src_id" ref="rrif_pp_25usl"/>
-		</record>
-		<record id="account_fiscal_position_account_template_1" model="account.fiscal.position.account.template">
-			<field name="position_id" ref="account_fiscal_position_template_2"/>
-			<field name="account_dest_id" ref="kp_rrif2220"/>
-			<field name="account_src_id" ref="kp_rrif2200"/>
-		</record>
-	</data>
 
-	<data>
-		<record id="account_fiscal_position_template_3" model="account.fiscal.position.template">
+		<record id="account_fiscal_position_template_rrif_3" model="account.fiscal.position.template">
+			<field name="chart_template_id" ref="l10n_hr_chart_template_rrif"/>
+			<field name="name">EU Inozemni</field>
+		</record>
+
+		<record id="account_fiscal_position_template_rrif_4" model="account.fiscal.position.template">
 			<field name="chart_template_id" ref="l10n_hr_chart_template_rrif"/>
 			<field name="name">Inozemni</field>
 		</record>
-		<record id="account_fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
-			<field name="position_id" ref="account_fiscal_position_template_3"/>
-			<field name="tax_dest_id" ref="rrif_pdv_osl_izvoz_0"/>
-			<field name="tax_src_id" ref="rrif_pdv_25"/>
-		</record>
-		<record id="account_fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
-			<field name="position_id" ref="account_fiscal_position_template_3"/>
-			<field name="tax_dest_id" ref="rrif_pdv_osl_izvoz_0"/>
-			<field name="tax_src_id" ref="rrif_pdv_25usl"/>
-		</record>
-		<record id="account_fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
-			<field name="position_id" ref="account_fiscal_position_template_3"/>
-			<field name="tax_dest_id" ref="rrif_pp_uvoz_samopdv_25"/>
+
+
+       <!-- R2 Partneri -->
+		
+		<record id="account_fiscal_position_tax_template_rrif_3" model="account.fiscal.position.tax.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_2"/>
 			<field name="tax_src_id" ref="rrif_pp_25"/>
+			<field name="tax_dest_id" ref="rrif_ppr2_25"/> 
 		</record>
-		<record id="account_fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
-			<field name="position_id" ref="account_fiscal_position_template_3"/>
-			<field name="tax_dest_id" ref="rrif_pp_uvoz_samopdv_25usl"/>
+
+		<record id="account_fiscal_position_tax_template_rrif_3" model="account.fiscal.position.tax.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_2"/>
 			<field name="tax_src_id" ref="rrif_pp_25usl"/>
+			<field name="tax_dest_id" ref="rrif_ppr2_25"/>
 		</record>
-		<record id="account_fiscal_position_account_template_2" model="account.fiscal.position.account.template">
-			<field name="position_id" ref="account_fiscal_position_template_3"/>
+
+		<record id="account_fiscal_position_account_template_rrif_1" model="account.fiscal.position.account.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_2"/>
+			<field name="account_dest_id" ref="kp_rrif2220"/>
+			<field name="account_src_id" ref="kp_rrif2200"/>
+		</record>
+
+
+       <!-- INO Partneri -->
+
+		<record id="account_fiscal_position_account_template_rrif_2" model="account.fiscal.position.account.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_3"/>
 			<field name="account_dest_id" ref="kp_rrif1210"/>
 			<field name="account_src_id" ref="kp_rrif1200"/>
 		</record>
-		<record id="account_fiscal_position_account_template_3" model="account.fiscal.position.account.template">
-			<field name="position_id" ref="account_fiscal_position_template_3"/>
+		<record id="account_fiscal_position_account_template_rrif_3" model="account.fiscal.position.account.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_3"/>
 			<field name="account_dest_id" ref="kp_rrif2210"/>
 			<field name="account_src_id" ref="kp_rrif2200"/>
 		</record>
+
+		<record id="account_fiscal_position_tax_template_rrif_4" model="account.fiscal.position.tax.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_3"/>
+			<field name="tax_src_id" ref="rrif_pdv_25"/>
+			<field name="tax_dest_id" ref="rrif_pdv_osl_izvoz_0"/>
+		</record>
+		<record id="account_fiscal_position_tax_template_rrif_5" model="account.fiscal.position.tax.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_3"/>
+			<field name="tax_src_id" ref="rrif_pdv_25usl"/>
+			<field name="tax_dest_id" ref="rrif_pdv_osl_izvoz_0"/>
+		</record>
+		
+		<record id="account_fiscal_position_tax_template_rrif_6" model="account.fiscal.position.tax.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_3"/>
+			<field name="tax_src_id" ref="rrif_pp_25"/>
+			<field name="tax_dest_id" ref="rrif_pp_uvoz_0"/>
+		</record>
+		<record id="account_fiscal_position_tax_template_rrif_7" model="account.fiscal.position.tax.template">
+			<field name="position_id" ref="account_fiscal_position_template_rrif_3"/>
+			<field name="tax_src_id" ref="rrif_pp_25usl"/>
+			<field name="tax_dest_id" ref="rrif_pp_uvoz_samopdv_25usl"/>
+		</record>
+		
 	</data>
 </openerp>
diff --git a/addons/l10n_hr/i18n/hr.po b/addons/l10n_hr/i18n/hr.po
deleted file mode 100644
index 9f7c1848ee1..00000000000
--- a/addons/l10n_hr/i18n/hr.po
+++ /dev/null
@@ -1,149 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_hr
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-20 18:16+0000\n"
-"PO-Revision-Date: 2012-03-20 18:16+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pasiva
-msgid "Pasiva"
-msgstr "Pasiva"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_aktiva
-msgid "Aktiva"
-msgstr "Aktiva"
-
-#. module: l10n_hr
-#: model:ir.actions.todo,note:l10n_hr.config_call_account_template_hr_rrif
-msgid "Generiranje kontnog plana iz predloška. Asistent će pitati za tvrtku, predložak kontnog plana, broj znamenki šifre konta, bankovne račune, valute i kreirati novi kontni plan za odabranu tvrtku.\n"
-"                  Isti čarobnjak se može pokrenuti i naknadno iz izbornika Računovodstvo/Postava/Financijsko računovodstvo/Postava nove tvrtke - podružnice"
-msgstr "Generiranje kontnog plana iz predloška. Asistent će pitati za tvrtku, predložak kontnog plana, broj znamenki šifre konta, bankovne račune, valute i kreirati novi kontni plan za odabranu tvrtku.\n"
-"                  Isti čarobnjak se može pokrenuti i naknadno iz izbornika Računovodstvo/Postava/Financijsko računovodstvo/Postava nove tvrtke - podružnice"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_view
-msgid "Sintetika"
-msgstr "Sintetika"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_inv_rashod
-msgid "Izvanredni rashodi"
-msgstr "Izvanredni rashodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pdv
-msgid "Obveze za PDV"
-msgstr "Obveze za PDV"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_other
-msgid "Ostalo"
-msgstr "Ostalo"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pas_razgran
-msgid "Pasivna vrem. Razgraničenja"
-msgstr "Pasivna vrem. Razgraničenja"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_kratk_imovina
-msgid "Kratkotrajna imovina"
-msgstr "Kratkotrajna imovina"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_upis_kapital
-msgid "Potraživanja za upisani kapital"
-msgstr "Potraživanja za upisani kapital"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_obveze_dob
-msgid "Obveze prema dobavljačima"
-msgstr "Obveze prema dobavljačima"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_kapital
-msgid "Kapital i rezerve"
-msgstr "Kapital i rezerve"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_rezervacije
-msgid "Rezerviranja"
-msgstr "Rezerviranja"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_potraz_kup
-msgid "Potraživanja od kupaca"
-msgstr "Potraživanja od kupaca"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_dug_imovina
-msgid "Dugotrajna imovina"
-msgstr "Dugotrajna imovina"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pretporez
-msgid "Potraživanja za pretporez"
-msgstr "Potraživanja za pretporez"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_prihod
-msgid "Prihod"
-msgstr "Prihod"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_fin_prihod
-msgid "Financijski prihodi"
-msgstr "Financijski prihodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_posl_rashod
-msgid "Poslovni rashodi"
-msgstr "Poslovni rashodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_dug_obv
-msgid "Dugoročne obveze"
-msgstr "Dugoročne obveze"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_rashod
-msgid "Rashod"
-msgstr "Rashod"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_posl_prihod
-msgid "Poslovni prihodi"
-msgstr "Poslovni prihodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_kratk_obveze
-msgid "Kratkoročne obveze"
-msgstr "Kratkoročne obveze"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_fin_rashod
-msgid "Financijski rashodi"
-msgstr "Financijski rashodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_izv_prihod
-msgid "Izvanredni prihodi"
-msgstr "Izvanredni prihodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_aktiv_razgran
-msgid "Aktivna vrem. Razgraničenja"
-msgstr "Aktivna vrem. Razgraničenja"
-
diff --git a/addons/l10n_hr/i18n/l10n_hr.pot b/addons/l10n_hr/i18n/l10n_hr.pot
deleted file mode 100644
index 9f7c1848ee1..00000000000
--- a/addons/l10n_hr/i18n/l10n_hr.pot
+++ /dev/null
@@ -1,149 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* l10n_hr
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-20 18:16+0000\n"
-"PO-Revision-Date: 2012-03-20 18:16+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pasiva
-msgid "Pasiva"
-msgstr "Pasiva"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_aktiva
-msgid "Aktiva"
-msgstr "Aktiva"
-
-#. module: l10n_hr
-#: model:ir.actions.todo,note:l10n_hr.config_call_account_template_hr_rrif
-msgid "Generiranje kontnog plana iz predloška. Asistent će pitati za tvrtku, predložak kontnog plana, broj znamenki šifre konta, bankovne račune, valute i kreirati novi kontni plan za odabranu tvrtku.\n"
-"                  Isti čarobnjak se može pokrenuti i naknadno iz izbornika Računovodstvo/Postava/Financijsko računovodstvo/Postava nove tvrtke - podružnice"
-msgstr "Generiranje kontnog plana iz predloška. Asistent će pitati za tvrtku, predložak kontnog plana, broj znamenki šifre konta, bankovne račune, valute i kreirati novi kontni plan za odabranu tvrtku.\n"
-"                  Isti čarobnjak se može pokrenuti i naknadno iz izbornika Računovodstvo/Postava/Financijsko računovodstvo/Postava nove tvrtke - podružnice"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_view
-msgid "Sintetika"
-msgstr "Sintetika"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_inv_rashod
-msgid "Izvanredni rashodi"
-msgstr "Izvanredni rashodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pdv
-msgid "Obveze za PDV"
-msgstr "Obveze za PDV"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_other
-msgid "Ostalo"
-msgstr "Ostalo"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pas_razgran
-msgid "Pasivna vrem. Razgraničenja"
-msgstr "Pasivna vrem. Razgraničenja"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_kratk_imovina
-msgid "Kratkotrajna imovina"
-msgstr "Kratkotrajna imovina"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_upis_kapital
-msgid "Potraživanja za upisani kapital"
-msgstr "Potraživanja za upisani kapital"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_obveze_dob
-msgid "Obveze prema dobavljačima"
-msgstr "Obveze prema dobavljačima"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_kapital
-msgid "Kapital i rezerve"
-msgstr "Kapital i rezerve"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_rezervacije
-msgid "Rezerviranja"
-msgstr "Rezerviranja"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_potraz_kup
-msgid "Potraživanja od kupaca"
-msgstr "Potraživanja od kupaca"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_dug_imovina
-msgid "Dugotrajna imovina"
-msgstr "Dugotrajna imovina"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_pretporez
-msgid "Potraživanja za pretporez"
-msgstr "Potraživanja za pretporez"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_prihod
-msgid "Prihod"
-msgstr "Prihod"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_fin_prihod
-msgid "Financijski prihodi"
-msgstr "Financijski prihodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_posl_rashod
-msgid "Poslovni rashodi"
-msgstr "Poslovni rashodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_dug_obv
-msgid "Dugoročne obveze"
-msgstr "Dugoročne obveze"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_rashod
-msgid "Rashod"
-msgstr "Rashod"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_posl_prihod
-msgid "Poslovni prihodi"
-msgstr "Poslovni prihodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_kratk_obveze
-msgid "Kratkoročne obveze"
-msgstr "Kratkoročne obveze"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_fin_rashod
-msgid "Financijski rashodi"
-msgstr "Financijski rashodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_izv_prihod
-msgid "Izvanredni prihodi"
-msgstr "Izvanredni prihodi"
-
-#. module: l10n_hr
-#: model:account.account.type,name:l10n_hr.account_type_aktiv_razgran
-msgid "Aktivna vrem. Razgraničenja"
-msgstr "Aktivna vrem. Razgraničenja"
-
diff --git a/addons/l10n_hr/l10n_hr_chart_template.xml b/addons/l10n_hr/l10n_hr_chart_template.xml
new file mode 100755
index 00000000000..5532aff9037
--- /dev/null
+++ b/addons/l10n_hr/l10n_hr_chart_template.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+		<record id="l10n_hr_chart_template_rrif" model="account.chart.template">
+			<field name="name">RRIF-ov računski plan za poduzetnike</field>
+			<field name="code_digits">0</field>
+
+			<field name="account_root_id" ref="kp_rrif" />
+			<field name="tax_code_root_id" ref="pdv_code_porezi"/>
+			<field name="bank_account_view_id"           model="account.account.template" ref="kp_rrif1000"/>
+
+			<field name="property_account_receivable"    model="account.account.template" search="[('code', '=', u'1200')]"/>
+			<field name="property_account_payable"       model="account.account.template" search="[('code', '=', u'2200')]"/>
+
+			<field name="property_account_expense_categ" model="account.account.template" search="[('code', '=', u'4199')]"/>
+			<field name="property_account_income_categ"  model="account.account.template" search="[('code', '=', u'7500')]"/>
+		</record>
+
+    </data>
+</openerp>
+
diff --git a/addons/l10n_hr/l10n_hr_wizard.xml b/addons/l10n_hr/l10n_hr_wizard.xml
old mode 100755
new mode 100644
index 1f8a8763137..b736f241607
--- a/addons/l10n_hr/l10n_hr_wizard.xml
+++ b/addons/l10n_hr/l10n_hr_wizard.xml
@@ -1,47 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-		<record id="l10n_hr_chart_template_rrif" model="account.chart.template">
-			<field name="name">RRIF-ov računski plan za poduzetnike</field>
-			<field name="code_digits">0</field>
-
-			<field name="account_root_id" ref="kp_rrif" />
-			<field name="tax_code_root_id" ref="pdv_code_porezi"/>
-			<field name="bank_account_view_id"           model="account.account.template" ref="kp_rrif1000"/>
-
-			<field name="property_account_receivable"    model="account.account.template" search="[('code', '=', u'1200')]"/>
-			<field name="property_account_payable"       model="account.account.template" search="[('code', '=', u'2200')]"/>
-
-			<field name="property_account_expense_categ" model="account.account.template" search="[('code', '=', u'4199')]"/>
-			<field name="property_account_income_categ"  model="account.account.template" search="[('code', '=', u'7500')]"/>
-
-            <!--  we want to use accounts from prod.category !!! 
-			<field name="bank_account_view_id"           model="account.account.template" search="[('code', '=', u'10000')]"/>
-	        'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
-	        'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
-			<field name="property_account_expense"  model="account.account.template" search="[('code', '=', u'750000')]"/>
-			<field name="property_account_income"  model="account.account.template" search="[('code', '=', u'750000')]"/>
-            -->
-
-            <!-- Nije mi ovo baš jasno :(  
-	        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
-			<field name="property_reserve_and_surplus_account"  model="account.account.template" search="[('code', '=', u'80400')]"/>
-            -->
-			<field name="property_reserve_and_surplus_account"  model="account.account.template" search="[('code', '=', u'8910')]"/>
-
-		</record>
-
-
-		<record id="config_call_account_template_hr_rrif" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generiranje kontnog plana iz predloška. Asistent će pitati za tvrtku, predložak kontnog plana, broj znamenki šifre konta, bankovne račune, valute i kreirati novi kontni plan za odabranu tvrtku.
-                  Isti čarobnjak se može pokrenuti i naknadno iz izbornika Računovodstvo/Postava/Financijsko računovodstvo/Postava nove tvrtke - podružnice</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-	        <field name="type">automatic</field>
-            <field name="category_id" ref="account.category_accounting_configuration"/>
-    	</record>
-
-    </data>
-</openerp>
-
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_hr/static/src/img/icon.png b/addons/l10n_hr/static/src/img/icon.png
new file mode 100644
index 00000000000..8b0db59f104
Binary files /dev/null and b/addons/l10n_hr/static/src/img/icon.png differ