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_facturae: Migration to 17.0 #3529

Merged
merged 122 commits into from
Jul 11, 2024

Conversation

ramiadavid
Copy link
Contributor

No description provided.

@ramiadavid ramiadavid mentioned this pull request Apr 15, 2024
47 tasks
@ramiadavid ramiadavid force-pushed the 17.0-mig-l10n_es_facturae branch 3 times, most recently from 1dbe6d0 to 3f8a2c4 Compare April 16, 2024 06:58
@ramiadavid ramiadavid marked this pull request as ready for review April 16, 2024 07:03
@ramiadavid
Copy link
Contributor Author

@etobella

He modificado la creación del .xml para que en las facturas rectificativas no de error en los test, Si puedes echarle un ojo para ver que el formato sea correcto, yo creo que si, el cambio está en los importes que están en negativo.

Si como lo he hecho está bien, en la v16 entonces también estaría mal, pero como no estaban funcionando los tests no nos hemos dado cuenta...

@etobella
Copy link
Member

@ramiadavid tras este commit 41f5fc5 creo que ya no es necesario el fix del 303

@ramiadavid
Copy link
Contributor Author

@etobella Mañana hago rebase y lo pruebo

@ramiadavid
Copy link
Contributor Author

@etobella Ya está, sin problemas

@etobella
Copy link
Member

@ramiadavid Te he hecho un PR en tu branch modificando la forma de importar los datos. Es mucho más limpio que una función harcodeando. Que opinas ramiadavid#1

@HaraldPanten
Copy link
Contributor

/ocabot migration l10n_es_facturae

@OCA-git-bot OCA-git-bot added this to the 17.0 milestone Apr 24, 2024
@ramiadavid
Copy link
Contributor Author

@etobella Lo veo bien, el tema de las facturas rectificativas has podido mirarlo?

@etobella
Copy link
Member

A ver, los tests salen bien, por lo que para mi está bien

@ramiadavid
Copy link
Contributor Author

@etobella pues entonces en la v16 está mal, porque si ejecutas los tests dan error...

Copy link
Contributor

@luisDIXMIT luisDIXMIT left a comment

Choose a reason for hiding this comment

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

Reviewed on runboat

l10n_es_facturae/readme/CONFIGURE.md Outdated Show resolved Hide resolved
l10n_es_facturae/readme/CONFIGURE.md Outdated Show resolved Hide resolved
l10n_es_facturae/readme/CONFIGURE.md Outdated Show resolved Hide resolved
denominado "Crear fichero Facturae" Podremos visualizar automáticamente
campos extra de facturación electrónica si el cliente es de facturación
electrónica. Estos campos se podrán editar a nivel de factura o de
línea. En el caso de línea, aparecera un botón con un pop-up con todo el
Copy link
Contributor

Choose a reason for hiding this comment

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

No consigo ver la funcionalidad en la que a nivel de línea se pueden editar datos de facturae. ¿Sigue activa la funcionalidad? ¿Cómo se reproduce?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

image

@etobella
Copy link
Member

etobella commented May 8, 2024

@ramiadavid Puedes mirarte los comentarios de @luisDIXMIT ?

@ramiadavid
Copy link
Contributor Author

Lo reviso este fin de semana

@etobella
Copy link
Member

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@etobella The rebase process failed, because command git rebase origin/17.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: [REF] *: Refactorización para portar a 6.0 - Paso 1.
Applying: [REF][REN][FIX] Corregimos errores en los nombres de dependencias de ciertos módulos, por los correspondientes que se modificaron para esta versión 6.0 y en ciertos __init__ adaptamos los imports a los nuevos nombres de los ficheros. Renombrado de los archivos de traducción españoles de es_ES.po a es.po y pequeñas refactorizaciones
Applying: [FIX] Renombrado de los archivos de traducción catalanas de ca_ES.po a ca.po
Applying: [IMP] Añadidos avisos NO ADAPTADO TODAVÍA A LA VERSIÓN 6.0 a varios módulos, limpieza l10n_es_partner_mercantil
Applying: Commit inicial de una rama para la versión 7.0. Todos los módulos fueron marcados como no instalables mientras no se compruebe que funcionan o migren, para poder usarlos o probarlos se debería poner el atributo installable de los ficheros __openerp__.py de cada módulo a True
Applying: [IMP] Adaptación de los import a formato v7/v8
Applying: Launchpad automatic translations update.
Applying: [IMP] Mover módulos no migrados a la carpeta __unported__.
Applying: Launchpad automatic translations update.
Applying: [FIX] Borrados archivos de idioma regenerados por Launchpad al no haber eliminado los templates.
Applying: l10n_es_facturae: Añadimos el módulo de facturae para la versión 8.0
Applying: l10n_es_facturae
Applying: l10n_es_facturae: Traducciones
Applying: l10n_es_facturae: Mejoras codificación
Applying: l10n_es_facturae
Applying: l10n_es_facturae: Se añade un post_init_hook en el módulo
Applying: l10n_es_facturae: Añadido hook para facilitar la extensión del formato, y corregido el tipo de residencia.
Applying: l10n_es_facturae: Colocamos correctamente el hook para evitar cambios de codificación si se ejecuta un parser de xml dentro.
Applying: l10n_es_facturae:corrección teléfono en wizard
Applying: l10n_es_facturae: Se permite opcionalmente registrar el cuarto nivel de los centros administrativos en el xml de facturae, el organo proponente
Applying: l10n_es_facturae:límite de caracteres a campos de contacto
Applying: l10n_es_facturae: Use base_iso3166
Applying: l10n_es_facturae: Code organization + refactoring
Applying: l10n_es_facturae: Use static selection field for payment modes
Applying: l10n_es_facturae: Add XSD validation
Applying: l10n_es_facturae: Add tests
Applying: l10n_es_facturae: Use report_xml
Applying: Fix facturae creation in test, setting some values to default elements. This makes the test pass. Fix facturae template, can't use t-set vars as context in filtered()
Applying: l10n_es_facturae: facturae report according to XSD (#10)
Applying: [MIG] l10n_es_facturae: Migration to 10.0
Applying: [MIG] l10n_es_facturae: Migration 11.0
Applying: fix error in method arguments
Applying: remove change of currency
Applying: [FIX] l10n_es_facturae: Update README install section
Applying: [FIX] Version numbers in manifest
Applying: [FIX] Facturae (11.0)  (#858)
Applying: [IMP] Set ArticleCode as default_code of the product
Applying: [FIX] IBAN should have no spaces on Facturae
Applying: [FIX] l10n_es_facturae: Error on zip field (#954)
Applying: [IMP] l10n_es_facturae: Añadir name a la página
Applying: [FIX] l10n_es_facturae: empty string uri must be present
Applying: [IMP] l10n_es_facturae: Include min version for xmlsig
Applying: [FIX] l10n_es_facturae: Hash del método de firma (#1071)
Applying: [IMP] l0n_es_facturae: Use account provided by account_payment_partner
Applying: [ADD] l10n_es_facturae_fields
Applying: [FIX] facturae: Elimina el default_type del contexto
Applying: [11.0][FIX] l10n_es_facturae: Add security group for partner view
Applying: [MIG] l10n_es_facturae: Migration to 12.0
Applying: [FIX] l10n_es_facturae: Ignore notes
Applying: [FIX] l10n_es_facturae: Update spec PDF link
Applying: [UPD] Remove deprecated from_string()
Applying: [FIX] l10n_es_facturae: Handle other price unit digits different from 2
Applying: [FIX]l10n_es_facturae: Correcciones en tests.
Applying: [FIX+IMP] l10n_es_facturae: avoid error with mode == 'modify'  + don't write several times
Applying: [IMP] l10n_es_facturae: Use same bank fetch criteria in both debited/credited
Applying: [IMP] l10n_es_facturae: Don't hard depend on partner_firstname
Applying: [12.0][FIX] Double button box
Applying: [FIX] l10n_es_facturae: Don't check taxes in sections/notes
Applying: [IMP] facturae: Allow to use versions
Applying: [IMP] l10n_es_facturae: black, isort, prettier
Applying: [13.0][MIG] l10n_es_facturae
Applying: [IMP] facturae attach as annex
Applying: [IMP] Facturae: Add integration issue field
Applying: [IMP] l10n_es_facturae: Integration with edi_account
Applying: Changed X590SerialNumber to string to avoid error with large numbers
Applying: [FIX] l10n_es_facturae: Fix components names using the new logic
Applying: [FIX] facturae: Change of function mame on edi
Applying: [FIX] l10n_es_facturae: improve calculation of TotalCost
Applying: [IMP] l10n_es_facturae: black, isort, prettier
Applying: [MIG] l10n_es_facturae: migration to 14.0
Applying: [FIX] facturae: tests where failing due to changes on bank-payment
Applying: [FIX] l10n_es_facture: Fixing defintition of the exchange type
Applying: [IMP] l10n_es_facturae: Fix on tax calculation
Applying: [IMP] l10n_es_facturae: Use queue
Applying: [IMP] l10n_es_facturae: Add disable_edi_auto configuration
Applying: [IMP] l10n_es_facturae: Add a menu for adding attachments on Facturae
Applying: [IMP] l10n_es_facturae: Don't mask library imports
Applying: [FIX] l10n_es_facturae: Missing external library
Applying: [IMP] l10n_es_facturae: Add thirdparty fields to allow inheritance in other addons.
Applying: [IMP] l10n_es_facturae: Hide thirdparty fields in some cases:
Applying: [FIX] l10n_es_facturae: Duplicated third party fields
Applying: [REF] l10n_es_facturae: Remove edi dependancy
Applying: [MIG] l10n_es_facturae: Migration to 15.0
Applying: [15.0][FIX] l10n_es_facturae: changes the way the 'inbound_payment_method_line_ids' is entered in the journal in the tests.
Applying: [IMP] l10n_es_facturae: Add maintainer
Applying: [FIX] l10n_es_facturae: obtener certificados con sudo.
Applying: [FIX] l10n_es_facturae: Passar como al contado si es necesaria cuenta y no tenemos
Applying: [IMP] l10n_es_facturae: Avoid spam in the test logs
Applying: [FIX] l10n_es_facturae: Fill InvoiceDescription with plain text
Applying: [FIX] l10n_es_facturae: typo in string
Applying: [FIX] l10n_es_*: remove pyOpenSSL and cryptography dependencies
Applying: [IMP] l10n_es_facturae: Allow to use invoice addresses
Applying: [IMP] l10n_es_facturae: Fix cryptography dependancy
Applying: [FIX] l10n_es_facturae: Remove `thirdparty_invoice` field from l10n_es_facturae
Applying: [FIX] l10n_es_facturae: Remove thirdparty_invoice + thirdparty_number field from l10n_es_facturae
Applying: [IMP] l10n_es_facturae: Show facturae data on invoice childs
Applying: [FIX] l10n_es_facturae: The "global" tax calculation rounding method is always used to compute the tax amounts even if the company has the tax rounding method set to "per line"
Applying: [MIG] l10n_es_facturae: Migration to 16.0
Applying: [IMP] l10n_es_facturae: Improve test case to allow inheritance with only base setup
Applying: [FIX] l10n_es_facturae: The old parent view is still being inherited
Applying: [FIX] *: Linter fixes
Applying: [FIX] l10n_es_facturae: Remove warnings
Applying: [FIX] l10n_es_facturae: Add missing templates map
Applying: [IMP] l10n_es_facturae: Rename parent_facturae field
Applying: [IMP] l10n_es_facturae: Add new fields
Applying: [IMP] l10n_es_facturae: improvements validation facturae
Applying: [FIX] l10n_es_facturae: Might be possible to generate facturae report on non facturae customers
Applying: [15.0][FIX] l10n_es_facturae: out_refund invoice file
Applying: [FIX] l10n_es_facturae: Facturae field visibility for all the childrens
Applying: [[16.0][FIX] l10n_es_facturae: Precio unitario
Applying: [FIX] l10n_es_facturae: Allow invoicing users to set Facturae
Applying: [FIX] l10n_es_facturae: Remove attributes from group
Applying: [FIX] l10n_es_aeat,l10n_es_facturae,l10n_es_facturae_face: pin cryptograhy library version
Applying: [IMP] l10n_es_facturae: Fix addition of invoice PDF by adding encoding
Applying: [16.0][IMP]l10n_es_facturae: add facturae_hide_discount option
Applying: [16.0][IMP] l10n_es_facturae: Change facturae to commercial field
Applying: [IMP] l10n_es_facturae: Allow to add extensions
Applying: [IMP] l10n_es_facturae: Make it work for physical people
Applying: [16.0][FIX] l10n_es_facturae: correct parameters in migrate method
Applying: [IMP] l10n_es_facturae: pre-commit auto fixes
Using index info to reconstruct a base tree...
M	requirements.txt
Falling back to patching base and 3-way merge...
Auto-merging requirements.txt
CONFLICT (content): Merge conflict in requirements.txt
Removing l10n_es_facturae/readme/USAGE.rst
Removing l10n_es_facturae/readme/ROADMAP.rst
Removing l10n_es_facturae/readme/INSTALL.rst
Removing l10n_es_facturae/readme/HISTORY.rst
Removing l10n_es_facturae/readme/DESCRIPTION.rst
Removing l10n_es_facturae/readme/CONTRIBUTORS.rst
Removing l10n_es_facturae/readme/CONFIGURE.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0120 [IMP] l10n_es_facturae: pre-commit auto fixes
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

@etobella
Copy link
Member

@ramiadavid puedes hacer el rebase manual 🙏

Es para poder hacer una última review y mergear ya, que este PR se está enquistando sinó.

@ramiadavid
Copy link
Contributor Author

Mañana lo reviso

Copy link
Member

@etobella etobella left a comment

Choose a reason for hiding this comment

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

Technically seems OK

l10n_es_facturae/models/account_move_line.py Outdated Show resolved Hide resolved
l10n_es_facturae/readme/CONFIGURE.md Outdated Show resolved Hide resolved
l10n_es_facturae/views/report_facturae.xml Show resolved Hide resolved
l10n_es_facturae/views/report_facturae.xml Outdated Show resolved Hide resolved
l10n_es_facturae/views/report_facturae.xml Outdated Show resolved Hide resolved
l10n_es_facturae/hooks.py Outdated Show resolved Hide resolved
@etobella
Copy link
Member

/ocabot rebase

polqubiq and others added 15 commits June 28, 2024 19:49
Mostrar los importes en negativo al generar el fichero facturae de facturas rectificativas
You can invoice to any contact, so there's no reason to hide Facturae
fields for childrens that are not invoice addresses.

TT45821
Se corrige el problema de generar el archivo xsig cuando alguno de los impuestos es con precio incluido que la administración lo rechaza
As it was, only accountant users can set Facturae check, as the field
was inside a group with such restriction. It doesn't matter that the
field itself has another less restricting group.

Thus, we put the initial check in the same group as the rest, and
move the visibility attributes to each field.

TT47097
It was transferred to each field, but forgotten to be removed on the
group.

TT47203
…grahy library version

We want to avoid the installation of newer versions that might be incompatible with odoo
@ramiadavid ramiadavid force-pushed the 17.0-mig-l10n_es_facturae branch 2 times, most recently from d83036b to 05fed02 Compare June 28, 2024 17:54
@Garcicasti
Copy link

Buenos días compañeros!
@pedrobaeza cuando tengas un momento, podrías confirmar por favor si ves bien este PR? Creo que los cambios que solicitaste en tu review se pueden marcar como completados 👍

Gracias!

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.

OK, faltaría algún docstring como indiqué en los comentarios anteriores, pero no bloqueemos más la fusión:

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 17.0-ocabot-merge-pr-3529-by-pedrobaeza-bump-nobump, awaiting test results.

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

@OCA-git-bot OCA-git-bot merged commit 1d93944 into OCA:17.0 Jul 11, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at edd0aa7. 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.