Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[15.0][IMP] l10n_es_aeat_mod_303: Arrastrar cuotas a compensar #3395

Conversation

EmilioPascual
Copy link
Contributor

@EmilioPascual EmilioPascual commented Jan 24, 2024

La casilla 110 es la suma de la casilla 110 y la casilla 71 del modelo anterior si fue a compensar.
La casilla 78 es cero cuando la casilla 71 sale 0 y si no, la casilla 78 es el importe mínimo de las casillas 110 y 71. (Sólo se puede compensar hasta el importe del resultado).
Añadido campo para poder marcar la devolucion o no en el último período del año, ya que debe ser opcional y si no se compensa, se arrastrará al primer período del próximo año.

Issue: #3347

@ArantxaSudon @loida-vm @rafaelbn @pedrobaeza por favor revisar.

@moduon MT-4885

@OCA-git-bot
Copy link
Contributor

Hi @pedrobaeza,
some modules you are maintaining are being modified, check this out!

@EmilioPascual EmilioPascual changed the title [15.0][IMP l10n_es_aeat_mod_303: Arrastrar cuotas a compensar [15.0][IMP] l10n_es_aeat_mod_303: Arrastrar cuotas a compensar Jan 24, 2024
Copy link
Member

@rafaelbn rafaelbn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probado, perfecto 👍🏼

@@ -1060,36 +1059,3 @@ msgstr "¿SII voluntario?"
#: model:ir.model.fields,field_description:l10n_es_aeat_mod303.field_l10n_es_aeat_mod303_report__has_operation_volume
msgid "¿Volumen de operaciones?"
msgstr "¿Volumen de operaciones?"

#~ msgid "Number of messages which requires an action"
Copy link
Member

@yajo yajo Jan 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Este msgid estaba duplicando otro encontrado en la línea 707.

Estas son traducciones obsoletas, que puede eliminar con POEdit automáticamente usando esta opción:

imagen

Tomemos nota para añadirlo a nuestra memoria muscular, para hacerlo siempre antes de guardar un nuevo fichero de traducción. De lo contrario, si estos duplicados se cuelan, podemos chocar con odoo/odoo#32801 mientras instalamos/actualizamos el módulo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

¡Gracias!

@carlosdauden
Copy link
Contributor

Ping @sergio-teruel
moduon#2

Copy link
Contributor

@sergio-teruel sergio-teruel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probado y OK

¿Podéis echar un vistazo a los test?

@EmilioPascual
Copy link
Contributor Author

Los tests están fallando por el módulo de envío al FACE, https://github.com/OCA/l10n-spain/actions/runs/7641137970/job/20817781113?pr=3395#step:8:1285
Las modificaciones de este PR no justifican esos fallos.
Se puede hacer merge.
@sergio-teruel @carlosdauden

@carlosdauden
Copy link
Contributor

Resolve conflicts and merge

EmilioPascual and others added 2 commits April 15, 2024 07:57
Calculate potential_cuota_compensar with sum 110 and 71 of the previous report

@moduon MT-4519

Co-authored-by: Arantxa Sudón <[email protected]>
Co-authored-by: Loida Vilaplana <[email protected]>
Co-authored-by: Rafael Blasco <[email protected]>
@EmilioPascual EmilioPascual force-pushed the 15.0-l10n_es_aeat_mod_303-calculo_cuota_compensar branch from 293bd17 to 28a6a96 Compare April 15, 2024 05:59
This file had duplicates and was hitting odoo/odoo#32801 (comment).

@moduon MT-4885

s
@EmilioPascual EmilioPascual force-pushed the 15.0-l10n_es_aeat_mod_303-calculo_cuota_compensar branch from 28a6a96 to 05ec20f Compare April 15, 2024 07:31
@EmilioPascual
Copy link
Contributor Author

Resolve conflicts and merge

Resolved conflicts.

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@yajo
Copy link
Member

yajo commented Apr 15, 2024

@EmilioPascual it seems something weird happened in the rebase. Check out this commit: 05ec20f

@EmilioPascual EmilioPascual force-pushed the 15.0-l10n_es_aeat_mod_303-calculo_cuota_compensar branch from 05ec20f to 2750380 Compare April 15, 2024 08:46
@yajo
Copy link
Member

yajo commented Apr 15, 2024

@pedrobaeza ¿falta algo para poder fusionar aquí?

@EmilioPascual
Copy link
Contributor Author

Cierro PR. Se gestionó en #3613

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants