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.

Sign up for GitHub

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

Jump to bottom

[14.0] l10n_it_declaration_of_intent: se elimino fattura già confermata non aggiorna plafond #4268

Merged
merged 2 commits into from
Jan 18, 2025
Merged

[14.0] l10n_it_declaration_of_intent: se elimino fattura già confermata non aggiorna plafond #4268

merged 2 commits into from
Jan 18, 2025

Conversation

sergiocorato
Copy link
Contributor

@sergiocorato sergiocorato commented Jul 12, 2024 •
edited by francesco-ooops
Loading

Solves #4129 for 14.0

@sergiocorato sergiocorato mentioned this pull request Jul 12, 2024
Closed
2 tasks
@francesco-ooops francesco-ooops linked an issue Jul 12, 2024 that may be closed by this pull request
l10n_it_declaration_of_intent: se elimino fattura già confermata non aggiorna plafond #4129
Closed
2 tasks
@sergiocorato sergiocorato force-pushed the 14.0-fix-di-delete-invoice branch from a9ff120 to 6fa78b8 Compare July 12, 2024 19:42
@francesco-ooops
Copy link
Contributor

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

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

Rebasing (1/2)
Rebasing (2/2)
Auto-merging l10n_it_withholding_tax_financial_report/README.rst
CONFLICT (add/add): Merge conflict in l10n_it_withholding_tax_financial_report/README.rst
Auto-merging l10n_it_withholding_tax_financial_report/static/description/index.html
CONFLICT (add/add): Merge conflict in l10n_it_withholding_tax_financial_report/static/description/index.html
error: could not apply 6fa78b841... [FIX] l10n_it_declaration_of_intent: remove line on move.unlink()
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 6fa78b841... [FIX] l10n_it_declaration_of_intent: remove line on move.unlink()

@francesco-ooops
Copy link
Contributor

@sergiocorato puoi fare rebase?

@sergiocorato sergiocorato force-pushed the 14.0-fix-di-delete-invoice branch 3 times, most recently from cf57dfe to c44a976 Compare September 3, 2024 16:06
@sergiocorato
Copy link
Contributor Author

@sergiocorato puoi fare rebase?

Fatto, ho ripulito un po' di sporco

@francesco-ooops francesco-ooops changed the title [14.0] fix for #4129 [14.0] l10n_it_declaration_of_intent: se elimino fattura già confermata non aggiorna plafond Sep 3, 2024
@SirAionTech SirAionTech added the is porting This pull request is porting a change from another version label Nov 8, 2024
TennyMkt
TennyMkt approved these changes Dec 13, 2024
View reviewed changes
Copy link
Contributor

@TennyMkt TennyMkt left a comment

Choose a reason for hiding this comment

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

LGTM

@sergiocorato
Copy link
Contributor Author

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@sergiocorato The rebase process failed, because command git push --force efatto tmp-pr-4268:14.0-fix-di-delete-invoice failed with output:

remote: Permission to efatto/l10n-italy.git denied to OCA-git-bot.
fatal: unable to access 'https://github.com/efatto/l10n-italy/': The requested URL returned error: 403

@sergiocorato sergiocorato force-pushed the 14.0-fix-di-delete-invoice branch from c44a976 to aac0c8d Compare January 17, 2025 16:13
MaurizioPellegrinet
MaurizioPellegrinet approved these changes Jan 17, 2025
View reviewed changes
Copy link

@MaurizioPellegrinet MaurizioPellegrinet left a comment

Choose a reason for hiding this comment

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

Test funzionale: OK

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

@sergiocorato
Copy link
Contributor Author

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 14.0-ocabot-merge-pr-4268-by-sergiocorato-bump-minor, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 3db28e4 into OCA:14.0 Jan 18, 2025
5 checks passed
@OCA-git-bot
Copy link
Contributor

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

@sergiocorato sergiocorato deleted the 14.0-fix-di-delete-invoice branch January 27, 2025 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MaurizioPellegrinet MaurizioPellegrinet MaurizioPellegrinet approved these changes

@TennyMkt TennyMkt TennyMkt approved these changes

Assignees
No one assigned
Labels
approved is porting This pull request is porting a change from another version merged 🎉 ready to merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

l10n_it_declaration_of_intent: se elimino fattura già confermata non aggiorna plafond
7 participants
@sergiocorato @francesco-ooops @OCA-git-bot @TennyMkt @MaurizioPellegrinet @SirAionTech @TheMule71