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

[13.0][MIG] fieldservice #513

Merged
merged 238 commits into from
Jun 17, 2020
Merged

[13.0][MIG] fieldservice #513

merged 238 commits into from
Jun 17, 2020

Conversation

murtuzasaleh
Copy link
Member

@murtuzasaleh murtuzasaleh commented Feb 26, 2020 •
edited
Loading

No description provided.

@OCA-git-bot
Copy link
Contributor

Hi @wolfhall, @max3903,
some modules you are maintaining are being modified, check this out!

@max3903 max3903 self-requested a review February 26, 2020 15:12
@max3903 max3903 added this to the 13.0 milestone Feb 26, 2020
@max3903 max3903 linked an issue Feb 26, 2020 that may be closed by this pull request
Migration to version 13.0 #354
Open
43 tasks
@brian10048 brian10048 mentioned this pull request Feb 26, 2020
Closed
@OCA-git-bot OCA-git-bot mentioned this pull request Feb 26, 2020
Open
43 tasks
@dreispt
Copy link
Member

dreispt commented Mar 10, 2020

OCA/web#1470 looks stalled.
I suggest splitting timeline view into a separate autoinstalled module.
That way we could move faster with this PR, that is blocking all the other module migrations.

@murtuzasaleh murtuzasaleh mentioned this pull request Mar 12, 2020
Closed
@murtuzasaleh murtuzasaleh changed the title [WIP][13.0][MIG] fieldservice [13.0][MIG] fieldservice Mar 12, 2020
dreispt
dreispt reviewed Mar 13, 2020
View reviewed changes
fieldservice/demo/fsm_location.xml Outdated Show resolved Hide resolved
fieldservice/models/__init__.py Outdated Show resolved Hide resolved
fieldservice/models/fsm_category.py Outdated Show resolved Hide resolved
fieldservice/models/fsm_person.py Show resolved Hide resolved
oca-travis and others added 7 commits March 16, 2020 20:04
@oca-travis @murtuzasaleh
[UPD] Update fieldservice.pot
4036e6c
@oca-transbot @murtuzasaleh
Update translation files
7c3b3da 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice/
@oca-travis @murtuzasaleh
[UPD] Update fieldservice.pot
5034445
@OCA-git-bot @murtuzasaleh
fieldservice 12.0.2.3.3
3290b10
@oca-transbot @murtuzasaleh
Update translation files
2527bf0 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: field-service-12.0/field-service-12.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice/
@murtuzasaleh
Translated using Weblate (Spanish)
20fc056 
Currently translated at 99.1% (536 of 541 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice/es/
@murtuzasaleh
Translated using Weblate (Spanish (Chile))
5eefa14 
Currently translated at 99.1% (536 of 541 strings)

Translation: field-service-12.0/field-service-12.0-fieldservice
Translate-URL: https://translation.odoo-community.org/projects/field-service-12-0/field-service-12-0-fieldservice/es_CL/
@murtuzasaleh murtuzasaleh force-pushed the 13.0-MIG-fieldservice branch 2 times, most recently from c604185 to 5eefa14 Compare March 23, 2020 08:04
@max3903 max3903 requested a review from wolfhall April 9, 2020 13:05
@brian10048
Copy link
Contributor

I did some brief testing on runbot.

From what I can tell, this looks OK to merge after #513 (comment) is fixed

The migration commit is showing a lot of changes in the diff that aren't really migration changes from v12, but the code appears to be correct. I believe this is due to @murtuzasaleh comment here #513 (comment) in regards to the migration process itself

That being said, we will have to forward port some v12 changes that have been merged recently. I don't see them as blocking for this PR as they can be done later

@max3903
Copy link
Member

max3903 commented Jun 15, 2020

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 13.0-ocabot-merge-pr-513-by-max3903-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jun 15, 2020
@OCA-git-bot
Merge PR #513 into 13.0
032c174 
Signed-off-by max3903
@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). 🤖

@max3903 max3903 merged commit 588ebb9 into OCA:13.0 Jun 17, 2020
@brian10048 brian10048 removed a link to an issue Jul 21, 2020
Migration to version 13.0 #354
Open
43 tasks
@brian10048 brian10048 mentioned this pull request Jul 22, 2020
Merged
@murtuzasaleh murtuzasaleh deleted the 13.0-MIG-fieldservice branch August 20, 2020 09:51
@brian10048 brian10048 mentioned this pull request Nov 6, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dreispt dreispt dreispt left review comments

@max3903 max3903 max3903 approved these changes

@brian10048 brian10048 brian10048 approved these changes

@wolfhall wolfhall Awaiting requested review from wolfhall

Assignees

@murtuzasaleh murtuzasaleh

Labels
approved bot is merging ⏳ migration needs review ready to merge
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.