Skip to content

13.0 mig mgmtsystem survey #270

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
Merged
merged 23 commits into from
Nov 17, 2019
Merged

13.0 mig mgmtsystem survey #270

merged 23 commits into from
Nov 17, 2019

Conversation

ernestotejeda
Copy link
Member

@ernestotejeda ernestotejeda commented Nov 8, 2019 •
edited
Loading

Depends on:

As this module depends on #268 I have included here the commits of that PR so it can be functionally tested.

There is no survey.stage model in v13, now the survey.survey model has a selection field instead of having a many2one relationship with survey.stage. So I adapted the module according to those changes

Cc @Tecnativa TT20485

@oca-clabot
Copy link

Hey @ernestotejeda, thank you for your Pull Request.

It looks like some users haven't signed our Contributor License Agreement, yet.
You can read and sign our full Contributor License Agreement here: http://odoo-community.org/page/cla
Here is a list of the users:

Appreciation of efforts,
OCA CLAbot

@ernestotejeda ernestotejeda force-pushed the 13.0-mig-mgmtsystem_survey branch from 690146f to 74a163c Compare November 9, 2019 13:21
@ernestotejeda
Copy link
Member Author

As #268 is merged i rebased and cleaned up the commit history a bit

@ernestotejeda ernestotejeda force-pushed the 13.0-mig-mgmtsystem_survey branch from 74a163c to 79b4189 Compare November 12, 2019 16:08
Tardo
Tardo approved these changes Nov 13, 2019
View reviewed changes
Copy link
Member

@Tardo Tardo left a comment

Choose a reason for hiding this comment

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

👍 LGTM

@pedrobaeza pedrobaeza added this to the 13.0 milestone Nov 13, 2019
@OCA-git-bot OCA-git-bot mentioned this pull request Nov 13, 2019
Open
21 tasks
pedrobaeza
pedrobaeza requested changes Nov 13, 2019
View reviewed changes
@ernestotejeda ernestotejeda force-pushed the 13.0-mig-mgmtsystem_survey branch from 79b4189 to 7ca9543 Compare November 13, 2019 20:15
@ernestotejeda
Copy link
Member Author

changes done

pedrobaeza
pedrobaeza reviewed Nov 15, 2019
View reviewed changes
@ernestotejeda ernestotejeda force-pushed the 13.0-mig-mgmtsystem_survey branch from 7ca9543 to 73d447e Compare November 15, 2019 15:54
@ernestotejeda
Copy link
Member Author

Changes done

@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 13.0-ocabot-merge-pr-270-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 17, 2019
@OCA-git-bot
Merge PR #270 into 13.0
0e9b2c4 
Signed-off-by pedrobaeza
@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). 🤖

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not start, because command `git merge --no-ff -m Merge PR #270 into 13.0

Signed-off-by pedrobaeza tmp-pr-270` failed with output:

Auto-merging .isort.cfg
CONFLICT (content): Merge conflict in .isort.cfg
Automatic merge failed; fix conflicts and then commit the result.

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not be finalized, because command `git merge --no-ff -m Merge PR #270 into 13.0

Signed-off-by pedrobaeza tmp-pr-270` failed with output:

Auto-merging .isort.cfg
CONFLICT (content): Merge conflict in .isort.cfg
Automatic merge failed; fix conflicts and then commit the result.

Maxime Chambreuil and others added 8 commits November 17, 2019 16:43
@pedrobaeza
[ADD] Initial commit. Import from extra-addons.
46e5f03
@dreispt @pedrobaeza
[CHG] AGPL license; set verion to 1.0
ed0ed56 
[FIX] .py files licenses to AGPL
@pedrobaeza
[FIX] PEP8 compliance after running flake8
b6c5d56 
[UPG] module manifest and views to v7 format
@pedrobaeza
Launchpad automatic translations update.
f9469a0
@dreispt @pedrobaeza
Init 8.0 branch
0dd525e
@llacroix @pedrobaeza
[IMP] refactoring code
6e9477c 
Added mgmtsystem_survey to ported code

Remove comments

Renamed files

Splitted xml files in models/views

Reorder file loading

Removed explicit view in survey_survey_view.xml

Moved demo data as demo and renamed files without suffix

Removed demo about survey
@sysadminmatmoz @pedrobaeza
Slovene translations added
c3af23f
@llacroix @pedrobaeza
Survey code doesn't exist anymore
5d4ca2a
@pedrobaeza pedrobaeza force-pushed the 13.0-mig-mgmtsystem_survey branch from 73d447e to ea1463a Compare November 17, 2019 15:43
@pedrobaeza
Copy link
Member

/ocabot merge

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 13.0-ocabot-merge-pr-270-by-pedrobaeza-bump-no, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 17, 2019
@OCA-git-bot
Merge PR #270 into 13.0
1521ca2 
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Nov 17, 2019
@OCA-git-bot
Merge PR #270 into 13.0
98eeaf6 
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Nov 17, 2019
@OCA-git-bot
Merge PR #270 into 13.0
783c16a 
Signed-off-by pedrobaeza
@OCA-git-bot OCA-git-bot merged commit ea1463a into OCA:13.0 Nov 17, 2019
@OCA-git-bot
Copy link
Contributor

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

@Tardo Tardo Tardo approved these changes

@pedrobaeza pedrobaeza pedrobaeza approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 ready to merge
Projects
None yet
Milestone
13.0
Development

Successfully merging this pull request may close these issues.