search

OCA / l10n-italy

Odoo Italian localization
https://www.odoo-italia.org
GNU Affero General Public License v3.0
149 stars 303 forks source link

[16.0] new module l10n_it_fatturapa_out_dn #4054

Open TheMule71 opened 6 months ago

TheMule71 commented 6 months ago

Fixes #4005

Modulo di collegamento tra l10n_it_fatturapa_out e l10n_it_delivery_note vd. anche #2202

francesco-ooops commented 2 months ago

/ocabot rebase

OCA-git-bot commented 2 months ago

@francesco-ooops The rebase process failed, because command git rebase origin/16.0 failed with output:

Rebasing (1/2)
Auto-merging l10n_it_fatturapa_out/data/invoice_it_template.xml
CONFLICT (content): Merge conflict in l10n_it_fatturapa_out/data/invoice_it_template.xml
error: could not apply 05ae68b5a... [REF] l10n_it_fatturapa_out: Allow to exclude lines from e-invoice
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 05ae68b5a... [REF] l10n_it_fatturapa_out: Allow to exclude lines from e-invoice
francesco-ooops commented 1 month ago

@TheMule71 puoi fare rebase?