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

Mig mgmtsystem manual to v. 10.0 #167

Merged
merged 1 commit into from
Mar 28, 2017

Conversation

eugen-don
Copy link
Member

@eugen-don eugen-don commented Mar 14, 2017

@max3903 max3903 modified the milestone: 10.0 Mar 18, 2017
@pedrobaeza pedrobaeza mentioned this pull request Mar 18, 2017
31 tasks
@dreispt
Copy link
Member

dreispt commented Mar 20, 2017

This PT includes the code from #166 .
Best practice is to include only the ported manual's code and in the PR description mention the dependency on other PRs.
This way the diff will show reviewers only the relevant code.

One functional question: this module adds the mgmtsystem manual, but that is also added on the mgmtsystem base module.
In my opinion, honoring the separation of concerns principle, all manual related features should go here.

@max3903 max3903 self-requested a review March 21, 2017 16:55
@eugen-don eugen-don changed the title Mig mgmtsystem manuals to v. 10.0 Mig mgmtsystem manual to v. 10.0 Mar 21, 2017
@eugen-don eugen-don force-pushed the MIG-mgmtsystem_manuals-to-V.-10.0 branch from 8d114ea to b562cb5 Compare March 22, 2017 09:09
@eugen-don eugen-don changed the title Mig mgmtsystem manual to v. 10.0 WIP Mig mgmtsystem manual to v. 10.0 Mar 23, 2017
@eugen-don eugen-don force-pushed the MIG-mgmtsystem_manuals-to-V.-10.0 branch from b562cb5 to 5d792e2 Compare March 25, 2017 15:10
@eugen-don eugen-don changed the title WIP Mig mgmtsystem manual to v. 10.0 Mig mgmtsystem manual to v. 10.0 Mar 26, 2017
@max3903
Copy link
Member

max3903 commented Mar 27, 2017

@eugen-don Please rebase.

@eugen-don eugen-don force-pushed the MIG-mgmtsystem_manuals-to-V.-10.0 branch from 6e5411a to c43367d Compare March 27, 2017 17:24
@eugen-don
Copy link
Member Author

eugen-don commented Mar 27, 2017

@max3903 there was only one commit left to rebase.
I rebased on origin/10.0 two commits into one...
Or did you mean i missed some other prior commits?

edit:
OK i removed the code from the other PR...
You can merge if it passes the checks

@max3903
Copy link
Member

max3903 commented Mar 27, 2017

@eugen-don You need to rebase your branch on top of 10.0 to get mgmtystem migrated module.

git remote add oca git@github.com:oca/management-system.git
git fetch oca
git rebase -i oca/10.0

https://help.github.com/articles/about-git-rebase/

@eugen-don
Copy link
Member Author

eugen-don commented Mar 27, 2017

oh right you allready merged, i forgot

edit:
rebased on OCA/10.0

MIG-mgmtsystem_manuals-to-V.-10.0
@eugen-don eugen-don force-pushed the MIG-mgmtsystem_manuals-to-V.-10.0 branch from c43367d to c30da33 Compare March 27, 2017 19:28
@max3903 max3903 merged commit 76f68a0 into OCA:10.0 Mar 28, 2017
@eugen-don eugen-don deleted the MIG-mgmtsystem_manuals-to-V.-10.0 branch April 18, 2017 12:18
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.

5 participants