Skip to content

Commit

Permalink
[FIX] l10n_es_aeat_mod390: Missing fields 60 and 61
Browse files Browse the repository at this point in the history
The 12% VAT for agriculture et al. were missing in the mapping and the
sum, so we need to include it as the tax is present and it's declared
in the 303 model.
  • Loading branch information
pedrobaeza committed Jan 30, 2025
1 parent 7a3dc10 commit 16ecf9f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ aeat_mod390_2024_sub04_export_line_30,"right","True",,,,"2","aeat_mod390_2024_su
aeat_mod390_2024_sub04_export_line_31,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float","${object.tax_line_ids.filtered(lambda r: r.field_number == 638).amount}",,"5. Operaciones Reg. Gral. - IVA deducible - Adqui. intra. servicios - Tipo 21% - Cuota [638]","31","17",
aeat_mod390_2024_sub04_export_line_32,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float","${object.casilla_597}",,"5. Operaciones Reg. Gral. - IVA deducible - Total adqui. intra. servicios - Base imponible [597]","32","17",
aeat_mod390_2024_sub04_export_line_33,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float","${object.casilla_598}",,"5. Operaciones Reg. Gral. - IVA deducible - Total adqui. intra. servicios - Cuota [598]","33","17",
aeat_mod390_2024_sub04_export_line_34,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float",,"0","5. Operaciones Reg. Gral. - IVA deducible - Compensac. rég. especial agric./ganad./pesca - Base impon. [60]","34","17",
aeat_mod390_2024_sub04_export_line_35,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float",,"0","5. Operaciones Reg. Gral. - IVA deducible - Compensac. rég. especial agric./ganad./pesca - Cuota deduc. [61]","35","17",
aeat_mod390_2024_sub04_export_line_34,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float","${object.tax_line_ids.filtered(lambda r: r.field_number == 60).amount}",,"5. Operaciones Reg. Gral. - IVA deducible - Compensac. rég. especial agric./ganad./pesca - Base impon. [60]","34","17",
aeat_mod390_2024_sub04_export_line_35,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float","${object.tax_line_ids.filtered(lambda r: r.field_number == 61).amount}",,"5. Operaciones Reg. Gral. - IVA deducible - Compensac. rég. especial agric./ganad./pesca - Cuota deduc. [61]","35","17",
aeat_mod390_2024_sub04_export_line_36,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float",,"0","5. Operaciones Reg. Gral. - IVA deducible - Cuotas deducibles en virtud de resolución administrativa o sentencia firmes con tipos no vigentes - Base impon. [660]","36","17",
aeat_mod390_2024_sub04_export_line_37,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float",,"0","5. Operaciones Reg. Gral. - IVA deducible - Cuotas deducibles en virtud de resolución administrativa o sentencia firmes con tipos no vigentes - Cuota deduc. [661]","37","17",
aeat_mod390_2024_sub04_export_line_38,"right","True",,,,"2","aeat_mod390_2024_sub04_export_config","float","${object.tax_line_ids.filtered(lambda r: r.field_number == 639).amount}",,"5. Operaciones Reg. Gral. - IVA deducible - Rectificación de deducciones - Base imponible [639]","38","17",
Expand Down
2 changes: 2 additions & 0 deletions l10n_es_aeat_mod390/data/2024/l10n.es.aeat.map.tax.line.csv
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ aeat_mod390_2024_map_line_035,,"35","base","False","aeat_mod390_2024_map","regul
aeat_mod390_2024_map_line_036,,"36","amount","False","aeat_mod390_2024_map","regular","Recargo de equivalencia - Cuota 0,5%","both","s_req05"
aeat_mod390_2024_map_line_043,,"43","base","False","aeat_mod390_2024_map","refund","Modificación recargo equivalencia - Base","both","s_req0,s_req026,s_req05,s_req062,s_req1,s_req014,s_req52"
aeat_mod390_2024_map_line_044,,"44","amount","False","aeat_mod390_2024_map","refund","Modificación recargo equivalencia - Cuota","both","s_req0,s_req026,s_req05,s_req062,s_req1,s_req014,s_req52"
aeat_mod390_2024_map_line_060,,"60","base","True","aeat_mod390_2024_map","regular","Compensac. rég. especial agric./ganad./pesca - Base","both","p_iva12_agr"
aeat_mod390_2024_map_line_061,,"61","amount","True","aeat_mod390_2024_map","regular","Compensac. rég. especial agric./ganad./pesca - Cuota","both","p_iva12_agr"
aeat_mod390_2024_map_line_062,"common_472","62","amount","True","aeat_mod390_2024_map","refund","Rectificación de deducciones - Cuota","both","p_req026,p_req05,p_req062,p_req1,p_req014,p_req52,p_iva0_s_bc,p_iva2_bc,p_iva2_sc,p_iva4_bc,p_iva4_sc,p_iva5_bc,p_iva5_sc,p_iva7-5_bc,p_iva7-5_sc,p_iva4_bi,p_iva4_ibc,p_iva4_ibi,p_iva0_ic_bc,p_iva2_ic_bc,p_iva4_ic_bc,p_iva5_ic_bc,p_iva7-5_ic_bc,p_iva4_ic_bi,p_iva0_isc,p_iva2_isc,p_iva4_sp_in,p_iva5_isc,p_iva7-5_isc,p_iva4_sp_ex,p_iva0_s_sc,p_iva10_bc,p_iva10_sc,p_iva10_bi,p_iva10_ibc,p_iva10_ibi,p_iva10_ic_bc,p_iva10_ic_bi,p_iva10_sp_in,p_iva10_sp_ex,p_iva10_isp,p_iva21_bc,p_iva21_sc,p_iva21_bi,p_iva21_ibc,p_iva21_ibi,p_iva21_ic_bc,p_iva21_ic_bi,p_iva21_sp_in,p_iva21_sp_ex,p_iva21_isp,p_iva0_ic_sc,p_iva2_ic_sc,p_iva4_isp,p_iva5_ic_sc,p_iva7-5_ic_sc,p_iva10_isp,p_iva21_isp,p_iva4_isp_bi,p_iva10_isp_bi,p_iva21_isp_bi"
aeat_mod390_2024_map_line_099,,"99","base","False","aeat_mod390_2024_map","all","Volumen de operaciones","both","s_iva21b,s_iva21s,s_iva10b,s_iva10s,s_iva7-5b,s_iva7-5s,s_iva5b,s_iva5s,s_iva4b,s_iva4s,s_iva2b,s_iva2s,s_iva0b,s_iva0s"
aeat_mod390_2024_map_line_103,,"103","base","False","aeat_mod390_2024_map","all","Entregas intracomunitarias exentas","both","s_iva0_ic,s_iva0_sp_i"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ p_iva5_isc,account_tax_template_p_iva5_isc
p_iva7-5_isc,account_tax_template_p_iva7-5_isc
p_iva0_s_bc,account_tax_template_p_iva0_s_bc
p_iva0_s_sc,account_tax_template_p_iva0_s_sc
p_iva12_agr,account_tax_template_p_iva12_agr
6 changes: 3 additions & 3 deletions l10n_es_aeat_mod390/models/mod390.py
Original file line number Diff line number Diff line change
Expand Up @@ -679,9 +679,9 @@ def _compute_casilla_64(self):
+ report.casilla_59
+ report.casilla_598
+ sum(
report.tax_line_ids.filtered(lambda x: x.field_number == 62).mapped(
"amount"
)
report.tax_line_ids.filtered(
lambda x: x.field_number in (61, 62)
).mapped("amount")
)
)

Expand Down

0 comments on commit 16ecf9f

Please sign in to comment.