OpenUpgrade/OpenUpgrade — pull request #88 by vaab (2014-07-24 15:13:57+00:00)
Title: OpenUpgrade merge odoo new api

Merged with odoo/8.0 last (in particular the api change, a big part of ``openerp/osv/orm.py`` is moved to ``models.py``.

To work out this code I had to make a merge commit that would match all hunks of:

git diff odoo/8.0...OpenUpgrade/8.0 -- :/openerp :\!/openerp/addons/*/migrations/8.* :\!/openerp/openupgrade :\!/openerp/addons/openupgrade_records

Which is the diff between merge-base of odoo/8.0 and OpenUgrapde/8.0 (provided your remote are called odoo and OpenUpgrade). Notice also that I limited to only 'openerp/*' content, excluding folder fully owned by openupgrade (``openerp/addons/base/migrations/8.0.1.3``, ``openerp/addons/openupgrade_records``, ``openerp/openupgrade``). This could be considered as the real addition to legacy code, and the resulting diff is quite small actually.

You can review by comparing the output of the previous command to this one, which will compare the resulting merge commit code tree to the odoo/8.0 code tree (well... the parent commit from the merge that is coming from odoo/8.0 branch):

git diff ou-merge-odoo-new-api^2..ou-merge-odoo-new-api -- :/openerp :\!/openerp/addons/*/migrations/8.* :\!/openerp/openupgrade :\!/openerp/addons/openupgrade_records

Then only difference is that hunks from ``osv/orm.py`` should have moved in ``models.py``.

The excluded directory where checkouted directly from OpenUpgrade/8.0 version with:

git co OpenUpgrade/8.0 -- addons/*/migrations openerp/addons/*/migrations openerp/addons/openupgrade_records openerp/openupgrade scripts/

As we should be sure that openerp/ and addons/*/migrations/8* scripts/* are ok, you might then be interested to compare:

git diff odoo/8.0...OpenUpgrade/8.0 -- :/ :\!/addons/*/migrations/8* :\!/openerp :\!/scripts

with:

git diff ou-merge-odoo-new-api^2..ou-merge-odoo-new-api -- :/ :\!/addons/*/migrations/8* :\!/openerp :\!/scripts

Some modifications that where made on ``addons/product/product.py`` are now integrated in the odoo code.

Sorry if this code doesn't fit your policies. I'm trying my best to give you something readable.