[11.0] mig partner contact in several companies #507

njeudy · 2017-10-24T20:25:39Z

Migrate partner_contact_in_several_companies
Migrate partner_contact_personal_information_page

In the same PR because dependency

njeudy · 2017-10-24T20:26:54Z

I think a need to squash :)

But don't know how ?

njeudy · 2017-10-24T20:54:40Z

@pedrobaeza @gurneyalex don't understand runbot and codecov red bullet ... some help ?

etobella · 2017-10-25T07:14:13Z

The problem with the runbot is that your code raises a WARNING:
2017-10-24 20:44:42,319 151 WARNING openerp_test odoo.addons.base.ir.ir_ui_view: Error-prone use of @class in view res.partner.kanban.contact (): use the hasclass(*classes) function to filter elements by their classes
Codecov error will be solved when some PR are accepted (no initial report can be found). It should not be a major problem.

njeudy · 2017-10-25T10:35:34Z

Ok will change this :) thanks @etobella

njeudy · 2017-10-27T13:16:24Z

Ok xpath expression changed
And squash transbot commit

njeudy · 2017-10-30T10:26:23Z

@pedrobaeza all green :) ready for review ?

pedrobaeza · 2017-10-30T10:30:20Z

Well, I'm not directly interested in this module, so let's wait for other interested reviewers. Any way, I think if you rebase over current branch, you will get coverage, which is a good indicator also.

njeudy · 2017-10-31T13:15:38Z

@pedrobaeza ok no probleme will rebase. thanks

njeudy · 2017-11-07T14:38:42Z

@yajo @pedrobaeza what should I do to pass codecov ? it is just 10.0 to 11.0 migration no improvement or new function ...

yajo · 2017-11-08T11:37:29Z

In this case codecov indicates that some merged code is not being tested. If you hit "Details > Diff", you'll see some red lines indicating that. You'd have to add some test for those lines to go over the target patch coverage (96.34%) and to avoid lowering the current project coverage ratio.

It would be a much appreciated effort, although I wouldn't require such thing IMHO.

njeudy · 2017-11-08T21:03:04Z

@yajo done ;)

yajo

Cool! Please squash all migration-related commits into one for the final merge 😊

njeudy · 2017-11-13T21:34:04Z

@yajo like that ?

yajo · 2017-11-14T09:07:07Z

With 867d552 too

njeudy · 2017-11-15T10:42:59Z

@yajo : did not understand why this commit is shown, in my branch all commit are squashed in one.
https://github.com/njeudy/partner-contact/commits/11.0-mig-partner_contact_in_several_companies ... don't know how to do.

yajo · 2017-11-15T13:47:57Z

@njeudy don't worry, let me show you. Look at the commits in the PR:

I highlighted all of the remaining translation commits.

The normal flow would be:

git checkout 11.0-mig-partner_contact_in_several_companies
git rebase --interactive 11.0

That should open the editor you have configured and show all the list of commits from your branch.

They should appear in this fashion:

pick <commit-sha> <commit-msg>
[...]

Now you should cut all those lines that I marked in red and move them to the bottom, just before your migration commit, and mark as fixup all of them except the first one. The end of the commits list should look something similar to this:

pick e112903 Create partner_contact_personal_information_page.
[...]
# Pick 1st translation commit
pick 4d5d348 OCA Transbot updated translations from Transifex 
# Fixup the rest of translation commits
fixup e639882 OCA Transbot updated translations from Transifex
# ...
fixup 2024a3e OCA Transbot updated translations from Transifex
# Your migration commit at the end:
pick 43e65d6 [MIG] V11 migration

Then save and exit. Git will start picking all code commits, then it will pick 1st translation commit and fixup (squash discarding commit message) all of other translation commits in that one, then it will pick your migration commit and will let a clean branch! There's chance that merge conflicts appear, in such case install meld and, when git rebase stops, do:

git mergetool
# now, using meld, fix conflicts on middle pane. Then:
git rebase --continue

If you even use that fixup system to remove the duplicate commits from your branch, that would be even more awesome, but this should be just fine with that.

njeudy · 2017-11-18T17:46:43Z

@yajo thanks for your help, now it should be ok and have learn a lot if git rebase tricks :)

- Remove Domain Error on contact view. - Additionally, improve behaviour of personal contact info page. - Change to README. - No longer dependent on partner_contact_personal_information_page - Added tests for ir_actions - Include extra demo data. - Increase test coverage. - Remove birthdate from demo data.

…ersonal_contact_information'

* [MIG] inital work to 10.0 * [FIX] restore computed field - select=1 is not usable anymore ... * [FIX] convert _fields_sync to new api * [FIX] restore form . import statement * [FIX] readme with last template. * [FIX] import statement. * [FIX] check all tests * [FIX] Flake8 errors fixes * [FIX] flake 8 * [FIX] wrong obj call self -> self.contact_id * [FIX] typo * [FIX] flake 8 * [FIX] add index on contact_type * [fix] use in statement on test * [FIX] update base action with new context * [FIX] test fixes * [FIX] test work * [FIX] flake 8 over indent * [FIX] fixes on lastest comments - better readability - remove <data></data> tags * [FIX] model that same pattern for _fields_sync - add test ensure_once() * [FIX] remove last data xml tags * [FIX] fix action test * [FIX] typo in import statement * [FIX] remove logger from tests * [FIX] new flake8 compute method name for OCA * [FIX] minor typo * [FIX] partner_contact_in_several_companies: remove contributor key in manifest * [FIX] partner_contact_in_several_companies: residual onchange on partner view * Revert "[FIX] partner_contact_in_several_companies: remove contributor key in manifest" This reverts commit 56e511a. * [FIX] partner_contact_personal_information_page: clean manifest and authors * [FIX] partner_contact_in_several_companies: required = True not needed

Really I'm just renaming partner_contact_base. The new name is more self-explanatory.

OCA#315) [MIG] Migration partner_contact_birthdate partner_contact_gender partner_contact_personal_information_page to v10

@Class

- fax field removed from res.partner - 2to3 on all py files - add contributor and update README - use hasclass in place of @Class in xpath expr - improve tests [FIX] typo and clean README

njeudy · 2017-12-05T21:00:43Z

@simahawk Ok done squash commit from same user in one

simahawk

LGTM. I'd squash commits like "make module uninstallable" and alike, just because they are useless in this context. But is not a blocker and we don't have guidelines for this ;)

njeudy · 2017-12-11T12:56:10Z

@pedrobaeza @simahawk @yajo Ok to merge ?

pedrobaeza · 2017-12-17T15:58:29Z

This has broken Travis. I have already fixed one issue, but it seems that there are more. This can't be installed. Please check https://travis-ci.org/OCA/partner-contact/jobs/317716741#L780

pedrobaeza · 2018-01-02T14:35:50Z

Please fix Travis after merging this.

pedrobaeza · 2018-01-02T17:37:45Z

Solved thanks to @drdran

njeudy mentioned this pull request Oct 24, 2017

Migration to version 11.0 #482

Closed

53 tasks

njeudy changed the title ~~11.0 mig partner contact in several companies~~ [11.0] mig partner contact in several companies Oct 27, 2017

njeudy force-pushed the 11.0-mig-partner_contact_in_several_companies branch from 02f48bd to 0e5b0e3 Compare October 27, 2017 13:15

pedrobaeza added the needs review label Oct 30, 2017

njeudy force-pushed the 11.0-mig-partner_contact_in_several_companies branch from 0e5b0e3 to 345ccfa Compare October 31, 2017 13:19

pedrobaeza added this to the 11.0 milestone Oct 31, 2017

njeudy mentioned this pull request Nov 6, 2017

11.0 mig partner contact personal information page #511

Closed

njeudy force-pushed the 11.0-mig-partner_contact_in_several_companies branch 2 times, most recently from 49f3034 to 1b8a746 Compare November 8, 2017 20:51

yajo approved these changes Nov 9, 2017

View reviewed changes

njeudy force-pushed the 11.0-mig-partner_contact_in_several_companies branch from 92e79d1 to 43e65d6 Compare November 13, 2017 21:33

LoisRForgeFlow mentioned this pull request Nov 17, 2017

[9.0] [WIP] quality_control_stock OCA/manufacture#238

Closed

1 task

njeudy force-pushed the 11.0-mig-partner_contact_in_several_companies branch 2 times, most recently from 372788d to 6ae7320 Compare November 18, 2017 17:44

sbidoul and others added 18 commits December 5, 2017 21:56

[UPD] prefix versions with 8.0

b965d53

[MIG] Make modules uninstallable

6ea000f

Making the 'personal contact' informations depentens of the module 'p…

fe8cb7e

…ersonal_contact_information'

[MIG] Make modules uninstallable

365f5a6

[MIG] Rename manifest files

ded9536

Create partner_contact_personal_information_page.

7e130e8

Really I'm just renaming partner_contact_base. The new name is more self-explanatory.

Add missing default oca icons

4361a10

[UPD] prefix versions with 8.0

c60d95d

[MIG] Make modules uninstallable

f4df233

partner_contact_personal_information updated to version 9.0

50b9328

Remove refecence of base in xmlid

93d6daf

[MIG] Make modules uninstallable

09e0baf

[MIG] Rename manifest files

f16abd3

[MIG] Migration partner_contact_birthdate partner_contact_gender part… (

ae5e5b8

OCA#315) [MIG] Migration partner_contact_birthdate partner_contact_gender partner_contact_personal_information_page to v10

OCA Transbot updated translations from Transifex

d00f3a8

[MIG] V11 migration

0362443

- fax field removed from res.partner - 2to3 on all py files - add contributor and update README - use hasclass in place of @Class in xpath expr - improve tests [FIX] typo and clean README

njeudy force-pushed the 11.0-mig-partner_contact_in_several_companies branch from 5c2bb83 to 0362443 Compare December 5, 2017 20:59

simahawk approved these changes Dec 6, 2017

View reviewed changes

yajo approved these changes Dec 12, 2017

View reviewed changes

yajo merged commit da905ca into OCA:11.0 Dec 12, 2017

pedrobaeza mentioned this pull request Jan 2, 2018

[11.0] Port of enhancement of geonames import from 10.0 branch #534

Merged

FrancoTampieri mentioned this pull request Jan 2, 2018

[Fix] Fix problem in view #541

Merged

simahawk mentioned this pull request Jan 16, 2018

11.0 mig partner contact gender #510

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[11.0] mig partner contact in several companies #507

[11.0] mig partner contact in several companies #507

njeudy commented Oct 24, 2017

njeudy commented Oct 24, 2017 •

edited

Loading

njeudy commented Oct 24, 2017

etobella commented Oct 25, 2017 •

edited

Loading

njeudy commented Oct 25, 2017

njeudy commented Oct 27, 2017

njeudy commented Oct 30, 2017

pedrobaeza commented Oct 30, 2017

njeudy commented Oct 31, 2017

njeudy commented Nov 7, 2017

yajo commented Nov 8, 2017

njeudy commented Nov 8, 2017

yajo left a comment

njeudy commented Nov 13, 2017

yajo commented Nov 14, 2017

njeudy commented Nov 15, 2017

yajo commented Nov 15, 2017

njeudy commented Nov 18, 2017

njeudy commented Dec 5, 2017

simahawk left a comment

njeudy commented Dec 11, 2017

pedrobaeza commented Dec 17, 2017

pedrobaeza commented Jan 2, 2018

pedrobaeza commented Jan 2, 2018

[11.0] mig partner contact in several companies #507

[11.0] mig partner contact in several companies #507

Conversation

njeudy commented Oct 24, 2017

njeudy commented Oct 24, 2017 • edited Loading

njeudy commented Oct 24, 2017

etobella commented Oct 25, 2017 • edited Loading

njeudy commented Oct 25, 2017

njeudy commented Oct 27, 2017

njeudy commented Oct 30, 2017

pedrobaeza commented Oct 30, 2017

njeudy commented Oct 31, 2017

njeudy commented Nov 7, 2017

yajo commented Nov 8, 2017

njeudy commented Nov 8, 2017

yajo left a comment

Choose a reason for hiding this comment

njeudy commented Nov 13, 2017

yajo commented Nov 14, 2017

njeudy commented Nov 15, 2017

yajo commented Nov 15, 2017

njeudy commented Nov 18, 2017

njeudy commented Dec 5, 2017

simahawk left a comment

Choose a reason for hiding this comment

njeudy commented Dec 11, 2017

pedrobaeza commented Dec 17, 2017

pedrobaeza commented Jan 2, 2018

pedrobaeza commented Jan 2, 2018

njeudy commented Oct 24, 2017 •

edited

Loading

etobella commented Oct 25, 2017 •

edited

Loading