11.0 mig sale team operating unit #100
Conversation
|
Why are you including the operating_unit module fields here? #99 means to do that, doesn't' it? |
|
@aheficent That is correct, this PR extends the last one, they include the same commits so they won't duplicate, they are all mergeable, but need to merge in order. I don't really know how to explain it, but its right. Maybe @pedrobaeza can explain better. |
|
@aheficent To review you are best to just take the last commit, 10f25f4 that is just the changes from v10 to v11 for sale_team |
|
It's ok then. I'd preferred to do that using the oca_dependencies.txt file because now I get some merge conflicts when merging the two branches. |
|
Hmmm, I think I made a mistake then, I'll look on Monday, but I did a merge commit when I probably shouldn't have. Was my first time having to follow this process for multiple dependent modules. |
|
np @gdgellatly as runbot is not working for v11 and I have to test in local anyway it's ok as it is |
|
About including commits of dependent modules: this is another technique not specified in the migration guide. What this does is to allow to test the module in this PR without waiting the dependency to be merged, but has these disadvantages:
|
|
@aheficent As I say, these are straight ports. So the functionality has not changed. I can kind of see both cases, but if people agree I'll add the domain. It's not hard. |
|
I'll probably just create a new branch and cherry pick as we merge up and then force push as we merge each PR. Thats why I'm only doing a few modules at a time in dependent order. In the meantime at least we can get reviews sorted. |
|
@gdgellatly It's ok to me to keep the functionality as it was in v10. Better to create a PR with the fix in v10 and forward port it to v11 after. |
|
@gdgellatly can you drop #99 commits and use |
|
@gdgellatly #99 got merged: you can rebase 😉 |
| <!-- Copyright 2016-17 Eficent Business and IT Consulting Services S.L. | ||
| Copyright 2017-TODAY Serpent Consulting Services Pvt. Ltd. | ||
| License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) --> | ||
| <odoo noupdate="0"> |
operating_unit/README.rst
Outdated
|
|
||
| .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas | ||
| :alt: Try me on Runbot | ||
| :target: https://runbot.odoo-community.org/runbot/213/10.0 |
operating_unit/__init__.py
Outdated
| @@ -0,0 +1,5 @@ | |||
| # © 2015-2017 Eficent | |||
operating_unit/__manifest__.py
Outdated
| "author": "Eficent, " | ||
| "Serpent Consulting Services Pvt. Ltd.," | ||
| "Odoo Community Association (OCA)", | ||
| "website": "http://www.eficent.com", |
There was a problem hiding this comment.
|
|
||
| def setUp(self): | ||
| super(TestSaleTeamOperatingUnit, self).setUp() | ||
| self.res_users_model = self.env['res.users'] |
There was a problem hiding this comment.
.with_context(tracking_disable=True, no_reset_password=True) to avoid mail.thread overhead and avoid email creation overhead (and they are actually sent, BTW :))
There was a problem hiding this comment.
@simahawk Most of those issues were long fixed as part of rebase. Not sure how you even found them given the code was force pushed and overwritten.
- Remove encodings - Bump Version - Fix form view to place under company_id - Test - Fix security rules
Depends on
Just needed a view fix as more_info page is now gone. Put with company as per v10.