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

11.0 mig partner noncommercial #657

Merged
merged 6 commits into from
Oct 7, 2019
Merged

11.0 mig partner noncommercial #657

merged 6 commits into from
Oct 7, 2019

Conversation

lfreeke
Copy link
Contributor

@lfreeke lfreeke commented Nov 18, 2018

No description provided.

@lfreeke lfreeke force-pushed the 11.0-mig-partner_noncommercial branch from b8e841e to 8095628 Compare November 18, 2018 21:07
@pedrobaeza pedrobaeza added this to the 11.0 milestone Nov 18, 2018
@emagdalenaC2i emagdalenaC2i mentioned this pull request Dec 28, 2018
Closed
53 tasks
@NL66278
Copy link
Contributor

NL66278 commented Jan 21, 2019

@lfreeke Now that we have the contacts main menu, it no longer makes sense to have a separate partner main menu entry. Please compare with https://github.com/NL66278/partner-contact/tree/10.0-partner_noncommercial-better-menu and check wether I miss something that you have. As I did not do a PR for my branch, keep al the needed changes in your branch and update the PR). One thing that needs still to be improved on my branch: configuration menu should go last.

@lfreeke lfreeke force-pushed the 11.0-mig-partner_noncommercial branch 2 times, most recently from ee6a717 to 0e3d640 Compare February 1, 2019 12:14
@lfreeke
Copy link
Contributor Author

lfreeke commented Feb 1, 2019

@NL66278 The separate partner menu is now gone and you can find the sub menu's in the contacts menu. The only difference between your branch and this one is a couple of sequences and your configuration entry (I think that is needed for 10.0).

@lfreeke lfreeke force-pushed the 11.0-mig-partner_noncommercial branch from 0e3d640 to dff67f2 Compare February 12, 2019 19:35
@NL66278
Copy link
Contributor

NL66278 commented Feb 21, 2019 •
edited
Loading

@lfreeke You also have an extra and unneeded level in the menu: Contacts==>Partners==>Partners (and the the menu options).

Merging my branch, that I have rebased on yours, will solve this. Also it renames the relation filter, which really is only for contacts that are partners, to contact. Thereby undoing a past mistake.

I can not make pull requests to your repository, so you need to change that or merge my branch yourself in yours.

See: https://github.com/NL66278/partner-contact/tree/11.0-mig-partner_noncommercial

@lfreeke
Copy link
Contributor Author

lfreeke commented Sep 30, 2019

@NL66278 I merged your branch in. Is this correct now?

NL66278
NL66278 approved these changes Sep 30, 2019
View reviewed changes
Copy link
Contributor

@NL66278 NL66278 left a comment

Choose a reason for hiding this comment

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

👍 Looks good now. Only need some extra work for partner_multi_relation_tabs, but that can be done in a separate PR.

daramousk
daramousk approved these changes Oct 3, 2019
View reviewed changes
Copy link
Member

@daramousk daramousk left a comment

Choose a reason for hiding this comment

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

Just a comment

partner_noncommercial/views/menu.xml Outdated Show resolved Hide resolved
@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). 🤖

@gfcapalbo
Copy link

gfcapalbo commented Oct 3, 2019 •
edited
Loading

@lfreeke reviewed actions/menues and looks good.
When you migrate something, add yourself to contributors manifest. and always write a line of description in MR. 👍

NL66278 and others added 6 commits October 7, 2019 14:40
@NL66278 @lfreeke
[ENH] Migration of the 7.0 module partner_noncommercial. (OCA#286)
15ad8de 
* [ENH] Migration of the 7.0 module partner_noncommercial.

This used to be part of therp-oe-staging modules, but seems
to be usefull for more organisations that are primarily or completely
non-commercial. The organisations might be put of by the commercial
lingo that is shown by default.

* [FIX] Add name / mail to contributors.
@oca-transbot @lfreeke
OCA Transbot updated translations from Transifex
1784e72
@NL66278 @lfreeke
[MIG] Migrate partner_noncommercial from 8.0 to 10.0
8be8cb2
@oca-travis @lfreeke
[UPD] Update partner_noncommercial.pot
6ab3d0c
@oca-travis @lfreeke
[UPD] Update partner_noncommercial.pot
4b8b097
@NL66278 @lfreeke
[IMP] partner_noncommercial. Fully use contacts menu.
a353908
@lfreeke lfreeke force-pushed the 11.0-mig-partner_noncommercial branch from 74ae09e to a353908 Compare October 7, 2019 12:41
@lfreeke
Copy link
Contributor Author

lfreeke commented Oct 7, 2019

@NL66278 I removed the group.

@NL66278 NL66278 merged commit bd45109 into OCA:11.0 Oct 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NL66278 NL66278 NL66278 approved these changes

@daramousk daramousk daramousk approved these changes

Assignees
No one assigned
Labels
approved ready to merge
Projects
None yet
Milestone
11.0
Development

Successfully merging this pull request may close these issues.
8 participants
@lfreeke @NL66278 @OCA-git-bot @gfcapalbo @daramousk @pedrobaeza @oca-transbot @oca-travis