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

[14.0][MIG] l10n_it_reverse_charge #2310

Merged
merged 64 commits into from
Nov 19, 2021

Conversation

SimoneVagile
Copy link
Contributor

Descrizione del problema o della funzionalità:

Comportamento attuale prima di questa PR:

Comportamento desiderato dopo questa PR:

--
Confermo di aver firmato il CLA https://odoo-community.org/page/cla e di aver letto le linee guida su https://odoo-community.org/page/contributing

@SimoneVagile SimoneVagile force-pushed the 14.0-mig-l10n_it_reverse_charge branch from 0232fba to b169594 Compare June 3, 2021 11:56
@dcorio dcorio mentioned this pull request Jun 15, 2021
76 tasks
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jun 18, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jun 18, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jun 18, 2021
@eLBati
Copy link
Member

eLBati commented Jun 28, 2021

Segnalo #2295 che è correlata

TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 2, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 2, 2021
@TheMule71
Copy link
Contributor

TheMule71 commented Jul 9, 2021

Ciao, riesci a farmi un rebase all'ultima 14.0 per cortesia? Non capisco perché ma mi fallisce quando ci provo io:

[marco@frodo (pr-2310) l10n-italy]$ git rebase 14.0
Auto-merging l10n_it_reverse_charge/views/account_move_views.xml
Auto-merging l10n_it_reverse_charge/tests/test_rc.py
CONFLICT (content): Merge conflict in l10n_it_reverse_charge/tests/test_rc.py
Auto-merging l10n_it_reverse_charge/tests/rc_common.py
CONFLICT (content): Merge conflict in l10n_it_reverse_charge/tests/rc_common.py
Auto-merging l10n_it_reverse_charge/models/account_move.py
CONFLICT (content): Merge conflict in l10n_it_reverse_charge/models/account_move.py
error: could not apply cefcbb24... [FIX] l10n_it_reverse_charge: Migration to 14.0 - fix tests and refactoring
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".
Could not apply cefcbb24... [FIX] l10n_it_reverse_charge: Migration to 14.0 - fix tests and refactoring

TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 9, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 17, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 17, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 20, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 20, 2021
@SimoneVagile SimoneVagile requested a review from TheMule71 July 27, 2021 12:00
@TheMule71
Copy link
Contributor

[marco@frodo (14.0) l10n-italy]$ git fetch https://github.com/OCA/l10n-italy pull/2310/head:pr-2310 
[marco@frodo (14.0) l10n-italy]$ git co pr-2310 
Switched to branch 'pr-2310'
[marco@frodo (pr-2310) l10n-italy]$ git rebase 14.0
Auto-merging l10n_it_reverse_charge/views/account_move_views.xml
Auto-merging l10n_it_reverse_charge/tests/test_rc.py
CONFLICT (content): Merge conflict in l10n_it_reverse_charge/tests/test_rc.py
Auto-merging l10n_it_reverse_charge/tests/rc_common.py
CONFLICT (content): Merge conflict in l10n_it_reverse_charge/tests/rc_common.py
Auto-merging l10n_it_reverse_charge/models/account_move.py
CONFLICT (content): Merge conflict in l10n_it_reverse_charge/models/account_move.py
error: could not apply cefcbb24... [FIX] l10n_it_reverse_charge: Migration to 14.0 - fix tests and refactoring
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".
Could not apply cefcbb24... [FIX] l10n_it_reverse_charge: Migration to 14.0 - fix tests and refactoring

TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 30, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 30, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 30, 2021
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jul 30, 2021
@tafaRU
Copy link
Member

tafaRU commented Aug 6, 2021

@SimoneVagile SimoneVagile force-pushed the 14.0-mig-l10n_it_reverse_charge branch from b9f677f to 4bfe78b Compare November 17, 2021 10:25
@tafaRU
Copy link
Member

tafaRU commented Nov 18, 2021

@SimoneVagile, questi 4 commit:

image

si possono squashare con quello di migrazione?

@SimoneVagile SimoneVagile force-pushed the 14.0-mig-l10n_it_reverse_charge branch from 4bfe78b to 5e65a06 Compare November 18, 2021 08:04
@SimoneVagile
Copy link
Contributor Author

@SimoneVagile, questi 4 commit:

image

si possono squashare con quello di migrazione?

@tafaRU fatto, grazie.

@tafaRU
Copy link
Member

tafaRU commented Nov 18, 2021

@TheMule71 mergi tu? Visto che hai fatto la review.

@TheMule71
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-2310-by-TheMule71-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 070eafa into OCA:14.0 Nov 19, 2021
@OCA-git-bot
Copy link
Contributor

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

TheMule71 added a commit to TheMule71/l10n-italy that referenced this pull request Jan 21, 2022
TheMule71 added a commit to TheMule71/l10n-italy that referenced this pull request Jan 21, 2022
TheMule71 added a commit to TheMule71/l10n-italy that referenced this pull request Jan 21, 2022
TheMule71 added a commit to TheMule71/l10n-italy that referenced this pull request Jan 21, 2022
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jun 29, 2022
TheMule71 added a commit to odoo-italia/l10n-italy that referenced this pull request Jun 29, 2022
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.