search

OCA / l10n-italy

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

[16.0][FW]l10n_it_delivery_note: fw-porting of 3242 + required commits #4146

Open PicchiSeba opened 4 months ago

PicchiSeba commented 4 months ago

Forward-port of #3242

OCA-git-bot commented 4 months ago

Hi @aleuffre, @renda-dev, @MarcoCalcagni, some modules you are maintaining are being modified, check this out!

francesco-ooops commented 4 months ago

@sergiocorato che ne pensi?

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/4)
Auto-merging l10n_it_delivery_note/models/account_invoice.py
Auto-merging l10n_it_delivery_note/wizard/delivery_note_invoice.py
CONFLICT (content): Merge conflict in l10n_it_delivery_note/wizard/delivery_note_invoice.py
error: could not apply 4ed3af6fb... [FIX] port from 12.0 (#13)
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 4ed3af6fb... [FIX] port from 12.0 (#13)
aleuffre commented 2 months ago

Quando mergiata, si potrebbe aggiungere questa https://github.com/OCA/l10n-italy/pull/4313