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

[16.0][mig] project_deadline: Migration to 16.0 #1351

Open
wants to merge 20 commits into
base: 16.0
Choose a base branch
from

Conversation

anusriNPS
Copy link

@anusriNPS anusriNPS commented Oct 16, 2024

Migrating project_deadline to 16.0

Reopened PR: #1123

@anusriNPS anusriNPS changed the title 16.0 mig project deadline [16.0][mig] project_deadline: Migration to 16.0 Oct 16, 2024
@anusriNPS
Copy link
Author

@heliaktiv , I have reopened PR of migrating project_deadline to 16.0 and I would request you to review it

Copy link

@PicchiSeba PicchiSeba left a comment

Choose a reason for hiding this comment

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

Code review: LGTM

@aleuffre
Copy link

Comment on lines 17 to 18
self.assertIn("date_start", res["arch"])
self.assertIn("date", res["arch"])

Choose a reason for hiding this comment

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

question: why were these two lines changed to be the opposite of what they were before?

Copy link
Author

Choose a reason for hiding this comment

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

As part of Odoo 16.0 addons project view, date_start and date fields are included in the xml whose external id is "edit_project" which is displayed as "Planned Date".

https://github.com/odoo/odoo/blob/16.0/addons/project/views/project_views.xml#L506C28-L511C119

Screenshot from 2024-10-22 16-45-36

As this is available as part of Odoo addons project module, I am removing project_project related code changes which appends date_start and date field to the form view from project_deadline module.
Also, the testcase related to it is also no longer valid for 16.0 version

@anusriNPS
Copy link
Author

I tried to squash the commit, but it resulted in merge conflict issue related to project_hr commits, so could not do it.

When git rebase -i origin/16.0 is executed, it lists other project related repos like project_hr and showing merge conflicts related to hr project during squash

image

Is there any way to get only project_deadline related commits alone, so that it can be squashed?

@aleuffre
Copy link

I tried to squash the commit, but it resulted in merge conflict issue related to project_hr commits, so could not do it.

When git rebase -i origin/16.0 is executed, it lists other project related repos like project_hr and showing merge conflicts related to hr project during squash

image

Is there any way to get only project_deadline related commits alone, so that it can be squashed?

I suspect your repo may be outdated. Can you try git fetch origin 16.0 and then try to rebase again?

oca-travis and others added 12 commits October 21, 2024 16:46
Currently translated at 80.0% (4 of 5 strings)

Translation: project-14.0/project-14.0-project_deadline
Translate-URL: https://translation.odoo-community.org/projects/project-14-0/project-14-0-project_deadline/es/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: project-14.0/project-14.0-project_deadline
Translate-URL: https://translation.odoo-community.org/projects/project-14-0/project-14-0-project_deadline/
Currently translated at 100.0% (8 of 8 strings)

Translation: project-14.0/project-14.0-project_deadline
Translate-URL: https://translation.odoo-community.org/projects/project-14-0/project-14-0-project_deadline/es_AR/
Currently translated at 100.0% (8 of 8 strings)

Translation: project-14.0/project-14.0-project_deadline
Translate-URL: https://translation.odoo-community.org/projects/project-14-0/project-14-0-project_deadline/it/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.