Merge lp:~therp-nl/openupgrade-server/7.0-lp1111298-remove_currency_companies into lp:openupgrade-server

Proposed by Stefan Rijnhart (Opener)
Status: Merged
Merged at revision: 4614
Proposed branch: lp:~therp-nl/openupgrade-server/7.0-lp1111298-remove_currency_companies
Merge into: lp:openupgrade-server
Diff against target: 27 lines (+13/-0)
1 file modified
openerp/addons/base/migrations/7.0.1.3/post-migration.py (+13/-0)
To merge this branch: bzr merge lp:~therp-nl/openupgrade-server/7.0-lp1111298-remove_currency_companies
Reviewer Review Type Date Requested Status
Holger Brunn (Therp) code review Approve
Review via email: mp+166216@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Holger Brunn (Therp) (hbrunn) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'openerp/addons/base/migrations/7.0.1.3/post-migration.py'
--- openerp/addons/base/migrations/7.0.1.3/post-migration.py 2013-05-03 12:57:10 +0000
+++ openerp/addons/base/migrations/7.0.1.3/post-migration.py 2013-05-29 10:54:27 +0000
@@ -164,6 +164,18 @@
164 }164 }
165 partner_obj.write(cr, SUPERUSER_ID, row[1], partner_vals)165 partner_obj.write(cr, SUPERUSER_ID, row[1], partner_vals)
166166
167def reset_currency_companies(cr, pool):
168 """
169 Having a company on currencies affects multicompany databases
170 https://bugs.launchpad.net/openobject-server/+bug/1111298
171 """
172 currency_ids = pool.get('res.currency').search(
173 cr, SUPERUSER_ID, [('company_id', '!=', False)],
174 {'active_test': False})
175 pool.get('res.currency').write(
176 cr, SUPERUSER_ID, currency_ids,
177 {'company_id': False})
178
167@openupgrade.migrate()179@openupgrade.migrate()
168def migrate(cr, version):180def migrate(cr, version):
169 pool = pooler.get_pool(cr.dbname)181 pool = pooler.get_pool(cr.dbname)
@@ -176,3 +188,4 @@
176 migrate_company(cr)188 migrate_company(cr)
177 migrate_partner_address(cr, pool)189 migrate_partner_address(cr, pool)
178 update_users_partner(cr, pool)190 update_users_partner(cr, pool)
191 reset_currency_companies(cr, pool)

Subscribers

People subscribed via source and target branches