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

9.0 [MIG] partner_contact_department migration #327

Merged
merged 8 commits into from
Nov 13, 2016

Conversation

cubells
Copy link
Member

@cubells cubells commented Nov 7, 2016

No description provided.

Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

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

Squash all the "OCA transbot" commits


.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
:alt: Try me on Runbot
:target: https://runbot.odoo-community.org/runbot/134/8.0
Copy link
Member

Choose a reason for hiding this comment

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

Switch to 9.0

Images
------

* `Antiun Ingeniería S.L. <http://www.antiun.com>`_: Icon.
Copy link
Member

Choose a reason for hiding this comment

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

This image credit is not correct. Remove it.

"summary": "Assign contacts to departments",
'version': '9.0.1.0.0',
'category': 'Customer Relationship Management',
'author': 'Serv. Tecnol. Avanzados - Pedro M. Baeza, '
Copy link
Member

Choose a reason for hiding this comment

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

Remove both old company references and put Tecnativa

_description = "Department"

name = fields.Char(required=True, translate=True)
parent_id = fields.Many2one(
Copy link
Member

Choose a reason for hiding this comment

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

Check recursion.

Copy link
Member

Choose a reason for hiding this comment

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

It seems done below.

@pedrobaeza pedrobaeza mentioned this pull request Nov 7, 2016
31 tasks
@pedrobaeza
Copy link
Member

cc @Tecnativa

@pedrobaeza
Copy link
Member

The squash operation hasn't been correct.

@rafaelbn rafaelbn added this to the 9.0 milestone Nov 8, 2016
"summary": "Assign contacts to departments",
'version': '9.0.1.0.0',
'category': 'Customer Relationship Management',
'author': 'Tecnativa S.L. - Vicent Cubells, '
Copy link
Member

Choose a reason for hiding this comment

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

Only Tecnativa

@@ -11,7 +11,7 @@
"summary": "Assign contacts to departments",
'version': '9.0.1.0.0',
'category': 'Customer Relationship Management',
'author': 'Tecnativa S.L. - Vicent Cubells, '
'author': 'Tecnativa - Vicent Cubells, '
Copy link
Member

Choose a reason for hiding this comment

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

Sorry, I wasn't see the second part, but it's only Tecnativa at all, also without "Vicent Cubells". Your name is put on the README in the contributors section and also on each file header.

@@ -11,7 +11,7 @@
"summary": "Assign contacts to departments",
'version': '9.0.1.0.0',
'category': 'Customer Relationship Management',
'author': 'Tecnativa S.L. - Vicent Cubells, '
'author': 'Tecnativa - Vicent Cubells, '
"Odoo Community Association (OCA)",
"license": "AGPL-3",
'website': 'http://www.antiun.com',
Copy link
Member

Choose a reason for hiding this comment

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

Change also the website

@pedrobaeza
Copy link
Member

Vicent, this one stills contains weird commits. Can you fix it?

@pedrobaeza
Copy link
Member

Can you do a similar test than job_position?

@cubells
Copy link
Member Author

cubells commented Nov 9, 2016

Yes, I can.

@cubells
Copy link
Member Author

cubells commented Nov 9, 2016

cc @pedrobaeza

I can't do an squash of the transbot commits. Even if I do an squash of two consecutive commits I've got an error. Weird.

yajo
yajo previously requested changes Nov 11, 2016
Copy link
Member

@yajo yajo left a comment

Choose a reason for hiding this comment

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

Hi, you have to use git rebase -i origin/9.0 and follow instructions at the bottom of the file git opens to you to fixup those consecutive commits. No conflict should appear.

Also, please keep a sane history. As you might guess, having commits from 6d3c9a1 to 3183145 with the same meaningless message will not be merged until fixed. OTOH code looks alright 😉

_description = "Department"

name = fields.Char(required=True, translate=True)
parent_id = fields.Many2one(
Copy link
Member

Choose a reason for hiding this comment

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

It seems done below.

Copy link
Member

@rafaelbn rafaelbn left a comment

Choose a reason for hiding this comment

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

Tested in runbot

@cubells cubells force-pushed the 9.0-mig-partner_contact_department branch 2 times, most recently from 2e1bd81 to d74d6d4 Compare November 12, 2016 16:23
@cubells
Copy link
Member Author

cubells commented Nov 12, 2016

cc @Tecnativa

@pedrobaeza
Copy link
Member

OK, this looks better 😉 I'll review it

@pedrobaeza pedrobaeza force-pushed the 9.0-mig-partner_contact_department branch from d74d6d4 to 5e09fe0 Compare November 13, 2016 12:00
@pedrobaeza pedrobaeza dismissed yajo’s stale review November 13, 2016 12:02

The git part is already covered

@pedrobaeza pedrobaeza merged commit 8cf09a3 into OCA:9.0 Nov 13, 2016
@pedrobaeza pedrobaeza deleted the 9.0-mig-partner_contact_department branch November 13, 2016 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants