diff --git a/addons/l10n_hr/data/account.tax.template.csv b/addons/l10n_hr/data/account.tax.template.csv
index 2579ffc1071..ce3deac1f90 100644
--- a/addons/l10n_hr/data/account.tax.template.csv
+++ b/addons/l10n_hr/data/account.tax.template.csv
@@ -28,15 +28,15 @@ rrif_pp_ino_10,Plaćeni PDV 10% na usluge inozemnih poduzetnika,l10n_hr_chart_te
rrif_ppr2_25,25% R-2 dobavljač,l10n_hr_chart_template_rrif,25% R-2 dobavljač,25,percent,purchase,100,kp_rrif1409,kp_rrif1409,tax_tag_33,
rrif_pp_uvoz_samopdv_25,Samo PDV kod uvoza 25%,l10n_hr_chart_template_rrif,Samo PDV kod uvoza 25%,25,percent,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_32,
rrif_pp_uvoz_samopdv_25usl,Samo PDV kod uvoza 25% usluge,l10n_hr_chart_template_rrif,Samo PDV kod uvoza 25% usluge,25,percent,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_29,
-rrif_ppdnp1_3070_70_3,pp 70% priz.(25%),l10n_hr_chart_template_rrif,Pp 70% priz.(25%),17.5,percent,none,100,kp_rrif14002,kp_rrif14002,,
-rrif_ppdnp1_3070_30_3,pp 30% nep.(25%),l10n_hr_chart_template_rrif,pp 30% nep.(25%),7.5,percent,none,100,kp_rrif4199,kp_rrif4199,,
-rrif_ppdnp1_3070_1,pp 30% Nepriznat 70% Priznat,l10n_hr_chart_template_rrif,pp 30% Nepriznat 70% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_21,"rrif_ppdnp1_3070_70_3,rrif_ppdnp1_3070_30_3"
-rrif_ppdnp1_7030_30_3,Pp 30% priz.(25%),l10n_hr_chart_template_rrif,Pp 30% priz.(25%),7.5,percent,none,100,kp_rrif14002,kp_rrif14002,,
-rrif_ppdnp1_7030_70_3,Pp 70% nep.(25%),l10n_hr_chart_template_rrif,Pp 70% nep.(25%),17.5,percent,none,100,kp_rrif4199,kp_rrif4199,,
+rrif_ppdnp1_3070_30_3,pp 30% nep.(25%),l10n_hr_chart_template_rrif,pp 30% nep.(25%),7.5,percent,none,100,kp_rrif4199,kp_rrif4199,tax_tag_21_1,
+rrif_ppdnp1_3070_70_3,pp 70% priz.(25%),l10n_hr_chart_template_rrif,Pp 70% priz.(25%),17.5,percent,none,100,kp_rrif14002,kp_rrif14002,tax_tag_21_2,
+rrif_ppdnp1_3070_1,pp 30% Nepriznat 70% Priznat,l10n_hr_chart_template_rrif,pp 30% Nepriznat 70% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_21,"rrif_ppdnp1_3070_30_3,rrif_ppdnp1_3070_70_3"
+rrif_ppdnp1_7030_70_3,Pp 70% nep.(25%),l10n_hr_chart_template_rrif,Pp 70% nep.(25%),17.5,percent,none,100,kp_rrif4199,kp_rrif4199,tax_tag_20_1,
+rrif_ppdnp1_7030_30_3,Pp 30% priz.(25%),l10n_hr_chart_template_rrif,Pp 30% priz.(25%),7.5,percent,none,100,kp_rrif14002,kp_rrif14002,tax_tag_20_2,
rrif_ppdnp1_7030_1,pp 70% Nepriznat 30% Priznat,l10n_hr_chart_template_rrif,pp 70% Nepriznat 30% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_20,"rrif_ppdnp1_7030_70_3,rrif_ppdnp1_7030_30_3"
-rrif_ppdnp1_3070_70_3_r2,R2 pp 70% priz.(25%),l10n_hr_chart_template_rrif,R2 pp 70% priz.(25%),17.5,percent,none,100,kp_rrif1408,kp_rrif1408,,
-rrif_ppdnp1_3070_30_3_r2,R2 pp 30% nep.(25%),l10n_hr_chart_template_rrif,R2 pp 30% nep.(25%),7.5,percent,none,100,kp_rrif4199,kp_rrif4199,,
-rrif_ppdnp1_3070_1_r2,R2 pp 30% Nepriznat 70% Priznat,l10n_hr_chart_template_rrif,R2 pp 30% Nepriznat 70% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_30,"rrif_ppdnp1_3070_70_3_r2,rrif_ppdnp1_3070_30_3_r2"
-rrif_ppdnp1_7030_30_3_r2,R2 Pp 30% priz.(25%),l10n_hr_chart_template_rrif,R2 Pp 30% priz.(25%),7.5,percent,none,100,kp_rrif1408,kp_rrif1408,,
-rrif_ppdnp1_7030_70_3_r2,R2 Pp 70% nep.(25%),l10n_hr_chart_template_rrif,R2 Pp 70% nep.(25%),17.5,percent,none,100,kp_rrif4199,kp_rrif4199,,
-rrif_ppdnp1_7030_1_r2,R2 pp 70% Nepriznat 30% Priznat,l10n_hr_chart_template_rrif,R2 pp 70% Nepriznat 30% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_31,"rrif_ppdnp1_7030_30_3_r2,rrif_ppdnp1_7030_70_3_r2"
+rrif_ppdnp1_3070_30_3_r2,R2 pp 30% nep.(25%),l10n_hr_chart_template_rrif,R2 pp 30% nep.(25%),7.5,percent,none,100,kp_rrif4199,kp_rrif4199,tax_tag_30_1,
+rrif_ppdnp1_3070_70_3_r2,R2 pp 70% priz.(25%),l10n_hr_chart_template_rrif,R2 pp 70% priz.(25%),17.5,percent,none,100,kp_rrif1408,kp_rrif1408,tax_tag_30_2,
+rrif_ppdnp1_3070_1_r2,R2 pp 30% Nepriznat 70% Priznat,l10n_hr_chart_template_rrif,R2 pp 30% Nepriznat 70% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_30,"rrif_ppdnp1_3070_30_3_r2,rrif_ppdnp1_3070_70_3_r2"
+rrif_ppdnp1_7030_70_3_r2,R2 Pp 70% nep.(25%),l10n_hr_chart_template_rrif,R2 Pp 70% nep.(25%),17.5,percent,none,100,kp_rrif4199,kp_rrif4199,tax_tag_31_1,
+rrif_ppdnp1_7030_30_3_r2,R2 Pp 30% priz.(25%),l10n_hr_chart_template_rrif,R2 Pp 30% priz.(25%),7.5,percent,none,100,kp_rrif1408,kp_rrif1408,tax_tag_31_2,
+rrif_ppdnp1_7030_1_r2,R2 pp 70% Nepriznat 30% Priznat,l10n_hr_chart_template_rrif,R2 pp 70% Nepriznat 30% Priznat,100,group,purchase,100,kp_rrif4199,kp_rrif4199,tax_tag_31,"rrif_ppdnp1_7030_70_3_r2,rrif_ppdnp1_7030_30_3_r2"
diff --git a/addons/l10n_hr/data/account_chart_tag.xml b/addons/l10n_hr/data/account_chart_tag.xml
index a2877d94839..63d192e500f 100644
--- a/addons/l10n_hr/data/account_chart_tag.xml
+++ b/addons/l10n_hr/data/account_chart_tag.xml
@@ -95,10 +95,26 @@
pp 70% Nepriznat 30% Priznat
taxes
+
+ Pp 30% priz.(25%)
+ taxes
+
+
+ Pp 70% nep.(25%)
+ taxes
+
pp 30% Nepriznat 70% Priznat
taxes
+
+ pp 30% nep.(25%)
+ taxes
+
+
+ pp 70% priz.(25%)
+ taxes
+
Plaćeni PDV 25% pri uvozu dobara
taxes
@@ -135,10 +151,26 @@
R2 pp 30% Nepriznat 70% Priznat
taxes
+
+ R2 pp 30% nep.(25%)
+ taxes
+
+
+ R2 pp 70% priz.(25%)
+ taxes
+
R2 pp 70% Nepriznat 30% Priznat
taxes
+
+ R2 Pp 70% nep.(25%)
+ taxes
+
+
+ R2 Pp 30% priz.(25%)
+ taxes
+
Samo PDV kod uvoza 25%
taxes