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

[17.0][MIG] l10n_es_mis_report: Migration to 17.0 #3570

Merged
merged 35 commits into from
Jul 9, 2024

Conversation

mpascuall
Copy link
Contributor

@mpascuall mpascuall commented May 6, 2024

@mpascuall mpascuall force-pushed the 17.0-mig-l10n_es_mis_report branch 4 times, most recently from 3b36b0e to b4e7c4b Compare May 6, 2024 15:38
Copy link
Contributor

@peluko00 peluko00 left a comment

Choose a reason for hiding this comment

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

Works good, tested in runboat

Copy link
Contributor

@javierobcn javierobcn left a comment

Choose a reason for hiding this comment

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

Works well

test-requirements.txt Outdated Show resolved Hide resolved
@acysos acysos mentioned this pull request May 8, 2024
47 tasks
@ValentinVinagre
Copy link
Contributor

@manuelregidor @Tisho99 could u review please?

@HaraldPanten
Copy link
Contributor

/ocabot migration l10n_es_mis_report

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone May 15, 2024
@manuelregidor
Copy link
Contributor

Wouldn't it be better to put the changes related to the readme files in the module l10n_es_vat_book in an idependent commit?

Copy link
Contributor

@manuelregidor manuelregidor left a comment

Choose a reason for hiding this comment

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

Technical review. LGTM

@mpascuall mpascuall force-pushed the 17.0-mig-l10n_es_mis_report branch 2 times, most recently from ad8f7fe to 8519d41 Compare May 21, 2024 09:43
@mpascuall
Copy link
Contributor Author

Wouldn't it be better to put the changes related to the readme files in the module l10n_es_vat_book in an idependent commit?

Fixed that. Changes in l10n_es_vat_book are now deleted

@HaraldPanten
Copy link
Contributor

@mpascuall Puedes hacer rebase?

@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). 🤖

@pedrobaeza
Copy link
Member

El rebase no es correcto y hay conflictos.

JordiBForgeFlow and others added 7 commits July 9, 2024 08:38
ciertas cuentas al pasivo o activo según el signo
del saldo en lugar de llevar todo el debe y todo el haber.
For the balance sections where the sum of debtor/creditor balances is needed,
with this new expression we can get the interpreted result.
Reyes4711-S73 and others added 19 commits July 9, 2024 08:38
The account code 1146 [1] is not yet on the Spanish CoA, but it was created
due to a 2014 law [2] for a special provision case.

By chance, a mistake putting the same balance code as expression, that
inexisting account was mapped to an incorrect place.

On this commit, we remove the incorrect expression, and add a new section
under "III. Reservas" for reflecting this balance according [3].

[1] https://www.supercontable.com/informacion/Contabilidad/Cuenta_1146_Reserva_de_Capitalizacion..html
[2] https://www.supercontable.com/informacion/impuesto_sociedades/Articulo_25_Ley_27-2014-_de_27_de_noviembre-_del_.html
[3] https://www.supercontable.com/envios/articulos/BOLETIN_SUPERCONTABLE_12_2017_Contenido_General_2.htm
Currently translated at 12.1% (37 of 304 strings)

Translation: l10n-spain-15.0/l10n-spain-15.0-l10n_es_mis_report
Translate-URL: https://translation.odoo-community.org/projects/l10n-spain-15-0/l10n-spain-15-0-l10n_es_mis_report/ca/
…idas y ganancias de pymes'con nuevo formato de registro mercantil
Currently translated at 100.0% (310 of 310 strings)

Translation: l10n-spain-15.0/l10n-spain-15.0-l10n_es_mis_report
Translate-URL: https://translation.odoo-community.org/projects/l10n-spain-15-0/l10n-spain-15-0-l10n_es_mis_report/ca/
Currently translated at 10.0% (31 of 310 strings)

Translation: l10n-spain-15.0/l10n-spain-15.0-l10n_es_mis_report
Translate-URL: https://translation.odoo-community.org/projects/l10n-spain-15-0/l10n-spain-15-0-l10n_es_mis_report/es/
Currently translated at 10.3% (32 of 310 strings)

Translation: l10n-spain-16.0/l10n-spain-16.0-l10n_es_mis_report
Translate-URL: https://translation.odoo-community.org/projects/l10n-spain-16-0/l10n-spain-16-0-l10n_es_mis_report/es/
Currently translated at 100.0% (310 of 310 strings)

Translation: l10n-spain-16.0/l10n-spain-16.0-l10n_es_mis_report
Translate-URL: https://translation.odoo-community.org/projects/l10n-spain-16-0/l10n-spain-16-0-l10n_es_mis_report/es/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-spain-16.0/l10n-spain-16.0-l10n_es_mis_report
Translate-URL: https://translation.odoo-community.org/projects/l10n-spain-16-0/l10n-spain-16-0-l10n_es_mis_report/
@mpascuall mpascuall force-pushed the 17.0-mig-l10n_es_mis_report branch from 92690e3 to 301adda Compare July 9, 2024 06:46
@mpascuall mpascuall force-pushed the 17.0-mig-l10n_es_mis_report branch from 301adda to bcbe83c Compare July 9, 2024 06:55
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 17.0-ocabot-merge-pr-3570-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 554c52a into OCA:17.0 Jul 9, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 79a948f. Thanks a lot for contributing to OCA. ❤️

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.