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

[16.0][MIG] l10n_es_facturae: Migration to 16.0 #2707

Merged
merged 105 commits into from
Jun 7, 2023

Conversation

ramiadavid
Copy link
Contributor

@ramiadavid ramiadavid commented Dec 24, 2022

@pedrobaeza
Copy link
Member

Nombre del PR incorrecto.

@ramiadavid ramiadavid marked this pull request as ready for review December 24, 2022 15:30
@ramiadavid ramiadavid changed the title [16.0][MIG] report_qr: Migration to 16.0 [16.0][MIG] l10n_es_facturae: Migration to 16.0 Dec 24, 2022
@ramiadavid ramiadavid mentioned this pull request Dec 24, 2022
54 tasks
@ramiadavid
Copy link
Contributor Author

@pedrobaeza Ya me he dado cuenta, ya está modificado.

@ramiadavid ramiadavid force-pushed the 16.0-mig-l10n_es_facturae branch 7 times, most recently from b30b6dd to d85c6e5 Compare January 2, 2023 14:57
@pedrobaeza
Copy link
Member

/ocabot migration l10n_es_facturae

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Feb 9, 2023
@etobella
Copy link
Member

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@etobella The rebase process failed, because command git rebase origin/16.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: Translated using Weblate (Spanish)
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: Translated using Weblate (Catalan)
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: Translated using Weblate (Spanish)
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: Translated using Weblate (Catalan)
Applying: Translated using Weblate (Spanish)
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: Translated using Weblate (Spanish)
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: pre-commit stuff
.git/rebase-apply/patch:25: trailing whitespace.
import setuptools
.git/rebase-apply/patch:26: trailing whitespace.

.git/rebase-apply/patch:27: trailing whitespace.
setuptools.setup(
.git/rebase-apply/patch:28: trailing whitespace.
    setup_requires=['setuptools-odoo'],
.git/rebase-apply/patch:29: trailing whitespace.
    odoo_addon=True,
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	requirements.txt
Falling back to patching base and 3-way merge...
Auto-merging requirements.txt
Applying: [MIG] l10n_es_facturae: Migration to 16.0
Applying: [TO RMV] add test dependency
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in test-requirements.txt
Auto-merging test-requirements.txt
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0104 [TO RMV] add test dependency
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 Can you rebase it? it is failing due to test-requirements

Borja L.S and others added 11 commits May 11, 2023 16:45
- Se han renombrado los módulos para usar la nomenclatura propuesta
  por OpenERP: l10n_es para el módulo base de localización (plan de
  cuentas), l10n_es_* para el resto de módulos.

- Se eliminan los módulos extra_addons/* que deberían moverse a
  los extra-addons genéricos (no son específicos de España).

- Se renombran los __terp__.py por __openerp__.py
…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
…ron 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
[FIX] l10n_es_lopd: Nombre de categoría con tilde, que da error al importar el repositorio entero.
@etobella
Copy link
Member

Exactamente en lo del código postal

@ramiadavid
Copy link
Contributor Author

@extrememicro Rectifico, tienes razón, el xml no lo está generando correctamente, ya lo modifico y lo subo

@extrememicro
Copy link
Contributor

Gracias @ramiadavid . Lo del código postal lo dejamos para un fix posterior que me apunto para hacer en los Oca days.

@ramiadavid ramiadavid force-pushed the 16.0-mig-l10n_es_facturae branch 3 times, most recently from f5cf461 to 2eab71d Compare May 25, 2023 19:57
@ramiadavid
Copy link
Contributor Author

@extrememicro Creo que ya está correcto

Copy link
Contributor

@extrememicro extrememicro left a comment

Choose a reason for hiding this comment

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

@ramiadavid
Genera el xml firmado pero si seleccionas que anexe el pdf al mismo en res.partner da error:

  File "/mnt/data/odoo-addons-dir/l10n_es_facturae/models/account_move.py", line 177, in _get_facturae_move_attachments
    content, content_type = action._render(self.ids)
TypeError: IrActionsReport._render() missing 1 required positional argument: 'res_ids'

Copy link
Contributor

@extrememicro extrememicro left a comment

Choose a reason for hiding this comment

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

@ramiadavid
Faltarían estos pequeños cambios. Gracias

l10n_es_facturae/views/report_facturae.xml 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
@extrememicro
Copy link
Contributor

@etobella LGTM!

Copy link

@navarrorico navarrorico left a comment

Choose a reason for hiding this comment

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

LGTM

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.

LGTM Probado en runboat

Copy link
Contributor

@extrememicro extrememicro left a comment

Choose a reason for hiding this comment

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

@etobella gracias. Ya le puedes hacer merge. Aprové los cambios.

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

@etobella
Copy link
Member

etobella commented Jun 7, 2023

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-2707-by-etobella-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 7, 2023
Signed-off-by etobella
@OCA-git-bot
Copy link
Contributor

It looks like something changed on 16.0 in the meantime.
Let me try again (no action is required from you).
Prepared branch 16.0-ocabot-merge-pr-2707-by-etobella-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 8899f3f into OCA:16.0 Jun 7, 2023
@OCA-git-bot
Copy link
Contributor

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