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] REF removing cee_type #2295

Merged
merged 1 commit into from
Mar 25, 2024
Merged

Conversation

eLBati
Copy link
Member

@eLBati eLBati commented May 25, 2021

In seguito a #1937 e, di conseguenza, a #2128, propongo questa semplificazione, sempre che il campo cee_type non serva a qualcuno anche su v14

--
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

@eLBati
Copy link
Member Author

eLBati commented May 25, 2021

cc @labaggio

@sergiocorato
Copy link
Contributor

@eLBati da quanto vedo la #2128 è stata abbandonata, questa PR quindi è ancora rilevante?

@eLBati
Copy link
Member Author

eLBati commented Feb 26, 2024

@eLBati da quanto vedo la #2128 è stata abbandonata, questa PR quindi è ancora rilevante?

Sì perchè, indipendentemente dalle altre evoluzioni del modulo, il campo cee_type credo sia inutilizzato e crei solo confusione

@sergiocorato
Copy link
Contributor

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@sergiocorato The rebase process failed, because command git rebase origin/14.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: REF removing cee_type
Using index info to reconstruct a base tree...
M	account_vat_period_end_statement/models/account.py
M	account_vat_period_end_statement/report/vat_statement.py
M	l10n_it_account/models/account_tax.py
M	l10n_it_vat_registries/models/vat_registry.py
M	l10n_it_vat_registries/views/account_view.xml
Falling back to patching base and 3-way merge...
Auto-merging l10n_it_vat_registries/views/account_view.xml
CONFLICT (content): Merge conflict in l10n_it_vat_registries/views/account_view.xml
Auto-merging l10n_it_vat_registries/models/vat_registry.py
Auto-merging l10n_it_account/models/account_tax.py
Auto-merging account_vat_period_end_statement/report/vat_statement.py
Auto-merging account_vat_period_end_statement/models/account.py
CONFLICT (content): Merge conflict in account_vat_period_end_statement/models/account.py
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 REF removing cee_type
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".

Copy link
Contributor

@andreampiovesana andreampiovesana 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

@eLBati puoi sistemare i conflitti? che poi mergio

@eLBati eLBati force-pushed the 14.0-removing-ceetype branch from 0162025 to df780c4 Compare March 21, 2024 15:18
@eLBati
Copy link
Member Author

eLBati commented Mar 21, 2024

@sergiocorato fatto

@sergiocorato
Copy link
Contributor

/ocabot merge minor

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 14.0-ocabot-merge-pr-2295-by-sergiocorato-bump-minor, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Mar 25, 2024
Signed-off-by sergiocorato
@OCA-git-bot
Copy link
Contributor

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

@OCA-git-bot OCA-git-bot merged commit f718c9b into OCA:14.0 Mar 25, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

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

5 participants