Merge lp:~camptocamp/openobject-server/trunk-proposed-cleanups into lp:openobject-server

[Alexandre Fayolle - camptocamp]

Refactoring: replace deprecated osv.osv base class with openerp.osv.orm.Model
             remove deprecated instantiation of model classes
             fix a couple of problems found on the runbot (part of lp:1050267)

The change was made with some shell scripts, heavy use of pylint, some eyeballing and the runbot.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Why not keep the simpler import (from osv import orm, fields) and extend from orm.Model?

review: Needs Information

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

No special reason, that's closer to the style I spontaneously write. I have no strong feeling about this, though, so if it helps getting this proposal merged I can update the changeset, and take the opportunity to update it to the latest trunk head.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

> Why not keep the simpler import (from osv import orm, fields) and extend from
> orm.Model?

Hello Xavier,

I've updated the merge proposal. I've also set you as reviewer for https://code.launchpad.net/~c2c/openobject-addons/trunk-proposed-cleanups/+merge/102832 which is very similar, but works on the addons rather than on the server.

Both changeset have been tested on the runbot and produce a "green" result, which is encouraging. I had to go a bit beyond the original scope of the patches to achieve this, as some problems were breaking the tests.

If these two MP are accepted (which I hope), it would be great if the message was sent internally and if the merging policy for trunk was updated to require the merged changeset to match this (use orm.Model, don't instantiate the model).

Thanks for your time.

[Cristian Salamea (ovnicraft)]

> Why not keep the simpler import (from osv import orm, fields) and extend from
> orm.Model?

IMO refactor must include CamelCase for clases, i am agree to extend from orm.Model but we can:

from Osv import Orm, Fields

class MyObject(Orm.Model):
    pass

looks pythonic.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

> > Why not keep the simpler import (from osv import orm, fields) and extend
> from
> > orm.Model?
>
> IMO refactor must include CamelCase for clases, i am agree to extend from
> orm.Model but we can:
>
> from Osv import Orm, Fields
>
> class MyObject(Orm.Model):
> pass
>
> looks pythonic.

@ovnicraft I'm totally opposed to renaming the module with non all-lowercase names (in other word, NO to "from Osv import Orm, Fields")

As for renaming class stock_picking to class StockPicking, I'm not sure. I could do this in another merge request, but I'd rather have this one integrated as soon as possible, because maintaining the patch branch against the trunk is quite costly.

[lp:~camptocamp/openobject-server/trunk-proposed-cleanups]

4158. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-09-17

[MRG] from trunk

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

updated my branch with latest trunk. Tests are green

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

For the record, extract from chat with Stéphane Wirtel:

(10:19:02) Stephane Wirtel: simple question, dans ton merge de lundi, tu utilises orm.Model au lieu d'osv.Model, tu as une raison ?
(10:32:18) alf: utiliser le module dans lequel la classe est définie
(10:32:59) alf: plutôt que osv qui ne fait qu'importer Model depuis orm
(10:33:45) alf: ça évite de casser tout le code le jour où on supprime l'import de Model dans osv.py parce qu'il n'est pas utilisé dans ce module
(10:34:58) alf: en général c'est une bonne pratique de ne pas se reposer sur ces imports "transitifs"
(10:35:22) alf: à part pour les trucs qui sont définis dans __init__.py parce que dans ce cas on peut penser qu'il s'agit de l'api du package

rough translation:

SW: simple question, in your MP you use orm.Model instead of osv.Model. Why?

ME: to use the module in which the class is defined (orm) rather than osv which is importing the class from orm. This avoids breaking all the code when Model is no longer imported in osv.py (e.g. because it is no longer used in that module). As a general rule, it is a good practice not to rely on these 'transitive' imports, apart from things which are imported in __init__.py because these can be considered as the package's API.

more details:

What I call a transitive import is A.py defines foo. B import foo from A (and does stuff with it). C import foo from B and does stuff with it. There are several problems with this:

1. changing the import in B can have unexpected side effects which are difficult to anticipate (B's unittest will probably still pass, but C's unittest will suddenly break)
2. (removing the import and) redefining foo in B can break C in subtle ways
3. when working on C, if you want to look for the definition of foo, you have to work your way through the whole import chain. Here we are dealing with a simple chain, but I've seen longer chains (sometimes with "import *" embedded for extra pleasure and it gets very messy very quickly)
4. this way of doing imports makes it easy to create import loops (and there are enough of these in openerp so far)

It would be quite different if the Model, etc... classes were exported by the osv package and not the osv module: in that architecture, the whole osv package's API would be well defined in the __init__.py file and all the submodules would be implementation details with which the common addon developper is not supposed to mess.

[lp:~camptocamp/openobject-server/trunk-proposed-cleanups]

4159. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-10-03

[MRG] from trunk

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

updated the branch to the latest trunk. tests are green

[Xavier (Open ERP) (xmo-deactivatedaccount)]

review: Approve

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

Reading the MP in its current state should give an idea of what the goal is. Maintaining this patch against trunk is time consuming, I'm going to stop doing so, but of course I'll gladly update the patch for a clean merge once I get a signal that the merge is going to happen.

[Antony Lesuisse (OpenERP) (al-openerp)]

Can you rebase on trunk since all imports have been cleaned

[lp:~camptocamp/openobject-server/trunk-proposed-cleanups]

4160. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-19

update to trunk

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

@al-openerp: Thanks for getting back on this. I'm doing this and making sure this branch and its friend on openobject-addons are green on runbot, and I'll ping you once this is in a mergeable state.

[lp:~camptocamp/openobject-server/trunk-proposed-cleanups]

4161. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-20

[FIX] missing import and alias in super call

4162. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-20

[REF] a few more osv.osv->orm.Model replacements

4163. By Alexandre Fayolle - camptocamp on 2012-12-20

[MRG] update to current trunk

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

@al-openerp: this branch as well as its cousin branch on the openobject-addons project have been updated to a recent trunk version, and the runbot is green.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Just a little one that should be changed otherwise LGTM

191 +class ir_attachment(osv.Model):

review: Approve (code review)

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

@yvaucher-c2c: that's the case in the latest head, AFAICT

[David BEAL (ak) (davidbeal)]

Really good job Alexandre,

I hope OpenERP will hear your proposal, otherwise OpenERP 26 will have a lot unvalid code

A lot of developer add yet class call in their module (nice module however). It is not useful since 2.5 years

http://bazaar.launchpad.net/~openerp-india/openerp-india/trunk/view/head:/quotation_template/quotation_template.py#L101

Please update your snippets and don't copy/paste

OpenERP is a really good solution, easy to understand/extend, I would like it will continue to be like up to 50 years further.

Perhaps only one solution => break compatibility shorter with older code

Thanks for all those which contribute to clean code

[Antony Lesuisse (OpenERP) (al-openerp)]

Can you rebase on trunk, think only the osv.osv -> osv.Model changes will remain.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

@Alexandre l.191 is osv.Model instead of orm.Model my comment wasn't clear enough

Unmerged revisions

4163. By Alexandre Fayolle - camptocamp on 2012-12-20

[MRG] update to current trunk

4162. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-20

[REF] a few more osv.osv->orm.Model replacements

4161. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-20

[FIX] missing import and alias in super call

4160. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-12-19

update to trunk

4159. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-10-03

[MRG] from trunk

4158. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-09-17

[MRG] from trunk

4157. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-09-13

[REF] get rid of deprecated model class instanciation

4156. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-09-13

[FIX] fix name errors and add missing imports

4155. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-09-13

[FIX] remove dead code

4154. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-09-13

[REVERT] revert the past 5 commits

there are some circular imports, and theses changes broke a lot of things... I'll to a safer change

=== modified file 'openerp/addons/base/ir/ir_actions.py'
--- openerp/addons/base/ir/ir_actions.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_actions.py	2012-12-20 14:23:22 +0000
@@ -27,7 +27,7 @@
 
 from openerp import SUPERUSER_ID
 from openerp import netsvc, tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.report.report_sxw import report_sxw, report_rml
 from openerp.tools.config import config
 from openerp.tools.safe_eval import safe_eval as eval
@@ -35,7 +35,7 @@
 
 _logger = logging.getLogger(__name__)
 
-class actions(osv.osv):
+class actions(orm.Model):
     _name = 'ir.actions.actions'
     _table = 'ir_actions'
     _order = 'name'
@@ -50,10 +50,9 @@
     _defaults = {
         'usage': lambda *a: False,
     }
-actions()
-
-
-class report_xml(osv.osv):
+
+
+class report_xml(orm.Model):
 
     def _report_content(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -150,9 +149,8 @@
         'attachment': False,
     }
 
-report_xml()
 
-class act_window(osv.osv):
+class act_window(orm.Model):
     _name = 'ir.actions.act_window'
     _table = 'ir_act_window'
     _inherit = 'ir.actions.actions'
@@ -274,7 +272,6 @@
         res_id = dataobj.browse(cr, uid, data_id, context).res_id
         return self.read(cr, uid, res_id, [], context)
 
-act_window()
 
 VIEW_TYPES = [
     ('tree', 'Tree'),
@@ -283,7 +280,7 @@
     ('calendar', 'Calendar'),
     ('gantt', 'Gantt'),
     ('kanban', 'Kanban')]
-class act_window_view(osv.osv):
+class act_window_view(orm.Model):
     _name = 'ir.actions.act_window.view'
     _table = 'ir_act_window_view'
     _rec_name = 'view_id'
@@ -304,9 +301,8 @@
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'act_window_view_unique_mode_per_action\'')
         if not cr.fetchone():
             cr.execute('CREATE UNIQUE INDEX act_window_view_unique_mode_per_action ON ir_act_window_view (act_window_id, view_mode)')
-act_window_view()
 
-class act_wizard(osv.osv):
+class act_wizard(orm.Model):
     _name = 'ir.actions.wizard'
     _inherit = 'ir.actions.actions'
     _table = 'ir_act_wizard'
@@ -324,9 +320,8 @@
         'type': 'ir.actions.wizard',
         'multi': False,
     }
-act_wizard()
 
-class act_url(osv.osv):
+class act_url(orm.Model):
     _name = 'ir.actions.act_url'
     _table = 'ir_act_url'
     _inherit = 'ir.actions.actions'
@@ -346,7 +341,6 @@
         'type': 'ir.actions.act_url',
         'target': 'new'
     }
-act_url()
 
 def model_get(self, cr, uid, context=None):
     wkf_pool = self.pool.get('workflow')
@@ -363,15 +357,14 @@
 
     return res
 
-class ir_model_fields(osv.osv):
+class ir_model_fields(orm.Model):
     _inherit = 'ir.model.fields'
     _rec_name = 'field_description'
     _columns = {
         'complete_name': fields.char('Complete Name', size=64, select=1),
     }
-ir_model_fields()
 
-class server_object_lines(osv.osv):
+class server_object_lines(orm.Model):
     _name = 'ir.server.object.lines'
     _sequence = 'ir_actions_id_seq'
     _columns = {
@@ -389,12 +382,11 @@
     _defaults = {
         'type': 'equation',
     }
-server_object_lines()
 
 ##
 # Actions that are run on the server side
 #
-class actions_server(osv.osv):
+class actions_server(orm.Model):
 
     def _select_signals(self, cr, uid, context=None):
         cr.execute("""SELECT distinct w.osv, t.signal FROM wkf w, wkf_activity a, wkf_transition t
@@ -715,6 +707,8 @@
                         expr = exp.value
                     res[exp.col1.name] = expr
 
+                obj_pool = None
+                res_id = False
                 obj_pool = self.pool.get(action.srcmodel_id.model)
                 res_id = obj_pool.create(cr, uid, res)
                 if action.record_id:
@@ -737,23 +731,21 @@
 
         return False
 
-actions_server()
 
-class act_window_close(osv.osv):
+class act_window_close(orm.Model):
     _name = 'ir.actions.act_window_close'
     _inherit = 'ir.actions.actions'
     _table = 'ir_actions'
     _defaults = {
         'type': 'ir.actions.act_window_close',
     }
-act_window_close()
 
 # This model use to register action services.
 TODO_STATES = [('open', 'To Do'),
                ('done', 'Done')]
 TODO_TYPES = [('manual', 'Launch Manually'),('once', 'Launch Manually Once'),
               ('automatic', 'Launch Automatically')]
-class ir_actions_todo(osv.osv):
+class ir_actions_todo(orm.Model):
     """
     Configuration Wizards
     """
@@ -849,9 +841,8 @@
             'todo': len(total) - len(done)
         }
 
-ir_actions_todo()
 
-class act_client(osv.osv):
+class act_client(orm.Model):
     _name = 'ir.actions.client'
     _inherit = 'ir.actions.actions'
     _table = 'ir_act_client'
@@ -892,6 +883,5 @@
         'context': '{}',
 
     }
-act_client()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/ir/ir_attachment.py'
--- openerp/addons/base/ir/ir_attachment.py	2012-12-20 02:37:21 +0000
+++ openerp/addons/base/ir/ir_attachment.py	2012-12-20 14:23:22 +0000
@@ -25,9 +25,9 @@
 import re
 
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv, orm
 
-class ir_attachment(osv.osv):
+class ir_attachment(osv.Model):
     """Attachments are used to link binary files or url to any openerp document.
 
     External attachment storage
 
=== modified file 'openerp/addons/base/ir/ir_config_parameter.py'
--- openerp/addons/base/ir/ir_config_parameter.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/ir/ir_config_parameter.py	2012-12-20 14:23:22 +0000
@@ -26,7 +26,7 @@
 import datetime
 
 from openerp import SUPERUSER_ID
-from openerp.osv import osv, fields
+from openerp.osv import fields, orm
 from openerp.tools import misc, config
 
 """
@@ -38,7 +38,7 @@
     "web.base.url": lambda: "http://localhost:%s" % config.get('xmlrpc_port'),
 }
 
-class ir_config_parameter(osv.osv):
+class ir_config_parameter(orm.Model):
     """Per-database storage of configuration key-value pairs."""
 
     _name = 'ir.config_parameter'
 
=== modified file 'openerp/addons/base/ir/ir_cron.py'
--- openerp/addons/base/ir/ir_cron.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_cron.py	2012-12-20 14:23:22 +0000
@@ -26,7 +26,7 @@
 
 import openerp
 from openerp import netsvc
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
@@ -45,7 +45,7 @@
     'minutes': lambda interval: relativedelta(minutes=interval),
 }
 
-class ir_cron(osv.osv):
+class ir_cron(orm.Model):
     """ Model describing cron jobs (also called actions or tasks).
     """
 
 
=== modified file 'openerp/addons/base/ir/ir_default.py'
--- openerp/addons/base/ir/ir_default.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/ir/ir_default.py	2012-12-20 14:23:22 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, orm
 
-class ir_default(osv.osv):
+class ir_default(orm.Model):
     _name = 'ir.default'
     _columns = {
         'field_tbl': fields.char('Object',size=64),
@@ -43,7 +43,6 @@
     _defaults = {
         'company_id': _get_company_id,
     }
-ir_default()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/ir/ir_exports.py'
--- openerp/addons/base/ir/ir_exports.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/ir/ir_exports.py	2012-12-20 14:23:22 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
-
-
-class ir_exports(osv.osv):
+from openerp.osv import fields, orm
+
+
+class ir_exports(orm.Model):
     _name = "ir.exports"
     _order = 'name'
     _columns = {
@@ -31,17 +31,15 @@
         'export_fields': fields.one2many('ir.exports.line', 'export_id',
                                          'Export ID'),
     }
-ir_exports()
-
-
-class ir_exports_line(osv.osv):
+
+
+class ir_exports_line(orm.Model):
     _name = 'ir.exports.line'
     _order = 'id'
     _columns = {
         'name': fields.char('Field Name', size=64),
         'export_id': fields.many2one('ir.exports', 'Export', select=True, ondelete='cascade'),
     }
-ir_exports_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'openerp/addons/base/ir/ir_filters.py'
--- openerp/addons/base/ir/ir_filters.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_filters.py	2012-12-20 14:23:22 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from openerp import exceptions
-from openerp.osv import osv, fields
+from openerp.osv import fields, orm
 from openerp.tools.translate import _
 
-class ir_filters(osv.osv):
+class ir_filters(orm.Model):
     _name = 'ir.filters'
     _description = 'Filters'
 
@@ -142,6 +142,5 @@
         'is_default': False
     }
 
-ir_filters()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/ir/ir_mail_server.py'
--- openerp/addons/base/ir/ir_mail_server.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_mail_server.py	2012-12-20 14:23:22 +0000
@@ -31,7 +31,7 @@
 import smtplib
 import threading
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.translate import _
 from openerp.tools import html2text
 import openerp.tools as tools
@@ -159,7 +159,7 @@
     return COMMASPACE.join(extract_rfc2822_addresses(header_text_utf8))
 
  
-class ir_mail_server(osv.osv):
+class ir_mail_server(orm.Model):
     """Represents an SMTP server, able to send outgoing emails, with SSL and TLS capabilities."""
     _name = "ir.mail_server"
 
 
=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py	2012-12-14 13:25:33 +0000
+++ openerp/addons/base/ir/ir_model.py	2012-12-20 14:23:22 +0000
@@ -27,8 +27,7 @@
 import openerp
 from openerp import SUPERUSER_ID
 from openerp import netsvc, pooler, tools
-from openerp.osv import fields,osv
-from openerp.osv.orm import Model
+from openerp.osv import fields, osv, orm
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools import config
 from openerp.tools.translate import _
@@ -56,12 +55,12 @@
     installed_modules = set(x['name'] for x in installed_module_names)
 
     result = {}
-    xml_ids = osv.osv._get_xml_ids(self, cr, uid, ids)
+    xml_ids = orm.Model._get_xml_ids(self, cr, uid, ids)
     for k,v in xml_ids.iteritems():
         result[k] = ', '.join(sorted(installed_modules & set(xml_id.split('.')[0] for xml_id in v)))
     return result
 
-class ir_model(osv.osv):
+class ir_model(orm.Model):
     _name = 'ir.model'
     _description = "Models"
     _order = 'model'
@@ -198,7 +197,7 @@
         return res
 
     def instanciate(self, cr, user, model, context=None):
-        class x_custom_model(osv.osv):
+        class x_custom_model(orm.Model):
             pass
         x_custom_model._name = model
         x_custom_model._module = False
@@ -212,7 +211,7 @@
         x_custom_model._rec_name = x_name
         a._rec_name = x_name
 
-class ir_model_fields(osv.osv):
+class ir_model_fields(orm.Model):
     _name = 'ir.model.fields'
     _description = "Fields"
 
@@ -468,7 +467,7 @@
                 obj._auto_init(cr, ctx)
         return res
 
-class ir_model_constraint(Model):
+class ir_model_constraint(orm.Model):
     """
     This model tracks PostgreSQL foreign keys and constraints used by OpenERP
     models.
@@ -537,7 +536,7 @@
 
         self.unlink(cr, uid, ids, context)
 
-class ir_model_relation(Model):
+class ir_model_relation(orm.Model):
     """
     This model tracks PostgreSQL tables used to implement OpenERP many2many
     relations.
@@ -590,7 +589,7 @@
 
         cr.commit()
 
-class ir_model_access(osv.osv):
+class ir_model_access(orm.Model):
     _name = 'ir.model.access'
     _columns = {
         'name': fields.char('Name', size=64, required=True, select=True),
@@ -769,7 +768,7 @@
         res = super(ir_model_access, self).unlink(cr, uid, *args, **argv)
         return res
 
-class ir_model_data(osv.osv):
+class ir_model_data(orm.Model):
     """Holds external identifier keys for records in the database.
        This has two main uses:
 
@@ -832,7 +831,7 @@
     ]
 
     def __init__(self, pool, cr):
-        osv.osv.__init__(self, pool, cr)
+        orm.Model.__init__(self, pool, cr)
         self.doinit = True
         # also stored in pool to avoid being discarded along with this osv instance
         if getattr(pool, 'model_data_reference_ids', None) is None:
 
=== modified file 'openerp/addons/base/ir/ir_rule.py'
--- openerp/addons/base/ir/ir_rule.py	2012-12-17 14:30:29 +0000
+++ openerp/addons/base/ir/ir_rule.py	2012-12-20 14:23:22 +0000
@@ -22,11 +22,11 @@
 
 from openerp import SUPERUSER_ID
 from openerp import tools
-from openerp.osv import fields, osv, expression
+from openerp.osv import fields, osv, orm, expression
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.misc import unquote as unquote
 
-class ir_rule(osv.osv):
+class ir_rule(orm.Model):
     _name = 'ir.rule'
     _order = 'name'
     _MODES = ['read', 'write', 'create', 'unlink']
@@ -172,7 +172,6 @@
         self.clear_cache(cr,uid)
         return res
 
-ir_rule()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'openerp/addons/base/ir/ir_sequence.py'
--- openerp/addons/base/ir/ir_sequence.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_sequence.py	2012-12-20 14:23:22 +0000
@@ -23,12 +23,12 @@
 import time
 
 import openerp
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
-class ir_sequence_type(openerp.osv.osv.osv):
+class ir_sequence_type(orm.Model):
     _name = 'ir.sequence.type'
     _order = 'name'
     _columns = {
@@ -44,7 +44,7 @@
     cr.execute('select code, name from ir_sequence_type')
     return cr.fetchall()
 
-class ir_sequence(openerp.osv.osv.osv):
+class ir_sequence(orm.Model):
     """ Sequence model.
 
     The sequence model allows to define and use so-called sequence objects.
 
=== modified file 'openerp/addons/base/ir/ir_translation.py'
--- openerp/addons/base/ir/ir_translation.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_translation.py	2012-12-20 14:23:22 +0000
@@ -23,7 +23,7 @@
 
 from openerp import tools
 import openerp.modules
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
@@ -145,7 +145,7 @@
         cr.execute("DROP TABLE %s" % self._table_name)
         return True
 
-class ir_translation(osv.osv):
+class ir_translation(orm.Model):
     _name = "ir.translation"
     _log_access = False
 
 
=== modified file 'openerp/addons/base/ir/ir_ui_menu.py'
--- openerp/addons/base/ir/ir_ui_menu.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_ui_menu.py	2012-12-20 14:23:22 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2012 OpenERP SA (<http://openerp.com>).
+#    Copyright (C) 2010-2011 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -26,7 +26,7 @@
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp import tools
 import openerp.modules
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp import SUPERUSER_ID
 
@@ -38,7 +38,7 @@
             return True
     return False
 
-class ir_ui_menu(osv.osv):
+class ir_ui_menu(orm.Model):
     _name = 'ir.ui.menu'
 
     def __init__(self, *args, **kwargs):
 
=== modified file 'openerp/addons/base/ir/ir_ui_view.py'
--- openerp/addons/base/ir/ir_ui_view.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_ui_view.py	2012-12-20 14:23:22 +0000
@@ -24,14 +24,14 @@
 import os
 
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv, orm
 from openerp.tools import graph
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.view_validation import valid_view
 
 _logger = logging.getLogger(__name__)
 
-class view_custom(osv.osv):
+class view_custom(orm.Model):
     _name = 'ir.ui.view.custom'
     _order = 'create_date desc'  # search(limit=1) should return the last customization
     _columns = {
@@ -46,7 +46,7 @@
         if not cr.fetchone():
             cr.execute('CREATE INDEX ir_ui_view_custom_user_id_ref_id ON ir_ui_view_custom (user_id, ref_id)')
 
-class view(osv.osv):
+class view(orm.Model):
     _name = 'ir.ui.view'
 
     def _type_field(self, cr, uid, ids, name, args, context=None):
@@ -99,7 +99,7 @@
             else:
                 inferred_type = etree.fromstring(values['arch'].encode('utf8')).tag
             values['name'] = "%s %s" % (values['model'], inferred_type)
-        return super(osv.osv, self).create(cr, uid, values, context)
+        return super(orm.Model, self).create(cr, uid, values, context)
 
     def _relaxng(self):
         if not self._relaxng_validator:
@@ -273,7 +273,7 @@
                 'blank_nodes': blank_nodes,
                 'node_parent_field': _Model_Field,}
 
-class view_sc(osv.osv):
+class view_sc(orm.Model):
     _name = 'ir.ui.view_sc'
     _columns = {
         'name': fields.char('Shortcut Name', size=64), # Kept for backwards compatibility only - resource name used instead (translatable)
 
=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/ir/ir_values.py	2012-12-20 14:23:22 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 import pickle
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.osv.orm import except_orm
 
 EXCLUDED_FIELDS = set((
@@ -37,7 +37,7 @@
                ]
 
 
-class ir_values(osv.osv):
+class ir_values(orm.Model):
     """Holds internal model-specific action bindings and user-defined default
        field values. definitions. This is a legacy internal model, mixing
        two different concepts, and will likely be updated or replaced in a
 
=== modified file 'openerp/addons/base/ir/wizard/wizard_menu.py'
--- openerp/addons/base/ir/wizard/wizard_menu.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/ir/wizard/wizard_menu.py	2012-12-20 14:23:22 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class wizard_model_menu(osv.osv_memory):
+class wizard_model_menu(orm.TransientModel):
     _name = 'wizard.ir.model.menu.create'
     _columns = {
         'menu_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
 
=== modified file 'openerp/addons/base/ir/workflow/workflow.py'
--- openerp/addons/base/ir/workflow/workflow.py	2012-10-12 12:24:19 +0000
+++ openerp/addons/base/ir/workflow/workflow.py	2012-12-20 14:23:22 +0000
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp import netsvc
 
-class workflow(osv.osv):
+class workflow(orm.Model):
     _name = "workflow"
     _table = "wkf"
     _order = "name"
@@ -66,9 +66,8 @@
         wf_service.clear_cache(cr, user)
         return super(workflow, self).create(cr, user, vals, context=context)
 
-workflow()
 
-class wkf_activity(osv.osv):
+class wkf_activity(orm.Model):
     _name = "workflow.activity"
     _table = "wkf_activity"
     _order = "name"
@@ -100,9 +99,8 @@
                                  _('Please make sure no workitems refer to an activity before deleting it!'))
         super(wkf_activity, self).unlink(cr, uid, ids, context=context)
 
-wkf_activity()
 
-class wkf_transition(osv.osv):
+class wkf_transition(orm.Model):
     _table = "wkf_transition"
     _name = "workflow.transition"
     _rec_name = 'signal'
@@ -125,9 +123,8 @@
     _defaults = {
         'condition': lambda *a: 'True',
     }
-wkf_transition()
 
-class wkf_instance(osv.osv):
+class wkf_instance(orm.Model):
     _table = "wkf_instance"
     _name = "workflow.instance"
     _rec_name = 'res_type'
@@ -147,9 +144,8 @@
         if not cr.fetchone():
             cr.execute('CREATE INDEX wkf_instance_res_id_wkf_id_index ON wkf_instance (res_id, wkf_id)')
 
-wkf_instance()
 
-class wkf_workitem(osv.osv):
+class wkf_workitem(orm.Model):
     _table = "wkf_workitem"
     _name = "workflow.workitem"
     _log_access = False
@@ -161,9 +157,8 @@
         'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
         'state': fields.char('Status', size=64, select=True),
     }
-wkf_workitem()
 
-class wkf_triggers(osv.osv):
+class wkf_triggers(orm.Model):
     _table = "wkf_triggers"
     _name = "workflow.triggers"
     _log_access = False
@@ -178,7 +173,6 @@
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'wkf_triggers_res_id_model_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX wkf_triggers_res_id_model_index ON wkf_triggers (res_id, model)')
-wkf_triggers()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py	2012-12-17 14:30:29 +0000
+++ openerp/addons/base/module/module.py	2012-12-20 14:23:22 +0000
@@ -46,7 +46,7 @@
     'nodestroy':True,
 }
 
-class module_category(osv.osv):
+class module_category(orm.Model):
     _name = "ir.module.category"
     _description = "Application"
 
@@ -662,7 +662,7 @@
             if not mod.description:
                 _logger.warning('module %s: description is empty !', mod.name)
 
-class module_dependency(osv.osv):
+class module_dependency(orm.Model):
     _name = "ir.module.module.dependency"
     _description = "Module dependency"
 
 
=== modified file 'openerp/addons/base/module/wizard/base_export_language.py'
--- openerp/addons/base/module/wizard/base_export_language.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_export_language.py	2012-12-20 14:23:22 +0000
@@ -23,13 +23,13 @@
 import cStringIO
 
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp.tools.misc import get_iso_codes
 
 NEW_LANG_KEY = '__new__'
 
-class base_language_export(osv.osv_memory):
+class base_language_export(orm.TransientModel):
     _name = "base.language.export"
 
     def _get_languages(self, cr, uid, context):
 
=== modified file 'openerp/addons/base/module/wizard/base_import_language.py'
--- openerp/addons/base/module/wizard/base_import_language.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_import_language.py	2012-12-20 14:23:22 +0000
@@ -23,9 +23,9 @@
 from tempfile import TemporaryFile
 
 from openerp import tools
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 
-class base_language_import(osv.osv_memory):
+class base_language_import(orm.TransientModel):
     """ Language Import """
 
     _name = "base.language.import"
 
=== modified file 'openerp/addons/base/module/wizard/base_language_install.py'
--- openerp/addons/base/module/wizard/base_language_install.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_language_install.py	2012-12-20 14:23:22 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from openerp import tools
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.translate import _
 
-class base_language_install(osv.osv_memory):
+class base_language_install(orm.TransientModel):
     """ Install Language"""
 
     _name = "base.language.install"
 
=== modified file 'openerp/addons/base/module/wizard/base_module_configuration.py'
--- openerp/addons/base/module/wizard/base_module_configuration.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_module_configuration.py	2012-12-20 14:23:22 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import orm
 from openerp.tools.translate import _
 
-class base_module_configuration(osv.osv_memory):
+class base_module_configuration(orm.TransientModel):
 
     _name = "base.module.configuration"
 
@@ -48,6 +48,5 @@
         config_pool = self.pool.get('res.config')
         return config_pool.start(cr, uid, ids, context=context)
 
-base_module_configuration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/module/wizard/base_module_import.py'
--- openerp/addons/base/module/wizard/base_module_import.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_module_import.py	2012-12-20 14:23:22 +0000
@@ -25,12 +25,12 @@
 import zipfile
 
 from openerp import tools
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.translate import _
 
 ADDONS_PATH = tools.config['addons_path'].split(",")[-1]
 
-class base_module_import(osv.osv_memory):
+class base_module_import(orm.TransientModel):
     """ Import Module """
 
     _name = "base.module.import"
 
=== modified file 'openerp/addons/base/module/wizard/base_module_scan.py'
--- openerp/addons/base/module/wizard/base_module_scan.py	2012-12-17 14:30:29 +0000
+++ openerp/addons/base/module/wizard/base_module_scan.py	2012-12-20 14:23:22 +0000
@@ -24,9 +24,9 @@
 import zipfile
 
 from openerp import tools
-from openerp.osv import osv
+from openerp.osv import orm
 
-class base_module_scan(osv.osv_memory):
+class base_module_scan(orm.TransientModel):
     """ scan module """
 
     _name = "base.module.scan"
@@ -69,6 +69,5 @@
                         mod_obj.write(cr, uid, [mod['id']], {'state': 'uninstalled'})
         return {}
 
-base_module_scan()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/module/wizard/base_module_update.py'
--- openerp/addons/base/module/wizard/base_module_update.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_module_update.py	2012-12-20 14:23:22 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 
-class base_module_update(osv.osv_memory):
+class base_module_update(orm.TransientModel):
     """ Update Module """
 
     _name = "base.module.update"
 
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade.py'
--- openerp/addons/base/module/wizard/base_module_upgrade.py	2012-11-02 09:31:10 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade.py	2012-12-20 14:23:22 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from openerp import pooler
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.translate import _
 
-class base_module_upgrade(osv.osv_memory):
+class base_module_upgrade(orm.TransientModel):
     """ Module Upgrade """
 
     _name = "base.module.upgrade"
 
=== modified file 'openerp/addons/base/module/wizard/base_update_translations.py'
--- openerp/addons/base/module/wizard/base_update_translations.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/module/wizard/base_update_translations.py	2012-12-20 14:23:22 +0000
@@ -22,10 +22,10 @@
 import cStringIO
 
 from openerp import tools
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.translate import _
 
-class base_update_translations(osv.osv_memory):
+class base_update_translations(orm.TransientModel):
     def _get_languages(self, cr, uid, context):
         lang_obj = self.pool.get('res.lang')
         ids = lang_obj.search(cr, uid, ['&', ('active', '=', True), ('translatable', '=', True),])
 
=== modified file 'openerp/addons/base/res/ir_property.py'
--- openerp/addons/base/res/ir_property.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/res/ir_property.py	2012-12-20 14:23:22 +0000
@@ -21,14 +21,14 @@
 
 import time
 
-from openerp.osv import osv,fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.misc import attrgetter
 
 # -------------------------------------------------------------------------
 # Properties
 # -------------------------------------------------------------------------
 
-class ir_property(osv.osv):
+class ir_property(orm.Model):
     _name = 'ir.property'
 
     def _models_field_get(self, cr, uid, field_key, field_value, context=None):
@@ -188,7 +188,6 @@
                   '|', ('company_id', '=', cid), ('company_id', '=', False)]
         return domain
 
-ir_property()
 
 
 
 
=== modified file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/res/res_bank.py	2012-12-20 14:23:22 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class Bank(osv.osv):
+class Bank(orm.Model):
     _description='Bank'
     _name = 'res.bank'
     _order = 'name'
@@ -51,10 +51,9 @@
             result.append((bank.id, (bank.bic and (bank.bic + ' - ') or '') + bank.name))
         return result
 
-Bank()
-
-
-class res_partner_bank_type(osv.osv):
+
+
+class res_partner_bank_type(orm.Model):
     _description='Bank Account Type'
     _name = 'res.partner.bank.type'
     _order = 'name'
@@ -67,9 +66,8 @@
     _defaults = {
         'format_layout': lambda *args: "%(bank_name)s: %(acc_number)s"
     }
-res_partner_bank_type()
 
-class res_partner_bank_type_fields(osv.osv):
+class res_partner_bank_type_fields(orm.Model):
     _description='Bank type fields'
     _name = 'res.partner.bank.type.field'
     _order = 'name'
@@ -80,10 +78,9 @@
         'readonly': fields.boolean('Readonly'),
         'size': fields.integer('Max. Size'),
     }
-res_partner_bank_type_fields()
-
-
-class res_partner_bank(osv.osv):
+
+
+class res_partner_bank(orm.Model):
     '''Bank Accounts'''
     _name = "res.partner.bank"
     _rec_name = "acc_number"
@@ -234,6 +231,5 @@
             result['state_id'] = part.state_id.id
         return {'value': result}
 
-res_partner_bank()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/res/res_company.py'
--- openerp/addons/base/res/res_company.py	2012-12-17 12:59:02 +0000
+++ openerp/addons/base/res/res_company.py	2012-12-20 14:23:22 +0000
@@ -23,12 +23,12 @@
 
 import openerp
 from openerp import SUPERUSER_ID, tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools import image_resize_image
 
-class multi_company_default(osv.osv):
+class multi_company_default(orm.Model):
     """
     Manage multi company default value
     """
@@ -68,9 +68,8 @@
         default['name'] = company.name + _(' (copy)')
         return super(multi_company_default, self).copy(cr, uid, id, default, context=context)
 
-multi_company_default()
 
-class res_company(osv.osv):
+class res_company(orm.Model):
     _name = "res.company"
     _description = 'Companies'
     _order = 'name'
 
=== modified file 'openerp/addons/base/res/res_config.py'
--- openerp/addons/base/res/res_config.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/res/res_config.py	2012-12-20 14:23:22 +0000
@@ -22,13 +22,13 @@
 from operator import attrgetter
 
 from openerp import pooler
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools import ustr
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
-class res_config_configurable(osv.osv_memory):
+class res_config_configurable(orm.TransientModel):
     ''' Base classes for new-style configuration items
 
     Configuration items should inherit from this class, implement
@@ -150,9 +150,8 @@
         if next: return next
         return self.next(cr, uid, ids, context=context)
 
-res_config_configurable()
 
-class res_config_installer(osv.osv_memory):
+class res_config_installer(orm.TransientModel):
     """ New-style configuration base specialized for addons selection
     and installation.
 
@@ -308,7 +307,7 @@
 
         hooks_results = set()
         for module in base:
-            hook = getattr(self, '_if_%s'% module, None)
+            hook = getattr(self, '_if_%s' % module, None)
             if hook:
                 hooks_results.update(hook(cr, uid, ids, context=None) or set())
 
@@ -361,13 +360,11 @@
         cr.commit() #TOFIX: after remove this statement, installation wizard is fail
         new_db, self.pool = pooler.restart_pool(cr.dbname, update_module=True)
 
-res_config_installer()
-
 DEPRECATION_MESSAGE = 'You are using an addon using old-style configuration '\
     'wizards (ir.actions.configuration.wizard). Old-style configuration '\
     'wizards have been deprecated.\n'\
     'The addon should be migrated to res.config objects.'
-class ir_actions_configuration_wizard(osv.osv_memory):
+class ir_actions_configuration_wizard(orm.TransientModel):
     ''' Compatibility configuration wizard
 
     The old configuration wizard has been replaced by res.config, but in order
@@ -397,16 +394,15 @@
     def execute(self, cr, uid, ids, context=None):
         _logger.warning(DEPRECATION_MESSAGE)
 
-ir_actions_configuration_wizard()
-
-
-
-class res_config_settings(osv.osv_memory):
+
+
+
+class res_config_settings(orm.TransientModel):
     """ Base configuration wizard for application settings.  It provides support for setting
         default values, assigning groups to employee users, and installing modules.
         To make such a 'settings' wizard, define a model like::
 
-            class my_config_wizard(osv.osv_memory):
+            class my_config_wizard(orm.TransientModel):
                 _name = 'my.settings'
                 _inherit = 'res.config.settings'
                 _columns = {
 
=== modified file 'openerp/addons/base/res/res_country.py'
--- openerp/addons/base/res/res_country.py	2012-12-10 15:27:23 +0000
+++ openerp/addons/base/res/res_country.py	2012-12-20 14:23:22 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, orm
 
 def location_name_search(self, cr, user, name='', args=None, operator='ilike',
                          context=None, limit=100):
@@ -39,7 +39,7 @@
     locations = self.name_get(cr, user, ids, context)
     return sorted(locations, key=lambda (id, name): ids.index(id))
 
-class Country(osv.osv):
+class Country(orm.Model):
     _name = 'res.country'
     _description = 'Country'
     _columns = {
@@ -83,7 +83,7 @@
                 context=context)
 
 
-class CountryState(osv.osv):
+class CountryState(orm.Model):
     _description="Country state"
     _name = 'res.country.state'
     _columns = {
 
=== modified file 'openerp/addons/base/res/res_currency.py'
--- openerp/addons/base/res/res_currency.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/res/res_currency.py	2012-12-20 14:23:22 +0000
@@ -23,13 +23,13 @@
 import time
 
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools import float_round, float_is_zero, float_compare
 from openerp.tools.translate import _
 
 CURRENCY_DISPLAY_PATTERN = re.compile(r'(\w+)\s*(?:\((.*)\))?')
 
-class res_currency(osv.osv):
+class res_currency(orm.Model):
     def _current_rate(self, cr, uid, ids, name, arg, context=None):
         if context is None:
             context = {}
@@ -219,18 +219,16 @@
             else:
                 return from_amount * rate
 
-res_currency()
 
-class res_currency_rate_type(osv.osv):
+class res_currency_rate_type(orm.Model):
     _name = "res.currency.rate.type"
     _description = "Currency Rate Type"
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
     }
 
-res_currency_rate_type()
 
-class res_currency_rate(osv.osv):
+class res_currency_rate(orm.Model):
     _name = "res.currency.rate"
     _description = "Currency Rate"
 
@@ -245,7 +243,6 @@
     }
     _order = "name desc"
 
-res_currency_rate()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'openerp/addons/base/res/res_lang.py'
--- openerp/addons/base/res/res_lang.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/res/res_lang.py	2012-12-20 14:23:22 +0000
@@ -25,13 +25,13 @@
 import re
 
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.safe_eval import safe_eval as eval
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
-class lang(osv.osv):
+class lang(orm.Model):
     _name = "res.lang"
     _description = "Languages"
 
@@ -226,7 +226,6 @@
 #    _percent_re = re.compile(r'%(?:\((?P<key>.*?)\))?'
 #                             r'(?P<modifiers>[-#0-9 +*.hlL]*?)[eEfFgGdiouxXcrs%]')
 
-lang()
 
 def original_group(s, grouping, thousands_sep=''):
 
 
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2012-12-19 10:25:39 +0000
+++ openerp/addons/base/res/res_partner.py	2012-12-20 14:23:22 +0000
@@ -28,7 +28,7 @@
 import openerp
 from openerp import SUPERUSER_ID
 from openerp import pooler, tools
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.translate import _
 
 class format_address(object):
@@ -75,7 +75,7 @@
 def _tz_get(self,cr,uid, context=None):
     return [(x, x) for x in pytz.all_timezones]
 
-class res_partner_category(osv.osv):
+class res_partner_category(orm.Model):
 
     def name_get(self, cr, uid, ids, context=None):
         """Return the categories' display name, including their direct
@@ -141,7 +141,7 @@
     _parent_order = 'name'
     _order = 'parent_left'
 
-class res_partner_title(osv.osv):
+class res_partner_title(orm.Model):
     _name = 'res.partner.title'
     _order = 'name'
     _columns = {
@@ -162,7 +162,7 @@
 POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
 ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')
 
-class res_partner(osv.osv, format_address):
+class res_partner(orm.Model, format_address):
     _description = 'Partner'
     _name = "res.partner"
 
 
=== modified file 'openerp/addons/base/res/res_request.py'
--- openerp/addons/base/res/res_request.py	2012-12-17 14:47:53 +0000
+++ openerp/addons/base/res/res_request.py	2012-12-20 14:23:22 +0000
@@ -21,7 +21,7 @@
 
 import time
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 
 def _links_get(self, cr, uid, context=None):
     obj = self.pool.get('res.request.link')
@@ -29,7 +29,7 @@
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-class res_request(osv.osv):
+class res_request(orm.Model):
     _name = 'res.request'
 
     def request_send(self, cr, uid, ids, *args):
@@ -85,9 +85,8 @@
     }
     _order = 'priority desc, trigger_date, create_date desc'
     _table = 'res_request'
-res_request()
 
-class res_request_link(osv.osv):
+class res_request_link(orm.Model):
     _name = 'res.request.link'
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
@@ -98,9 +97,8 @@
         'priority': 5,
     }
     _order = 'priority'
-res_request_link()
 
-class res_request_history(osv.osv):
+class res_request_history(orm.Model):
     _name = 'res.request.history'
     _columns = {
         'name': fields.char('Summary', size=128, states={'active':[('readonly',True)],'waiting':[('readonly',True)]}, required=True),
@@ -116,7 +114,6 @@
         'act_to': lambda obj,cr,uid,context=None: uid,
         'date_sent': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
     }
-res_request_history()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py	2012-12-19 10:13:15 +0000
+++ openerp/addons/base/res/res_users.py	2012-12-20 14:23:22 +0000
@@ -28,13 +28,13 @@
 from openerp import SUPERUSER_ID
 from openerp import pooler, tools
 import openerp.exceptions
-from openerp.osv import fields,osv
+from openerp.osv import fields, osv, orm
 from openerp.osv.orm import browse_record
 from openerp.tools.translate import _
 
 _logger = logging.getLogger(__name__)
 
-class groups(osv.osv):
+class groups(orm.Model):
     _name = "res.groups"
     _description = "Access Groups"
     _rec_name = 'full_name'
@@ -101,9 +101,8 @@
         self.pool.get('ir.model.access').call_cache_clearing_methods(cr)
         return res
 
-groups()
 
-class res_users(osv.osv):
+class res_users(orm.Model):
     """ User class. A res.users record models an OpenERP user and is different
         from an employee.
 
@@ -531,7 +530,7 @@
 
 
 
-class groups_implied(osv.osv):
+class groups_implied(orm.Model):
     _inherit = 'res.groups'
 
     def _get_trans_implied(self, cr, uid, ids, field, arg, context=None):
@@ -641,7 +640,7 @@
 
 
 
-class groups_view(osv.osv):
+class groups_view(orm.Model):
     _inherit = 'res.groups'
 
     def create(self, cr, uid, values, context=None):
@@ -739,7 +738,7 @@
             res.append((False, 'boolean', others))
         return res
 
-class users_view(osv.osv):
+class users_view(orm.Model):
     _inherit = 'res.users'
 
     def create(self, cr, uid, values, context=None):
 
=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-12-18 22:39:59 +0000
+++ openerp/osv/orm.py	2012-12-20 14:23:22 +0000
@@ -5236,7 +5236,7 @@
 
     OpenERP models are created by inheriting from this class::
 
-        class user(Model):
+        class user(orm.Model):
             ...
 
     The system will later instantiate the class once per database (on
 
=== modified file 'openerp/tests/addons/test_uninstall/models.py'
--- openerp/tests/addons/test_uninstall/models.py	2012-06-01 15:45:44 +0000
+++ openerp/tests/addons/test_uninstall/models.py	2012-12-20 14:23:22 +0000
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 import openerp
-from openerp.osv import fields
-from openerp.osv.orm import Model
+from openerp.osv import fields, orm
 
-class test_uninstall_model(Model):
+class test_uninstall_model(orm.Model):
     """
     This model uses different types of columns to make it possible to test
     the uninstall feature of OpenERP.
 
=== modified file 'openerp/tools/amount_to_text_en.py'
--- openerp/tools/amount_to_text_en.py	2012-12-14 13:44:55 +0000
+++ openerp/tools/amount_to_text_en.py	2012-12-20 14:23:22 +0000
@@ -118,17 +118,6 @@
         lang = 'en'
     return _translate_funcs[lang](abs(nbr), currency)
 
-if __name__=='__main__':
-    from sys import argv
-    
-    lang = 'nl'
-    if len(argv) < 2:
-        for i in range(1,200):
-            print i, ">>", int_to_text(i, lang)
-        for i in range(200,999999,139):
-            print i, ">>", int_to_text(i, lang)
-    else:
-        print int_to_text(int(argv[1]), lang)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: