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

[Alexandre Fayolle - camptocamp]

Use more "modern" form for model declaration (deriving from orm.Model rather than osv.osv, and removing explicit instanciation of the class).

This works together with https://code.launchpad.net/~c2c/openobject-server/trunk-proposed-cleanups/

Unmerged revisions

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

[FIX] l10n_be_invoice_bba/invoice.py: syntax error resulting from sed processing a file with CR+LF line endings

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

[FIX] object_proxy import problem

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

[FIX] one more wrong import

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

[FIX] some barfs from previous broad use of sed + some import cleanups

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

[REF] user string.split method instead of the deprecated split function from the string module

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

[MRG] update patch to latest trunk

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

[FIX] a few more deprecated structure that crept in during the merge

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

[MRG] from trunk

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

[REF] more replacement of osv.osv with orm.Model
[FIX] l10n_ch/report/report_webkit_html.py: one NameError

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

[MRG] from trunk

=== modified file 'account/account.py'
--- account/account.py	2012-12-18 17:55:47 +0000
+++ account/account.py	2012-12-20 15:08:18 +0000
@@ -27,7 +27,7 @@
 
 from openerp import SUPERUSER_ID
 from openerp import pooler, tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp.tools.float_utils import float_round
 
@@ -54,7 +54,7 @@
         level -= 1
     return True
 
-class account_payment_term(osv.osv):
+class account_payment_term(orm.Model):
     _name = "account.payment.term"
     _description = "Payment Term"
     _columns = {
@@ -99,7 +99,7 @@
             result.append( (time.strftime('%Y-%m-%d'), dist) )
         return result
 
-class account_payment_term_line(osv.osv):
+class account_payment_term_line(orm.Model):
     _name = "account.payment.term.line"
     _description = "Payment Term Line"
     _columns = {
@@ -131,9 +131,8 @@
         (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
     ]
 
-account_payment_term_line()
 
-class account_account_type(osv.osv):
+class account_account_type(orm.Model):
     _name = "account.account.type"
     _description = "Account Type"
 
@@ -197,7 +196,6 @@
     }
     _order = "code"
 
-account_account_type()
 
 def _code_get(self, cr, uid, context=None):
     acc_type_obj = self.pool.get('account.account.type')
@@ -209,11 +207,10 @@
 # Accounts
 #----------------------------------------------------------
 
-class account_tax(osv.osv):
+class account_tax(orm.Model):
     _name = 'account.tax'
-account_tax()
 
-class account_account(osv.osv):
+class account_account(orm.Model):
     _order = "parent_left"
     _parent_order = "code"
     _name = "account.account"
@@ -696,9 +693,8 @@
         self._check_moves(cr, uid, ids, "unlink", context=context)
         return super(account_account, self).unlink(cr, uid, ids, context=context)
 
-account_account()
 
-class account_journal(osv.osv):
+class account_journal(orm.Model):
     _name = "account.journal"
     _description = "Journal"
     _columns = {
@@ -848,9 +844,8 @@
 
         return self.name_get(cr, user, ids, context=context)
 
-account_journal()
 
-class account_fiscalyear(osv.osv):
+class account_fiscalyear(orm.Model):
     _name = "account.fiscalyear"
     _description = "Fiscal Year"
     _columns = {
@@ -944,9 +939,8 @@
             ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-account_fiscalyear()
 
-class account_period(osv.osv):
+class account_period(orm.Model):
     _name = "account.period"
     _description = "Account period"
     _columns = {
@@ -1067,9 +1061,8 @@
             return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)])
         return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)])
 
-account_period()
 
-class account_journal_period(osv.osv):
+class account_journal_period(orm.Model):
     _name = "account.journal.period"
     _description = "Journal Period"
 
@@ -1124,9 +1117,8 @@
     }
     _order = "period_id"
 
-account_journal_period()
 
-class account_fiscalyear(osv.osv):
+class account_fiscalyear(orm.Model):
     _inherit = "account.fiscalyear"
     _description = "Fiscal Year"
     _columns = {
@@ -1141,11 +1133,10 @@
         })
         return super(account_fiscalyear, self).copy(cr, uid, id, default=default, context=context)
 
-account_fiscalyear()
 #----------------------------------------------------------
 # Entries
 #----------------------------------------------------------
-class account_move(osv.osv):
+class account_move(orm.Model):
     _name = "account.move"
     _description = "Account Entry"
     _order = 'id desc'
@@ -1612,9 +1603,8 @@
         valid_moves = [move.id for move in valid_moves]
         return len(valid_moves) > 0 and valid_moves or False
 
-account_move()
 
-class account_move_reconcile(osv.osv):
+class account_move_reconcile(orm.Model):
     _name = "account.move.reconcile"
     _description = "Account Reconciliation"
     _columns = {
@@ -1686,7 +1676,6 @@
                 result.append((r.id,r.name))
         return result
 
-account_move_reconcile()
 
 #----------------------------------------------------------
 # Tax
@@ -1695,7 +1684,7 @@
 a documenter
 child_depend: la taxe depend des taxes filles
 """
-class account_tax_code(osv.osv):
+class account_tax_code(orm.Model):
     """
     A code for the tax object.
 
@@ -1834,9 +1823,8 @@
     ]
     _order = 'code'
 
-account_tax_code()
 
-class account_tax(osv.osv):
+class account_tax(orm.Model):
     """
     A tax object.
 
@@ -2235,13 +2223,12 @@
                 total += r['amount']
         return res
 
-account_tax()
 
 # ---------------------------------------------------------
 # Account Entries Models
 # ---------------------------------------------------------
 
-class account_model(osv.osv):
+class account_model(orm.Model):
     _name = "account.model"
     _description = "Account Model"
     _columns = {
@@ -2347,9 +2334,8 @@
 
         return {'value': {'company_id': company_id}}
 
-account_model()
 
-class account_model_line(osv.osv):
+class account_model_line(orm.Model):
     _name = "account.model.line"
     _description = "Account Model Entries"
     _columns = {
@@ -2371,14 +2357,13 @@
         ('credit_debit1', 'CHECK (credit*debit=0)',  'Wrong credit or debit value in model, they must be positive!'),
         ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in model, they must be positive!'),
     ]
-account_model_line()
 
 # ---------------------------------------------------------
 # Account Subscription
 # ---------------------------------------------------------
 
 
-class account_subscription(osv.osv):
+class account_subscription(orm.Model):
     _name = "account.subscription"
     _description = "Account Subscription"
     _columns = {
@@ -2445,9 +2430,8 @@
         self.write(cr, uid, ids, {'state':'running'})
         return True
 
-account_subscription()
 
-class account_subscription_line(osv.osv):
+class account_subscription_line(orm.Model):
     _name = "account.subscription.line"
     _description = "Account Subscription Line"
     _columns = {
@@ -2474,17 +2458,15 @@
 
     _rec_name = 'date'
 
-account_subscription_line()
 
 #  ---------------------------------------------------------------
 #   Account Templates: Account, Tax, Tax Code and chart. + Wizard
 #  ---------------------------------------------------------------
 
-class account_tax_template(osv.osv):
+class account_tax_template(orm.Model):
     _name = 'account.tax.template'
-account_tax_template()
 
-class account_account_template(osv.osv):
+class account_account_template(orm.Model):
     _order = "code"
     _name = "account.account.template"
     _description ='Templates for Accounts'
@@ -2610,9 +2592,8 @@
         obj_acc._parent_store_compute(cr)
         return acc_template_ref
 
-account_account_template()
 
-class account_add_tmpl_wizard(osv.osv_memory):
+class account_add_tmpl_wizard(orm.TransientModel):
     """Add one more account from the template.
 
     With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
@@ -2664,9 +2645,8 @@
     def action_cancel(self, cr, uid, ids, context=None):
         return { 'type': 'state', 'state': 'end' }
 
-account_add_tmpl_wizard()
 
-class account_tax_code_template(osv.osv):
+class account_tax_code_template(orm.Model):
 
     _name = 'account.tax.code.template'
     _description = 'Tax Code Template'
@@ -2736,10 +2716,9 @@
         (_check_recursion, 'Error!\nYou cannot create recursive Tax Codes.', ['parent_id'])
     ]
     _order = 'code,name'
-account_tax_code_template()
-
-
-class account_chart_template(osv.osv):
+
+
+class account_chart_template(orm.Model):
     _name="account.chart.template"
     _description= "Templates for Account Chart"
 
@@ -2769,9 +2748,8 @@
         'complete_tax_set': True,
     }
 
-account_chart_template()
 
-class account_tax_template(osv.osv):
+class account_tax_template(orm.Model):
 
     _name = 'account.tax.template'
     _description = 'Templates for Taxes'
@@ -2899,11 +2877,10 @@
         res.update({'tax_template_to_tax': tax_template_to_tax, 'account_dict': todo_dict})
         return res
 
-account_tax_template()
 
 # Fiscal Position Templates
 
-class account_fiscal_position_template(osv.osv):
+class account_fiscal_position_template(orm.Model):
     _name = 'account.fiscal.position.template'
     _description = 'Template for Fiscal Position'
 
@@ -2947,9 +2924,8 @@
                 })
         return True
 
-account_fiscal_position_template()
 
-class account_fiscal_position_tax_template(osv.osv):
+class account_fiscal_position_tax_template(orm.Model):
     _name = 'account.fiscal.position.tax.template'
     _description = 'Template Tax Fiscal Position'
     _rec_name = 'position_id'
@@ -2960,9 +2936,8 @@
         'tax_dest_id': fields.many2one('account.tax.template', 'Replacement Tax')
     }
 
-account_fiscal_position_tax_template()
 
-class account_fiscal_position_account_template(osv.osv):
+class account_fiscal_position_account_template(orm.Model):
     _name = 'account.fiscal.position.account.template'
     _description = 'Template Account Fiscal Mapping'
     _rec_name = 'position_id'
@@ -2972,13 +2947,12 @@
         'account_dest_id': fields.many2one('account.account.template', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
 
-account_fiscal_position_account_template()
 
 # ---------------------------------------------------------
 # Account generation from template wizards
 # ---------------------------------------------------------
 
-class wizard_multi_charts_accounts(osv.osv_memory):
+class wizard_multi_charts_accounts(orm.TransientModel):
     """
     Create a new account chart for a company.
     Wizards ask for:
@@ -3512,9 +3486,8 @@
             current_num += 1
         return True
 
-wizard_multi_charts_accounts()
 
-class account_bank_accounts_wizard(osv.osv_memory):
+class account_bank_accounts_wizard(orm.TransientModel):
     _name='account.bank.accounts.wizard'
 
     _columns = {
@@ -3524,6 +3497,5 @@
         'account_type': fields.selection([('cash','Cash'), ('check','Check'), ('bank','Bank')], 'Account Type', size=32),
     }
 
-account_bank_accounts_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account_analytic_line.py'
--- account/account_analytic_line.py	2012-12-18 22:50:15 +0000
+++ account/account_analytic_line.py	2012-12-20 15:08:18 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from openerp.osv import fields
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp.tools.translate import _
 
-class account_analytic_line(osv.osv):
+class account_analytic_line(orm.Model):
     _inherit = 'account.analytic.line'
     _description = 'Analytic Line'
     _columns = {
@@ -143,9 +143,8 @@
             return res
         return False
 
-account_analytic_line()
 
-class res_partner(osv.osv):
+class res_partner(orm.Model):
     """ Inherits partner and adds contract information in the partner form """
     _inherit = 'res.partner'
 
@@ -154,6 +153,5 @@
                                                     'partner_id', 'Contracts', readonly=True),
     }
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account_bank.py'
--- account/account_bank.py	2012-12-06 14:56:32 +0000
+++ account/account_bank.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 
 from openerp.tools.translate import _
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class bank(osv.osv):
+class bank(orm.Model):
     _inherit = "res.partner.bank"
     _columns = {
         'journal_id': fields.many2one('account.journal', 'Account Journal', help="This journal will be created automatically for this bank account when you save the record"),
 
=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2012-12-18 17:55:47 +0000
+++ account/account_bank_statement.py	2012-12-20 15:08:18 +0000
@@ -21,11 +21,11 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
-class account_bank_statement(osv.osv):
+class account_bank_statement(orm.Model):
     def create(self, cr, uid, vals, context=None):
         if 'line_ids' in vals:
             for idx, line in enumerate(vals['line_ids']):
@@ -475,7 +475,7 @@
                 unlink_ids.append(t['id'])
             else:
                 raise osv.except_osv(_('Invalid Action!'), _('In order to delete a bank statement, you must first cancel it to delete related journal items.'))
-        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+        orm.Model.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -500,9 +500,8 @@
         'context':ctx,
       }
 
-account_bank_statement()
 
-class account_bank_statement_line(osv.osv):
+class account_bank_statement_line(orm.Model):
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
         obj_partner = self.pool.get('res.partner')
@@ -576,6 +575,5 @@
         'type': 'general',
     }
 
-account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account_cash_statement.py'
--- account/account_cash_statement.py	2012-12-17 15:23:03 +0000
+++ account/account_cash_statement.py	2012-12-20 15:08:18 +0000
@@ -22,11 +22,11 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
-class account_cashbox_line(osv.osv):
+class account_cashbox_line(orm.Model):
 
     """ Cash Box Details """
 
@@ -66,9 +66,8 @@
         'bank_statement_id' : fields.many2one('account.bank.statement', ondelete='cascade'),
      }
 
-account_cashbox_line()
 
-class account_cash_statement(osv.osv):
+class account_cash_statement(orm.Model):
 
     _inherit = 'account.bank.statement'
 
@@ -316,9 +315,8 @@
 
         return self.write(cr, uid, ids, {'closing_date': time.strftime("%Y-%m-%d %H:%M:%S")}, context=context)
 
-account_cash_statement()
 
-class account_journal(osv.osv):
+class account_journal(orm.Model):
     _inherit = 'account.journal'
 
     def _default_cashbox_line_ids(self, cr, uid, context=None):
@@ -336,9 +334,8 @@
         'cashbox_line_ids' : _default_cashbox_line_ids,
     }
 
-account_journal()
 
-class account_journal_cashbox_line(osv.osv):
+class account_journal_cashbox_line(orm.Model):
     _name = 'account.journal.cashbox.line'
     _rec_name = 'pieces'
     _columns = {
@@ -348,6 +345,5 @@
 
     _order = 'pieces asc'
 
-account_journal_cashbox_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account_financial_report.py'
--- account/account_financial_report.py	2012-12-17 15:23:03 +0000
+++ account/account_financial_report.py	2012-12-20 15:08:18 +0000
@@ -26,7 +26,7 @@
 
 from openerp import netsvc
 from openerp import pooler
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 
@@ -34,7 +34,7 @@
 # Account Financial Report
 # ---------------------------------------------------------
 
-class account_financial_report(osv.osv):
+class account_financial_report(orm.Model):
     _name = "account.financial.report"
     _description = "Account Report"
 
@@ -130,6 +130,5 @@
         'style_overwrite': 0,
     }
 
-account_financial_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-12-20 11:47:30 +0000
+++ account/account_invoice.py	2012-12-20 15:08:18 +0000
@@ -28,7 +28,7 @@
 from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_invoice(osv.osv):
+class account_invoice(orm.Model):
     def _amount_all(self, cr, uid, ids, name, args, context=None):
         res = {}
         for invoice in self.browse(cr, uid, ids, context=context):
@@ -456,7 +456,7 @@
                 unlink_ids.append(t['id'])
             else:
                 raise osv.except_osv(_('Invalid Action!'), _('You can not delete an invoice which is not cancelled. You should refund it instead.'))
-        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+        orm.Model.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,\
@@ -1336,7 +1336,7 @@
         return True
 
 
-class account_invoice_line(osv.osv):
+class account_invoice_line(orm.Model):
 
     def _amount_line(self, cr, uid, ids, prop, unknow_none, unknow_dict):
         res = {}
@@ -1587,9 +1587,8 @@
                 unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
         return {'value':{'invoice_line_tax_id': unique_tax_ids}}
 
-account_invoice_line()
 
-class account_invoice_tax(osv.osv):
+class account_invoice_tax(orm.Model):
     _name = "account.invoice.tax"
     _description = "Invoice Tax"
 
@@ -1731,7 +1730,7 @@
         return res
 
 
-class res_partner(osv.osv):
+class res_partner(orm.Model):
     """ Inherits partner and adds invoice information in the partner form """
     _inherit = 'res.partner'
     _columns = {
@@ -1744,7 +1743,7 @@
         return super(res_partner, self).copy(cr, uid, id, default, context)
 
 
-class mail_compose_message(osv.osv):
+class mail_compose_message(orm.Model):
     _inherit = 'mail.compose.message'
 
     def send_mail(self, cr, uid, ids, context=None):
 
=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2012-12-18 17:55:47 +0000
+++ account/account_move_line.py	2012-12-20 15:08:18 +0000
@@ -32,7 +32,7 @@
 import openerp.addons.decimal_precision as dp
 from openerp import tools
 
-class account_move_line(osv.osv):
+class account_move_line(orm.Model):
     _name = "account.move.line"
     _description = "Journal Items"
 
@@ -1304,6 +1304,5 @@
                 bool(journal.currency),bool(journal.analytic_journal_id)))
         return result
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/company.py'
--- account/company.py	2012-12-06 14:56:32 +0000
+++ account/company.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class res_company(osv.osv):
+class res_company(orm.Model):
     _inherit = "res.company"
     _columns = {
         'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
@@ -47,6 +47,5 @@
 Best Regards,'''
     }
 
-res_company()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/edi/invoice.py'
--- account/edi/invoice.py	2012-12-17 14:43:06 +0000
+++ account/edi/invoice.py	2012-12-20 15:08:18 +0000
@@ -18,7 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.addons.edi import EDIMixin
 
 from urllib import urlencode
@@ -68,7 +68,7 @@
     'amount_tax': True,
 }
 
-class account_invoice(osv.osv, EDIMixin):
+class account_invoice(orm.Model, EDIMixin):
     _inherit = 'account.invoice'
 
     def edi_export(self, cr, uid, records, edi_struct=None, context=None):
@@ -282,10 +282,10 @@
     }
 
 
-class account_invoice_line(osv.osv, EDIMixin):
+class account_invoice_line(orm.Model, EDIMixin):
     _inherit='account.invoice.line'
 
-class account_invoice_tax(osv.osv, EDIMixin):
+class account_invoice_tax(orm.Model, EDIMixin):
     _inherit = "account.invoice.tax"
 
 
 
=== modified file 'account/installer.py'
--- account/installer.py	2012-12-06 14:56:32 +0000
+++ account/installer.py	2012-12-20 15:08:18 +0000
@@ -28,11 +28,11 @@
 
 from openerp import netsvc, tools
 from openerp.tools.translate import _
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
 _logger = logging.getLogger(__name__)
 
-class account_installer(osv.osv_memory):
+class account_installer(orm.TransientModel):
     _name = 'account.installer'
     _inherit = 'res.config.installer'
 
@@ -152,6 +152,5 @@
         _logger.debug('Installing chart of accounts %s', chart)
         return modules | set([chart])
 
-account_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/ir_sequence.py'
--- account/ir_sequence.py	2012-12-06 14:56:32 +0000
+++ account/ir_sequence.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class ir_sequence_fiscalyear(osv.osv):
+class ir_sequence_fiscalyear(orm.Model):
     _name = 'account.sequence.fiscalyear'
     _rec_name = "sequence_main_id"
     _columns = {
@@ -38,9 +38,8 @@
             'Main Sequence must be different from current !'),
     ]
 
-ir_sequence_fiscalyear()
 
-class ir_sequence(osv.osv):
+class ir_sequence(orm.Model):
     _inherit = 'ir.sequence'
     _columns = {
         'fiscal_ids': fields.one2many('account.sequence.fiscalyear',
@@ -56,6 +55,5 @@
                     return super(ir_sequence, self)._next(cr, uid, [line.sequence_id.id], context)
         return super(ir_sequence, self)._next(cr, uid, seq_ids, context)
 
-ir_sequence()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/partner.py'
--- account/partner.py	2012-12-10 11:16:54 +0000
+++ account/partner.py	2012-12-20 15:08:18 +0000
@@ -22,9 +22,9 @@
 from operator import itemgetter
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_fiscal_position(osv.osv):
+class account_fiscal_position(orm.Model):
     _name = 'account.fiscal.position'
     _description = 'Fiscal Position'
     _columns = {
@@ -66,9 +66,8 @@
                 break
         return account_id
 
-account_fiscal_position()
 
-class account_fiscal_position_tax(osv.osv):
+class account_fiscal_position_tax(orm.Model):
     _name = 'account.fiscal.position.tax'
     _description = 'Taxes Fiscal Position'
     _rec_name = 'position_id'
@@ -84,9 +83,8 @@
          'A tax fiscal position could be defined only once time on same taxes.')
     ]
 
-account_fiscal_position_tax()
 
-class account_fiscal_position_account(osv.osv):
+class account_fiscal_position_account(orm.Model):
     _name = 'account.fiscal.position.account'
     _description = 'Accounts Fiscal Position'
     _rec_name = 'position_id'
@@ -102,9 +100,8 @@
          'An account fiscal position could be defined only once time on same accounts.')
     ]
 
-account_fiscal_position_account()
 
-class res_partner(osv.osv):
+class res_partner(orm.Model):
     _name = 'res.partner'
     _inherit = 'res.partner'
     _description = 'Partner'
@@ -236,6 +233,5 @@
         'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button "Fully Reconciled" in the manual reconciliation process')
     }
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/product.py'
--- account/product.py	2012-12-06 14:56:32 +0000
+++ account/product.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class product_category(osv.osv):
+class product_category(orm.Model):
     _inherit = "product.category"
     _columns = {
         'property_account_income_categ': fields.property(
@@ -39,13 +39,12 @@
             view_load=True,
             help="This account will be used for invoices to value expenses."),
     }
-product_category()
 
 #----------------------------------------------------------
 # Products
 #----------------------------------------------------------
 
-class product_template(osv.osv):
+class product_template(orm.Model):
     _inherit = "product.template"
     _columns = {
         'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
@@ -70,6 +69,5 @@
             help="This account will be used for invoices instead of the default one to value expenses for the current product."),
     }
 
-product_template()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/project.py'
--- account/project/project.py	2012-12-06 14:56:32 +0000
+++ account/project/project.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_journal(osv.osv):
+class account_analytic_journal(orm.Model):
     _name = 'account.analytic.journal'
     _description = 'Analytic Journal'
     _columns = {
@@ -38,15 +38,13 @@
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
-account_analytic_journal()
 
-class account_journal(osv.osv):
+class account_journal(orm.Model):
     _inherit="account.journal"
 
     _columns = {
         'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal', help="Journal for analytic entries"),
     }
 
-account_journal()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/wizard/account_analytic_balance_report.py'
--- account/project/wizard/account_analytic_balance_report.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/account_analytic_balance_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_balance(osv.osv_memory):
+class account_analytic_balance(orm.TransientModel):
     _name = 'account.analytic.balance'
     _description = 'Account Analytic Balance'
 
@@ -52,7 +52,6 @@
             'datas': datas,
             }
 
-account_analytic_balance()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account/project/wizard/account_analytic_chart.py'
--- account/project/wizard/account_analytic_chart.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/account_analytic_chart.py	2012-12-20 15:08:18 +0000
@@ -18,9 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_chart(osv.osv_memory):
+class account_analytic_chart(orm.TransientModel):
     _name = 'account.analytic.chart'
     _description = 'Account Analytic Chart'
 
@@ -46,5 +46,4 @@
         result['context'] = str(result_context)
         return result
 
-account_analytic_chart()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/wizard/account_analytic_cost_ledger_for_journal_report.py'
--- account/project/wizard/account_analytic_cost_ledger_for_journal_report.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/account_analytic_cost_ledger_for_journal_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_cost_ledger_journal_report(osv.osv_memory):
+class account_analytic_cost_ledger_journal_report(orm.TransientModel):
     _name = 'account.analytic.cost.ledger.journal.report'
     _description = 'Account Analytic Cost Ledger For Journal Report'
 
@@ -52,5 +52,4 @@
             'datas': datas,
             }
 
-account_analytic_cost_ledger_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/wizard/account_analytic_cost_ledger_report.py'
--- account/project/wizard/account_analytic_cost_ledger_report.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/account_analytic_cost_ledger_report.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 import time
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 
-class account_analytic_cost_ledger(osv.osv_memory):
+class account_analytic_cost_ledger(orm.TransientModel):
     _name = 'account.analytic.cost.ledger'
     _description = 'Account Analytic Cost Ledger'
 
@@ -52,5 +52,4 @@
             'datas': datas,
             }
 
-account_analytic_cost_ledger()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/wizard/account_analytic_inverted_balance_report.py'
--- account/project/wizard/account_analytic_inverted_balance_report.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/account_analytic_inverted_balance_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_inverted_balance(osv.osv_memory):
+class account_analytic_inverted_balance(orm.TransientModel):
     _name = 'account.analytic.inverted.balance'
     _description = 'Account Analytic Inverted Balance'
 
@@ -51,5 +51,4 @@
             'datas': datas,
             }
 
-account_analytic_inverted_balance()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/wizard/account_analytic_journal_report.py'
--- account/project/wizard/account_analytic_journal_report.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/account_analytic_journal_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_journal_report(osv.osv_memory):
+class account_analytic_journal_report(orm.TransientModel):
     _name = 'account.analytic.journal.report'
     _description = 'Account Analytic Journal'
 
@@ -71,5 +71,4 @@
             res.update({'analytic_account_journal_id': journal_ids})
         return res
 
-account_analytic_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/project/wizard/project_account_analytic_line.py'
--- account/project/wizard/project_account_analytic_line.py	2012-12-06 14:56:32 +0000
+++ account/project/wizard/project_account_analytic_line.py	2012-12-20 15:08:18 +0000
@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class project_account_analytic_line(osv.osv_memory):
+class project_account_analytic_line(orm.TransientModel):
     _name = "project.account.analytic.line"
     _description = "Analytic Entries by line"
     _columns = {
@@ -53,6 +53,5 @@
               'search_view_id': id['res_id'],
               }
 
-project_account_analytic_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/report/account_analytic_entries_report.py'
--- account/report/account_analytic_entries_report.py	2012-12-06 14:56:32 +0000
+++ account/report/account_analytic_entries_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 
-class analytic_entries_report(osv.osv):
+class analytic_entries_report(orm.Model):
     _name = "analytic.entries.report"
     _description = "Analytic Entries Statistics"
     _auto = False
@@ -81,6 +81,5 @@
                      a.move_id,a.product_id,a.product_uom_id
             )
         """)
-analytic_entries_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/report/account_entries_report.py'
--- account/report/account_entries_report.py	2012-12-17 15:23:03 +0000
+++ account/report/account_entries_report.py	2012-12-20 15:08:18 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 import openerp.addons.decimal_precision as dp
 
-class account_entries_report(osv.osv):
+class account_entries_report(orm.Model):
     _name = "account.entries.report"
     _description = "Journal Items Analysis"
     _auto = False
@@ -152,6 +152,5 @@
                 where l.state != 'draft'
             )
         """)
-account_entries_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/report/account_invoice_report.py'
--- account/report/account_invoice_report.py	2012-12-17 15:23:03 +0000
+++ account/report/account_invoice_report.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 from openerp import tools
 import openerp.addons.decimal_precision as dp
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 
-class account_invoice_report(osv.osv):
+class account_invoice_report(orm.Model):
     _name = "account.invoice.report"
     _description = "Invoices Statistics"
     _auto = False
@@ -217,6 +217,5 @@
                     self._table, 
                     self._select(), self._sub_select(), self._from(), self._group_by()))
 
-account_invoice_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/report/account_report.py'
--- account/report/account_report.py	2012-12-10 11:16:54 +0000
+++ account/report/account_report.py	2012-12-20 15:08:18 +0000
@@ -25,7 +25,7 @@
 
 from openerp import pooler
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 
 def _code_get(self, cr, uid, context=None):
     acc_type_obj = self.pool.get('account.account.type')
@@ -34,7 +34,7 @@
     return [(r['code'], r['name']) for r in res]
 
 
-class report_account_receivable(osv.osv):
+class report_account_receivable(orm.Model):
     _name = "report.account.receivable"
     _description = "Receivable accounts"
     _auto = False
@@ -67,10 +67,9 @@
                 group by
                     to_char(date,'YYYY:IW'), a.type
             )""")
-report_account_receivable()
 
                     #a.type in ('receivable','payable')
-class temp_range(osv.osv):
+class temp_range(orm.Model):
     _name = 'temp.range'
     _description = 'A Temporary table used for Dashboard view'
 
@@ -78,9 +77,8 @@
         'name': fields.char('Range',size=64)
     }
 
-temp_range()
 
-class report_aged_receivable(osv.osv):
+class report_aged_receivable(orm.Model):
     _name = "report.aged.receivable"
     _description = "Aged Receivable Till Today"
     _auto = False
@@ -148,9 +146,8 @@
                 select id,name from temp_range
             )""")
 
-report_aged_receivable()
 
-class report_invoice_created(osv.osv):
+class report_invoice_created(orm.Model):
     _name = "report.invoice.created"
     _description = "Report of Invoices Created within Last 15 days"
     _auto = False
@@ -201,9 +198,8 @@
                 AND
                 (to_date(to_char(inv.create_date, 'YYYY-MM-dd'),'YYYY-MM-dd') > (CURRENT_DATE-15))
             )""")
-report_invoice_created()
 
-class report_account_type_sales(osv.osv):
+class report_account_type_sales(orm.Model):
     _name = "report.account_type.sales"
     _description = "Report of the Sales by Account Type"
     _auto = False
@@ -242,10 +238,9 @@
             group by
                 to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.user_type
             )""")
-report_account_type_sales()
-
-
-class report_account_sales(osv.osv):
+
+
+class report_account_sales(orm.Model):
     _name = "report.account.sales"
     _description = "Report of the Sales by Account"
     _auto = False
@@ -284,6 +279,5 @@
             group by
                 to_char(inv.date_invoice, 'YYYY'),to_char(inv.date_invoice,'MM'),inv.currency_id, inv.period_id, inv_line.product_id, account.id
             )""")
-report_account_sales()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/report/account_treasury_report.py'
--- account/report/account_treasury_report.py	2012-12-17 15:23:03 +0000
+++ account/report/account_treasury_report.py	2012-12-20 15:08:18 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from openerp import tools
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 import openerp.addons.decimal_precision as dp
 
-class account_treasury_report(osv.osv):
+class account_treasury_report(orm.Model):
     _name = "account.treasury.report"
     _description = "Treasury Analysis"
     _auto = False
@@ -78,6 +78,5 @@
             group by p.id, p.fiscalyear_id, p.date_start, am.company_id
             )
         """)
-account_treasury_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/res_config.py'
--- account/res_config.py	2012-12-10 11:16:54 +0000
+++ account/res_config.py	2012-12-20 15:08:18 +0000
@@ -26,10 +26,10 @@
 from os.path import join as opj
 
 from openerp.tools.translate import _
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import tools
 
-class account_config_settings(osv.osv_memory):
+class account_config_settings(orm.TransientModel):
     _name = 'account.config.settings'
     _inherit = 'res.config.settings'
 
 
=== modified file 'account/res_currency.py'
--- account/res_currency.py	2012-12-10 11:16:54 +0000
+++ account/res_currency.py	2012-12-20 15:08:18 +0000
@@ -18,11 +18,11 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
 """Inherit res.currency to handle accounting date values when converting currencies"""
 
-class res_currency_account(osv.osv):
+class res_currency_account(orm.Model):
     _inherit = "res.currency"
 
     def _get_conversion_rate(self, cr, uid, from_currency, to_currency, context=None):
@@ -43,6 +43,5 @@
                 rate = float(tot2)/float(tot1)
         return rate
 
-res_currency_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_automatic_reconcile.py'
--- account/wizard/account_automatic_reconcile.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_automatic_reconcile.py	2012-12-20 15:08:18 +0000
@@ -21,10 +21,10 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_automatic_reconcile(osv.osv_memory):
+class account_automatic_reconcile(orm.TransientModel):
     _name = 'account.automatic.reconcile'
     _description = 'Automatic Reconcile'
 
@@ -246,6 +246,5 @@
             'context': context,
         }
 
-account_automatic_reconcile()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_change_currency.py'
--- account/wizard/account_change_currency.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_change_currency.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_change_currency(osv.osv_memory):
+class account_change_currency(orm.TransientModel):
     _name = 'account.change.currency'
     _description = 'Change Currency'
     _columns = {
@@ -73,6 +73,5 @@
         obj_inv.write(cr, uid, [invoice.id], {'currency_id': new_currency}, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_change_currency()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_chart.py'
--- account/wizard/account_chart.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_chart.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_chart(osv.osv_memory):
+class account_chart(orm.TransientModel):
     """
     For Chart of Accounts
     """
@@ -105,6 +105,5 @@
         'fiscalyear': _get_fiscalyear,
     }
 
-account_chart()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_financial_report.py'
--- account/wizard/account_financial_report.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_financial_report.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class accounting_report(osv.osv_memory):
+class accounting_report(orm.TransientModel):
     _name = "accounting.report"
     _inherit = "account.common.report"
     _description = "Accounting Report"
@@ -93,6 +93,5 @@
             'datas': data,
         }
 
-accounting_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_fiscalyear_close.py'
--- account/wizard/account_fiscalyear_close.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_fiscalyear_close.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_fiscalyear_close(osv.osv_memory):
+class account_fiscalyear_close(orm.TransientModel):
     """
     Closes Account Fiscalyear and Generate Opening entries for New Fiscalyear
     """
@@ -278,6 +278,5 @@
 
         return {'type': 'ir.actions.act_window_close'}
 
-account_fiscalyear_close()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_fiscalyear_close_state.py'
--- account/wizard/account_fiscalyear_close_state.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_fiscalyear_close_state.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_fiscalyear_close_state(osv.osv_memory):
+class account_fiscalyear_close_state(orm.TransientModel):
     """
     Closes  Account Fiscalyear
     """
@@ -56,6 +56,5 @@
 
             return {'type': 'ir.actions.act_window_close'}
 
-account_fiscalyear_close_state()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_invoice_refund.py'
--- account/wizard/account_invoice_refund.py	2012-12-18 17:42:25 +0000
+++ account/wizard/account_invoice_refund.py	2012-12-20 15:08:18 +0000
@@ -21,11 +21,11 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp import netsvc
 
-class account_invoice_refund(osv.osv_memory):
+class account_invoice_refund(orm.TransientModel):
 
     """Refunds invoice"""
 
@@ -223,6 +223,5 @@
         return self.compute_refund(cr, uid, ids, data_refund, context=context)
 
 
-account_invoice_refund()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_invoice_state.py'
--- account/wizard/account_invoice_state.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_invoice_state.py	2012-12-20 15:08:18 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp.tools.translate import _
 from openerp import netsvc
 from openerp import pooler
 
-class account_invoice_confirm(osv.osv_memory):
+class account_invoice_confirm(orm.TransientModel):
     """
     This wizard will confirm the all the selected draft invoices
     """
@@ -45,9 +45,8 @@
             wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
         return {'type': 'ir.actions.act_window_close'}
 
-account_invoice_confirm()
 
-class account_invoice_cancel(osv.osv_memory):
+class account_invoice_cancel(orm.TransientModel):
     """
     This wizard will cancel the all the selected invoices.
     If in the journal, the option allow cancelling entry is not selected then it will give warning message.
@@ -69,6 +68,5 @@
             wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr)
         return {'type': 'ir.actions.act_window_close'}
 
-account_invoice_cancel()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_journal_select.py'
--- account/wizard/account_journal_select.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_journal_select.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class account_journal_select(osv.osv_memory):
+class account_journal_select(orm.TransientModel):
     """
         Account Journal Select
     """
@@ -45,6 +45,5 @@
             result['context'] = str({'journal_id': journal_id, 'period_id': period_id})
         return result
 
-account_journal_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_move_bank_reconcile.py'
--- account/wizard/account_move_bank_reconcile.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_move_bank_reconcile.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_move_bank_reconcile(osv.osv_memory):
+class account_move_bank_reconcile(orm.TransientModel):
     """
         Bank Reconciliation
     """
@@ -59,6 +59,5 @@
             'type': 'ir.actions.act_window'
              }
 
-account_move_bank_reconcile()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_move_line_reconcile_select.py'
--- account/wizard/account_move_line_reconcile_select.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_move_line_reconcile_select.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_move_line_reconcile_select(osv.osv_memory):
+class account_move_line_reconcile_select(orm.TransientModel):
     _name = "account.move.line.reconcile.select"
     _description = "Move line reconcile select"
     _columns = {
@@ -50,6 +50,5 @@
             'type': 'ir.actions.act_window'
         }
 
-account_move_line_reconcile_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_move_line_select.py'
--- account/wizard/account_move_line_select.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_move_line_select.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class account_move_line_select(osv.osv_memory):
+class account_move_line_select(orm.TransientModel):
     """
         Account move line select
     """
@@ -67,6 +67,5 @@
         result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
         return result
 
-account_move_line_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_move_line_unreconcile_select.py'
--- account/wizard/account_move_line_unreconcile_select.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_move_line_unreconcile_select.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_move_line_unreconcile_select(osv.osv_memory):
+class account_move_line_unreconcile_select(orm.TransientModel):
     _name = "account.move.line.unreconcile.select"
     _description = "Unreconciliation"
     _columns ={
@@ -39,6 +39,5 @@
                 'type': 'ir.actions.act_window'
         }
 
-account_move_line_unreconcile_select()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_open_closed_fiscalyear.py'
--- account/wizard/account_open_closed_fiscalyear.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_open_closed_fiscalyear.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_open_closed_fiscalyear(osv.osv_memory):
+class account_open_closed_fiscalyear(orm.TransientModel):
     _name = "account.open.closed.fiscalyear"
     _description = "Choose Fiscal Year"
     _columns = {
@@ -43,6 +43,5 @@
             cr.execute('delete from account_move where id IN %s', (tuple(ids_move),))
         return {'type': 'ir.actions.act_window_close'}
 
-account_open_closed_fiscalyear()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_period_close.py'
--- account/wizard/account_period_close.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_period_close.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_period_close(osv.osv_memory):
+class account_period_close(orm.TransientModel):
     """
         close period
     """
@@ -55,6 +55,5 @@
 
         return {'type': 'ir.actions.act_window_close'}
 
-account_period_close()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_reconcile.py'
--- account/wizard/account_reconcile.py	2012-12-17 15:23:03 +0000
+++ account/wizard/account_reconcile.py	2012-12-20 15:08:18 +0000
@@ -21,11 +21,11 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
-class account_move_line_reconcile(osv.osv_memory):
+class account_move_line_reconcile(orm.TransientModel):
     """
     Account move line reconcile wizard, it checks for the write off the reconcile entry or directly reconcile.
     """
@@ -91,9 +91,8 @@
                                         period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_move_line_reconcile()
 
-class account_move_line_reconcile_writeoff(osv.osv_memory):
+class account_move_line_reconcile_writeoff(orm.TransientModel):
     """
     It opens the write off wizard form, in that user can define the journal, account, analytic account for reconcile
     """
@@ -158,6 +157,5 @@
                 period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_move_line_reconcile_writeoff()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_reconcile_partner_process.py'
--- account/wizard/account_reconcile_partner_process.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_reconcile_partner_process.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_partner_reconcile_process(osv.osv_memory):
+class account_partner_reconcile_process(orm.TransientModel):
     _name = 'account.partner.reconcile.process'
     _description = 'Reconcilation Process partner by partner'
 
@@ -98,6 +98,5 @@
         'next_partner_id': _get_partner,
     }
 
-account_partner_reconcile_process()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_account_balance.py'
--- account/wizard/account_report_account_balance.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_account_balance.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_balance_report(osv.osv_memory):
+class account_balance_report(orm.TransientModel):
     _inherit = "account.common.account.report"
     _name = 'account.balance.report'
     _description = 'Trial Balance Report'
@@ -38,6 +38,5 @@
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.account.balance', 'datas': data}
 
-account_balance_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_aged_partner_balance.py'
--- account/wizard/account_report_aged_partner_balance.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_aged_partner_balance.py	2012-12-20 15:08:18 +0000
@@ -22,10 +22,10 @@
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_aged_trial_balance(osv.osv_memory):
+class account_aged_trial_balance(orm.TransientModel):
     _inherit = 'account.common.partner.report'
     _name = 'account.aged.trial.balance'
     _description = 'Account Aged Trial balance Report'
@@ -86,6 +86,5 @@
             'datas': data
         }
 
-account_aged_trial_balance()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_central_journal.py'
--- account/wizard/account_report_central_journal.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_central_journal.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_central_journal(osv.osv_memory):
+class account_central_journal(orm.TransientModel):
     _name = 'account.central.journal'
     _description = 'Account Central Journal'
     _inherit = "account.common.journal.report"
@@ -38,7 +38,6 @@
                 'datas': data,
         }
 
-account_central_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account/wizard/account_report_common.py'
--- account/wizard/account_report_common.py	2012-12-19 23:31:33 +0000
+++ account/wizard/account_report_common.py	2012-12-20 15:08:18 +0000
@@ -22,11 +22,11 @@
 import time
 from lxml import etree
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.osv.orm import setup_modifiers
 from openerp.tools.translate import _
 
-class account_common_report(osv.osv_memory):
+class account_common_report(orm.TransientModel):
     _name = "account.common.report"
     _description = "Account Common Report"
 
@@ -178,6 +178,5 @@
         data['form']['used_context'] = used_context
         return self._print_report(cr, uid, ids, data, context=context)
 
-account_common_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_common_account.py'
--- account/wizard/account_report_common_account.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_common_account.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_common_account_report(osv.osv_memory):
+class account_common_account_report(orm.TransientModel):
     _name = 'account.common.account.report'
     _description = 'Account Common Account Report'
     _inherit = "account.common.report"
@@ -41,7 +41,6 @@
         data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
         return data
 
-account_common_account_report()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account/wizard/account_report_common_journal.py'
--- account/wizard/account_report_common_journal.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_common_journal.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_common_journal_report(osv.osv_memory):
+class account_common_journal_report(orm.TransientModel):
     _name = 'account.common.journal.report'
     _description = 'Account Common Journal Report'
     _inherit = "account.common.report"
@@ -50,6 +50,5 @@
         data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
         return data
 
-account_common_journal_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_common_partner.py'
--- account/wizard/account_report_common_partner.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_common_partner.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_common_partner_report(osv.osv_memory):
+class account_common_partner_report(orm.TransientModel):
     _name = 'account.common.partner.report'
     _description = 'Account Common Partner Report'
     _inherit = "account.common.report"
@@ -42,7 +42,6 @@
         data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
         return data
 
-account_common_partner_report()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_general_journal.py'
--- account/wizard/account_report_general_journal.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_general_journal.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_general_journal(osv.osv_memory):
+class account_general_journal(orm.TransientModel):
     _inherit = "account.common.journal.report"
     _name = 'account.general.journal'
     _description = 'Account General Journal'
@@ -34,7 +34,6 @@
         data = self.pre_print_report(cr, uid, ids, data, context=context)
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.general.journal', 'datas': data}
 
-account_general_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account/wizard/account_report_general_ledger.py'
--- account/wizard/account_report_general_ledger.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_general_ledger.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_report_general_ledger(osv.osv_memory):
+class account_report_general_ledger(orm.TransientModel):
     _inherit = "account.common.account.report"
     _name = "account.report.general.ledger"
     _description = "General Ledger Report"
@@ -58,6 +58,5 @@
             return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger_landscape', 'datas': data}
         return { 'type': 'ir.actions.report.xml', 'report_name': 'account.general.ledger', 'datas': data}
 
-account_report_general_ledger()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_partner_balance.py'
--- account/wizard/account_report_partner_balance.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_partner_balance.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_partner_balance(osv.osv_memory):
+class account_partner_balance(orm.TransientModel):
     """
         This wizard will provide the partner balance report by periods, between any two dates.
     """
@@ -50,6 +50,5 @@
             'datas': data,
     }
 
-account_partner_balance()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_partner_ledger.py'
--- account/wizard/account_report_partner_ledger.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_partner_ledger.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_partner_ledger(osv.osv_memory):
+class account_partner_ledger(orm.TransientModel):
     """
     This wizard will provide the partner Ledger report by periods, between any two dates.
     """
@@ -67,6 +67,5 @@
                 'datas': data,
         }
 
-account_partner_ledger()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_report_print_journal.py'
--- account/wizard/account_report_print_journal.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_report_print_journal.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from lxml import etree
 
-class account_print_journal(osv.osv_memory):
+class account_print_journal(orm.TransientModel):
     _inherit = "account.common.journal.report"
     _name = 'account.print.journal'
     _description = 'Account Print Journal'
@@ -72,7 +72,6 @@
             report_name = 'account.journal.period.print'
         return {'type': 'ir.actions.report.xml', 'report_name': report_name, 'datas': data}
 
-account_print_journal()
 
 #vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account/wizard/account_state_open.py'
--- account/wizard/account_state_open.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_state_open.py	2012-12-20 15:08:18 +0000
@@ -18,12 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
 from openerp import netsvc
 from openerp.tools.translate import _
 
-class account_state_open(osv.osv_memory):
+class account_state_open(orm.TransientModel):
     _name = 'account.state.open'
     _description = 'Account State Open'
 
@@ -39,6 +39,5 @@
             wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
         return {'type': 'ir.actions.act_window_close'}
 
-account_state_open()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_subscription_generate.py'
--- account/wizard/account_subscription_generate.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_subscription_generate.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_subscription_generate(osv.osv_memory):
+class account_subscription_generate(orm.TransientModel):
 
     _name = "account.subscription.generate"
     _description = "Subscription Compute"
@@ -48,6 +48,5 @@
         result['domain'] = str([('id','in',moves_created)])
         return result
 
-account_subscription_generate()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_tax_chart.py'
--- account/wizard/account_tax_chart.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_tax_chart.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_tax_chart(osv.osv_memory):
+class account_tax_chart(orm.TransientModel):
     """
     For Chart of taxes
     """
@@ -73,6 +73,5 @@
         'target_move': 'posted'
     }
 
-account_tax_chart()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_unreconcile.py'
--- account/wizard/account_unreconcile.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_unreconcile.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class account_unreconcile(osv.osv_memory):
+class account_unreconcile(orm.TransientModel):
     _name = "account.unreconcile"
     _description = "Account Unreconcile"
 
@@ -33,9 +33,8 @@
             obj_move_line._remove_move_reconcile(cr, uid, context['active_ids'], context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_unreconcile()
 
-class account_unreconcile_reconcile(osv.osv_memory):
+class account_unreconcile_reconcile(orm.TransientModel):
     _name = "account.unreconcile.reconcile"
     _description = "Account Unreconcile Reconcile"
 
@@ -48,6 +47,5 @@
             obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_unreconcile_reconcile()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_use_model.py'
--- account/wizard/account_use_model.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_use_model.py	2012-12-20 15:08:18 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_use_model(osv.osv_memory):
+class account_use_model(orm.TransientModel):
 
     _name = 'account.use.model'
     _description = 'Use model'
@@ -71,6 +71,5 @@
             'type': 'ir.actions.act_window',
         }
 
-account_use_model()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/account_validate_account_move.py'
--- account/wizard/account_validate_account_move.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_validate_account_move.py	2012-12-20 15:08:18 +0000
@@ -18,10 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class validate_account_move(osv.osv_memory):
+class validate_account_move(orm.TransientModel):
     _name = "validate.account.move"
     _description = "Validate Account Move"
     _columns = {
@@ -40,9 +40,8 @@
         obj_move.button_validate(cr, uid, ids_move, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-validate_account_move()
 
-class validate_account_move_lines(osv.osv_memory):
+class validate_account_move_lines(orm.TransientModel):
     _name = "validate.account.move.lines"
     _description = "Validate Account Move Lines"
 
@@ -61,7 +60,6 @@
             raise osv.except_osv(_('Warning!'), _('Selected Entry Lines does not have any account move enties in draft state.'))
         obj_move.button_validate(cr, uid, move_ids, context)
         return {'type': 'ir.actions.act_window_close'}
-validate_account_move_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account/wizard/account_vat.py'
--- account/wizard/account_vat.py	2012-12-06 14:56:32 +0000
+++ account/wizard/account_vat.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_vat_declaration(osv.osv_memory):
+class account_vat_declaration(orm.TransientModel):
     _name = 'account.vat.declaration'
     _description = 'Account Vat Declaration'
     _inherit = "account.common.report"
@@ -59,6 +59,5 @@
             'datas': datas,
         }
 
-account_vat_declaration()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account/wizard/pos_box.py'
--- account/wizard/pos_box.py	2012-12-17 15:23:03 +0000
+++ account/wizard/pos_box.py	2012-12-20 15:08:18 +0000
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 
-class CashBox(osv.osv_memory):
+class CashBox(orm.TransientModel):
     _register = False
     _columns = {
         'name' : fields.char('Reason', size=64, required=True),
@@ -63,7 +63,6 @@
             'name' : box.name,
         }
 
-CashBoxIn()
 
 class CashBoxOut(CashBox):
     _name = 'cash.box.out'
@@ -78,4 +77,3 @@
             'name' : box.name,
         }
 
-CashBoxOut()
 
=== modified file 'account_analytic_analysis/account_analytic_analysis.py'
--- account_analytic_analysis/account_analytic_analysis.py	2012-12-06 14:56:32 +0000
+++ account_analytic_analysis/account_analytic_analysis.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.osv.orm import intersect, except_orm
 import openerp.tools
 from openerp.tools.translate import _
@@ -27,7 +27,7 @@
 from openerp.addons.decimal_precision import decimal_precision as dp
 
 
-class account_analytic_account(osv.osv):
+class account_analytic_account(orm.Model):
     _name = "account.analytic.account"
     _inherit = "account.analytic.account"
 
@@ -484,9 +484,8 @@
             res['value']['to_invoice'] = template.to_invoice.id
             res['value']['pricelist_id'] = template.pricelist_id.id
         return res
-account_analytic_account()
 
-class account_analytic_account_summary_user(osv.osv):
+class account_analytic_account_summary_user(orm.Model):
     _name = "account_analytic_analysis.summary.user"
     _description = "Hours Summary by User"
     _order='user'
@@ -539,9 +538,8 @@
                     unit_amount
             from lu, mu)''')
                    
-account_analytic_account_summary_user()
 
-class account_analytic_account_summary_month(osv.osv):
+class account_analytic_account_summary_month(orm.Model):
     _name = "account_analytic_analysis.summary.month"
     _description = "Hours summary by month"
     _auto = False
@@ -601,5 +599,4 @@
                 ')')
 
 
-account_analytic_account_summary_month()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_analytic_analysis/cron_account_analytic_account.py'
--- account_analytic_analysis/cron_account_analytic_account.py	2012-12-17 14:43:06 +0000
+++ account_analytic_analysis/cron_account_analytic_account.py	2012-12-20 15:08:18 +0000
@@ -7,7 +7,7 @@
     import StringIO
 
 from openerp import tools
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
 MAKO_TEMPLATE = u"""Hello ${user.name},
 
@@ -45,7 +45,7 @@
 OpenERP
 """
 
-class analytic_account(osv.osv):
+class analytic_account(orm.Model):
     _inherit = 'account.analytic.account'
 
     def cron_account_analytic_account(self, cr, uid, context=None):
@@ -74,6 +74,5 @@
 
         return True
 
-analytic_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_analytic_analysis/res_config.py'
--- account_analytic_analysis/res_config.py	2012-12-06 14:56:32 +0000
+++ account_analytic_analysis/res_config.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class sale_configuration(osv.osv_memory):
+class sale_configuration(orm.TransientModel):
     _inherit = 'sale.config.settings'
 
     _columns = {
 
=== modified file 'account_analytic_default/account_analytic_default.py'
--- account_analytic_default/account_analytic_default.py	2012-12-06 14:56:32 +0000
+++ account_analytic_default/account_analytic_default.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_analytic_default(osv.osv):
+class account_analytic_default(orm.Model):
     _name = "account.analytic.default"
     _description = "Analytic Distribution"
     _rec_name = "analytic_id"
@@ -67,9 +67,8 @@
                 best_index = index
         return res
 
-account_analytic_default()
 
-class account_invoice_line(osv.osv):
+class account_invoice_line(orm.Model):
     _inherit = "account.invoice.line"
     _description = "Invoice Line"
 
@@ -82,10 +81,9 @@
             res_prod['value'].update({'account_analytic_id': False})
         return res_prod
 
-account_invoice_line()
-
-
-class stock_picking(osv.osv):
+
+
+class stock_picking(orm.Model):
     _inherit = "stock.picking"
 
     def _get_account_analytic_invoice(self, cursor, user, picking, move_line):
@@ -97,9 +95,8 @@
 
         return super(stock_picking, self)._get_account_analytic_invoice(cursor, user, picking, move_line)
 
-stock_picking()
 
-class sale_order_line(osv.osv):
+class sale_order_line(orm.Model):
     _inherit = "sale.order.line"
 
     # Method overridden to set the analytic account by default on criterion match
@@ -118,6 +115,5 @@
                 inv_line_obj.write(cr, uid, [line.id], {'account_analytic_id': rec.analytic_id.id}, context=context)
         return create_ids
 
-sale_order_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py	2012-12-06 14:56:32 +0000
+++ account_analytic_plans/account_analytic_plans.py	2012-12-20 15:08:18 +0000
@@ -22,7 +22,7 @@
 import time
 from lxml import etree
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import tools
 from openerp.tools.translate import _
 
@@ -47,7 +47,7 @@
             res[r[self._fields_id]].append( r['id'] )
         return res
 
-class account_analytic_line(osv.osv):
+class account_analytic_line(orm.Model):
     _inherit = 'account.analytic.line'
     _description = 'Analytic Line'
 
@@ -65,9 +65,8 @@
         'percentage': fields.float('Percentage')
     }
 
-account_analytic_line()
 
-class account_analytic_plan(osv.osv):
+class account_analytic_plan(orm.Model):
     _name = "account.analytic.plan"
     _description = "Analytic Plan"
     _columns = {
@@ -75,9 +74,8 @@
         'plan_ids': fields.one2many('account.analytic.plan.line', 'plan_id', 'Analytic Plans'),
     }
 
-account_analytic_plan()
 
-class account_analytic_plan_line(osv.osv):
+class account_analytic_plan_line(orm.Model):
     _name = "account.analytic.plan.line"
     _description = "Analytic Plan Line"
     _order = "sequence, id"
@@ -94,9 +92,8 @@
         'max_required': 100.0,
     }
 
-account_analytic_plan_line()
 
-class account_analytic_plan_instance(osv.osv):
+class account_analytic_plan_instance(orm.Model):
     _name = "account.analytic.plan.instance"
     _description = "Analytic Plan Instance"
     _columns = {
@@ -257,9 +254,8 @@
                 vals['code'] = this.code and (str(this.code)+'*') or "*"
         return super(account_analytic_plan_instance, self).write(cr, uid, ids, vals, context=context)
 
-account_analytic_plan_instance()
 
-class account_analytic_plan_instance_line(osv.osv):
+class account_analytic_plan_instance_line(orm.Model):
     _name = "account.analytic.plan.instance.line"
     _description = "Analytic Instance Line"
     _rec_name = "analytic_account_id"
@@ -280,18 +276,16 @@
             res.append((record['id'], record['analytic_account_id']))
         return res
 
-account_analytic_plan_instance_line()
 
-class account_journal(osv.osv):
+class account_journal(orm.Model):
     _inherit = "account.journal"
     _name = "account.journal"
     _columns = {
         'plan_id': fields.many2one('account.analytic.plan', 'Analytic Plans'),
     }
 
-account_journal()
 
-class account_invoice_line(osv.osv):
+class account_invoice_line(orm.Model):
     _inherit = "account.invoice.line"
     _name = "account.invoice.line"
     _columns = {
@@ -315,9 +309,8 @@
             res_prod['value'].update({'analytics_id': rec.analytics_id.id})
         return res_prod
 
-account_invoice_line()
 
-class account_move_line(osv.osv):
+class account_move_line(orm.Model):
 
     _inherit = "account.move.line"
     _name = "account.move.line"
@@ -370,9 +363,8 @@
         result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return result
 
-account_move_line()
 
-class account_invoice(osv.osv):
+class account_invoice(orm.Model):
     _name = "account.invoice"
     _inherit = "account.invoice"
 
@@ -425,24 +417,21 @@
                     il['analytic_lines'].append((0, 0, al_vals))
         return iml
 
-account_invoice()
 
-class account_analytic_plan(osv.osv):
+class account_analytic_plan(orm.Model):
     _inherit = "account.analytic.plan"
     _columns = {
         'default_instance_id': fields.many2one('account.analytic.plan.instance', 'Default Entries'),
     }
-account_analytic_plan()
 
-class analytic_default(osv.osv):
+class analytic_default(orm.Model):
     _inherit = "account.analytic.default"
     _columns = {
         'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
 
-analytic_default()
 
-class sale_order_line(osv.osv):
+class sale_order_line(orm.Model):
     _inherit = "sale.order.line"
 
     # Method overridden to set the analytic account by default on criterion match
@@ -459,10 +448,9 @@
                     inv_line_obj.write(cr, uid, [line.id], {'analytics_id': rec.analytics_id.id}, context=context)
         return create_ids
 
-sale_order_line()
-
-
-class account_bank_statement(osv.osv):
+
+
+class account_bank_statement(orm.Model):
     _inherit = "account.bank.statement"
     _name = "account.bank.statement"
 
@@ -488,15 +476,13 @@
                     continue
         return True
 
-account_bank_statement()
-
-
-class account_bank_statement_line(osv.osv):
+
+
+class account_bank_statement_line(orm.Model):
     _inherit = "account.bank.statement.line"
     _name = "account.bank.statement.line"
     _columns = {
         'analytics_id': fields.many2one('account.analytic.plan.instance', 'Analytic Distribution'),
     }
-account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_analytic_plans/wizard/account_crossovered_analytic.py'
--- account_analytic_plans/wizard/account_crossovered_analytic.py	2012-12-06 14:56:32 +0000
+++ account_analytic_plans/wizard/account_crossovered_analytic.py	2012-12-20 15:08:18 +0000
@@ -21,10 +21,10 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_crossovered_analytic(osv.osv_memory):
+class account_crossovered_analytic(orm.TransientModel):
     _name = "account.crossovered.analytic"
     _description = "Print Crossovered Analytic"
     _columns = {
@@ -71,6 +71,5 @@
             'datas': datas,
         }
 
-account_crossovered_analytic()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_analytic_plans/wizard/analytic_plan_create_model.py'
--- account_analytic_plans/wizard/analytic_plan_create_model.py	2012-12-06 14:56:32 +0000
+++ account_analytic_plans/wizard/analytic_plan_create_model.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp.tools.translate import _
 
-class analytic_plan_create_model(osv.osv_memory):
+class analytic_plan_create_model(orm.TransientModel):
     _name = "analytic.plan.create.model"
     _description = "analytic.plan.create.model"
 
@@ -55,6 +55,5 @@
         else:
             return {'type': 'ir.actions.act_window_close'}
 
-analytic_plan_create_model()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_anglo_saxon/invoice.py'
--- account_anglo_saxon/invoice.py	2012-12-19 01:04:29 +0000
+++ account_anglo_saxon/invoice.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class account_invoice_line(osv.osv):
+class account_invoice_line(orm.Model):
     _inherit = "account.invoice.line"
 
     def move_line_get(self, cr, uid, invoice_id, context=None):
@@ -157,7 +157,7 @@
                 res['value'].update({'account_id':a})
         return res
 
-class account_invoice(osv.osv):
+class account_invoice(orm.Model):
     _inherit = "account.invoice"
 
     def _prepare_refund(self, cr, uid, invoice, date=None, period_id=None, description=None, journal_id=None, context=None):
 
=== modified file 'account_anglo_saxon/product.py'
--- account_anglo_saxon/product.py	2012-12-06 14:56:32 +0000
+++ account_anglo_saxon/product.py	2012-12-20 15:08:18 +0000
@@ -18,9 +18,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class product_category(osv.osv):
+class product_category(orm.Model):
     _inherit = "product.category"
     _columns = {
         'property_account_creditor_price_difference_categ': fields.property(
@@ -48,9 +48,8 @@
             help="This account will be used to value outgoing stock using cost price."),
 
     }
-product_category()
 
-class product_template(osv.osv):
+class product_template(orm.Model):
     _inherit = "product.template"
     _columns = {
         'property_account_creditor_price_difference': fields.property(
@@ -78,7 +77,6 @@
             help="This account will be used to value outgoing stock using cost price."),
 
     }
-product_template()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_anglo_saxon/purchase.py'
--- account_anglo_saxon/purchase.py	2012-12-06 14:56:32 +0000
+++ account_anglo_saxon/purchase.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class purchase_order(osv.osv):
+class purchase_order(orm.Model):
     _name = "purchase.order"
     _inherit = "purchase.order"
     _description = "Purchase Order"
@@ -37,6 +37,5 @@
                 new_account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, acc_id)
                 line.update({'account_id': new_account_id})
         return line
-purchase_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_anglo_saxon/stock.py'
--- account_anglo_saxon/stock.py	2012-12-18 22:50:15 +0000
+++ account_anglo_saxon/stock.py	2012-12-20 15:08:18 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
 #----------------------------------------------------------
 # Stock Picking
 #----------------------------------------------------------
-class stock_picking(osv.osv):
+class stock_picking(orm.Model):
     _inherit = "stock.picking"
     _description = "Picking List"
 
@@ -57,7 +57,6 @@
                             self.pool.get('account.invoice.line').write(cr, uid, [ol.id], {'account_id': a})
         return res
 
-stock_picking()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_asset/account_asset.py'
--- account_asset/account_asset.py	2012-12-17 15:23:03 +0000
+++ account_asset/account_asset.py	2012-12-20 15:08:18 +0000
@@ -23,10 +23,10 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import openerp.addons.decimal_precision as dp
 
-class account_asset_category(osv.osv):
+class account_asset_category(orm.Model):
     _name = 'account.asset.category'
     _description = 'Asset category'
 
@@ -69,9 +69,8 @@
            res['value'] = {'account_depreciation_id': account_asset_id}
         return res
 
-account_asset_category()
 
-class account_asset_asset(osv.osv):
+class account_asset_asset(orm.Model):
     _name = 'account.asset.asset'
     _description = 'Asset'
 
@@ -351,9 +350,8 @@
             'context': context,
         }
 
-account_asset_asset()
 
-class account_asset_depreciation_line(osv.osv):
+class account_asset_depreciation_line(orm.Model):
     _name = 'account.asset.depreciation.line'
     _description = 'Asset depreciation line'
 
@@ -446,18 +444,16 @@
                 asset.write({'state': 'close'})
         return created_move_ids
 
-account_asset_depreciation_line()
 
-class account_move_line(osv.osv):
+class account_move_line(orm.Model):
     _inherit = 'account.move.line'
     _columns = {
         'asset_id': fields.many2one('account.asset.asset', 'Asset'),
         'entry_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}),
 
     }
-account_move_line()
 
-class account_asset_history(osv.osv):
+class account_asset_history(orm.Model):
     _name = 'account.asset.history'
     _description = 'Asset history'
     _columns = {
@@ -480,6 +476,5 @@
         'user_id': lambda self, cr, uid, ctx: uid
     }
 
-account_asset_history()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_asset/account_asset_invoice.py'
--- account_asset/account_asset_invoice.py	2012-12-06 14:56:32 +0000
+++ account_asset/account_asset_invoice.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_invoice(osv.osv):
+class account_invoice(orm.Model):
 
     _inherit = 'account.invoice'
     def action_number(self, cr, uid, ids, *args):
@@ -35,9 +35,8 @@
         res['asset_id'] = x.get('asset_id', False)
         return res
 
-account_invoice()
 
-class account_invoice_line(osv.osv):
+class account_invoice_line(orm.Model):
 
     _inherit = 'account.invoice.line'
     _columns = {
@@ -66,6 +65,5 @@
                     asset_obj.validate(cr, uid, [asset_id], context=context)
         return True
 
-account_invoice_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_asset/report/account_asset_report.py'
--- account_asset/report/account_asset_report.py	2012-12-06 14:56:32 +0000
+++ account_asset/report/account_asset_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class asset_asset_report(osv.osv):
+class asset_asset_report(orm.Model):
     _name = "asset.asset.report"
     _description = "Assets Analysis"
     _auto = False
@@ -82,6 +82,5 @@
                     a.purchase_value, a.id, a.salvage_value
         )""")
 	
-asset_asset_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_asset/wizard/account_asset_change_duration.py' (properties changed: +x to -x)
--- account_asset/wizard/account_asset_change_duration.py	2012-12-06 14:56:32 +0000
+++ account_asset/wizard/account_asset_change_duration.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 import time
 from lxml import etree
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class asset_modify(osv.osv_memory):
+class asset_modify(orm.TransientModel):
     _name = 'asset.modify'
     _description = 'Modify Asset'
 
@@ -127,6 +127,5 @@
         asset_obj.compute_depreciation_board(cr, uid, [asset_id], context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-asset_modify()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_asset/wizard/wizard_asset_compute.py' (properties changed: +x to -x)
--- account_asset/wizard/wizard_asset_compute.py	2012-12-06 14:56:32 +0000
+++ account_asset/wizard/wizard_asset_compute.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class asset_depreciation_confirmation_wizard(osv.osv_memory):
+class asset_depreciation_confirmation_wizard(orm.TransientModel):
     _name = "asset.depreciation.confirmation.wizard"
     _description = "asset.depreciation.confirmation.wizard"
     _columns = {
@@ -55,6 +55,5 @@
             'type': 'ir.actions.act_window',
         }
 
-asset_depreciation_confirmation_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_bank_statement_extensions/account_bank_statement.py'
--- account_bank_statement_extensions/account_bank_statement.py	2012-12-17 15:23:03 +0000
+++ account_bank_statement_extensions/account_bank_statement.py	2012-12-20 15:08:18 +0000
@@ -21,11 +21,11 @@
 ##############################################################################
 
 import time
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 
-class account_bank_statement(osv.osv):
+class account_bank_statement(orm.Model):
     _inherit = 'account.bank.statement'
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -33,7 +33,7 @@
             context = {}
         # bypass obsolete statement line resequencing
         if vals.get('line_ids', False) or context.get('ebanking_import', False):
-            res = super(osv.osv, self).write(cr, uid, ids, vals, context=context)
+            res = super(orm.Model, self).write(cr, uid, ids, vals, context=context)
         else:
             res = super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
         return res
@@ -56,9 +56,8 @@
                     (tuple([x.id for x in st.line_ids]),))
         return True
 
-account_bank_statement()
 
-class account_bank_statement_line_global(osv.osv):
+class account_bank_statement_line_global(orm.Model):
     _name = 'account.bank.statement.line.global'
     _description = 'Batch Payment Info'
 
@@ -100,9 +99,8 @@
             ids = self.search(cr, user, args, context=context, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-account_bank_statement_line_global()
 
-class account_bank_statement_line(osv.osv):
+class account_bank_statement_line(orm.Model):
     _inherit = 'account.bank.statement.line'
     _columns = {
         'val_date': fields.date('Value Date', states={'confirm': [('readonly', True)]}),
@@ -130,6 +128,5 @@
             Please go to the associated bank statement in order to delete and/or modify bank statement line.'))
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
-account_bank_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_bank_statement_extensions/res_partner_bank.py'
--- account_bank_statement_extensions/res_partner_bank.py	2012-12-06 14:56:32 +0000
+++ account_bank_statement_extensions/res_partner_bank.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class res_partner_bank(osv.osv):
+class res_partner_bank(orm.Model):
     _inherit = 'res.partner.bank'
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
@@ -35,5 +35,4 @@
             ids = self.search(cr, user, args, context=context, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-res_partner_bank()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_bank_statement_extensions/wizard/cancel_statement_line.py'
--- account_bank_statement_extensions/wizard/cancel_statement_line.py	2012-12-06 14:56:32 +0000
+++ account_bank_statement_extensions/wizard/cancel_statement_line.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class cancel_statement_line(osv.osv_memory):
+class cancel_statement_line(orm.TransientModel):
     _name = 'cancel.statement.line'
     _description = 'Cancel selected statement lines'
 
@@ -32,6 +32,5 @@
         line_obj.write(cr, uid, line_ids, {'state': 'draft'}, context=context)
         return {}
 
-cancel_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_bank_statement_extensions/wizard/confirm_statement_line.py'
--- account_bank_statement_extensions/wizard/confirm_statement_line.py	2012-12-06 14:56:32 +0000
+++ account_bank_statement_extensions/wizard/confirm_statement_line.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
-class confirm_statement_line(osv.osv_memory):
+class confirm_statement_line(orm.TransientModel):
     _name = 'confirm.statement.line'
     _description = 'Confirm selected statement lines'
 
@@ -32,6 +32,5 @@
         line_obj.write(cr, uid, line_ids, {'state': 'confirm'}, context=context)
         return {}
 
-confirm_statement_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_budget/account_budget.py'
--- account_budget/account_budget.py	2012-12-17 15:23:03 +0000
+++ account_budget/account_budget.py	2012-12-20 15:08:18 +0000
@@ -21,7 +21,7 @@
 
 import datetime
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 import openerp.addons.decimal_precision as dp
@@ -33,7 +33,7 @@
 # ---------------------------------------------------------
 # Budgets
 # ---------------------------------------------------------
-class account_budget_post(osv.osv):
+class account_budget_post(orm.Model):
     _name = "account.budget.post"
     _description = "Budgetary Position"
     _columns = {
@@ -48,10 +48,9 @@
     }
     _order = "name"
 
-account_budget_post()
-
-
-class crossovered_budget(osv.osv):
+
+
+class crossovered_budget(orm.Model):
     _name = "crossovered.budget"
     _description = "Budget"
 
@@ -104,9 +103,8 @@
         })
         return True
 
-crossovered_budget()
 
-class crossovered_budget_lines(osv.osv):
+class crossovered_budget_lines(orm.Model):
 
     def _prac_amt(self, cr, uid, ids, context=None):
         res = {}
@@ -202,15 +200,13 @@
         'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
 
-crossovered_budget_lines()
 
-class account_analytic_account(osv.osv):
+class account_analytic_account(orm.Model):
     _inherit = "account.analytic.account"
 
     _columns = {
         'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'),
     }
 
-account_analytic_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_budget/report/crossovered_budget_report.py'
--- account_budget/report/crossovered_budget_report.py	2012-12-06 15:13:16 +0000
+++ account_budget/report/crossovered_budget_report.py	2012-12-20 15:08:18 +0000
@@ -20,12 +20,8 @@
 ##############################################################################
 
 import time
-import datetime
 
-from openerp import pooler
 from openerp.report import report_sxw
-import operator
-from openerp import osv
 
 class budget_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
 
=== modified file 'account_budget/wizard/account_budget_analytic.py'
--- account_budget/wizard/account_budget_analytic.py	2012-12-06 14:56:32 +0000
+++ account_budget/wizard/account_budget_analytic.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_budget_analytic(osv.osv_memory):
+class account_budget_analytic(orm.TransientModel):
 
     _name = 'account.budget.analytic'
     _description = 'Account Budget report for analytic account'
@@ -50,6 +50,5 @@
             'datas': datas,
         }
 
-account_budget_analytic()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_budget/wizard/account_budget_crossovered_report.py'
--- account_budget/wizard/account_budget_crossovered_report.py	2012-12-06 14:56:32 +0000
+++ account_budget/wizard/account_budget_crossovered_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_budget_crossvered_report(osv.osv_memory):
+class account_budget_crossvered_report(orm.TransientModel):
 
     _name = "account.budget.crossvered.report"
     _description = "Account Budget crossvered report"
@@ -51,6 +51,5 @@
             'datas': datas,
         }
 
-account_budget_crossvered_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_budget/wizard/account_budget_crossovered_summary_report.py'
--- account_budget/wizard/account_budget_crossovered_summary_report.py	2012-12-06 14:56:32 +0000
+++ account_budget/wizard/account_budget_crossovered_summary_report.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_budget_crossvered_summary_report(osv.osv_memory):
+class account_budget_crossvered_summary_report(orm.TransientModel):
     """
     This wizard provides the crossovered budget summary report'
     """
@@ -53,7 +53,6 @@
             'datas': datas,
         }
 
-account_budget_crossvered_summary_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'account_budget/wizard/account_budget_report.py'
--- account_budget/wizard/account_budget_report.py	2012-12-06 14:56:32 +0000
+++ account_budget/wizard/account_budget_report.py	2012-12-20 15:08:18 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 import time
 
-from openerp.osv import fields, osv
-
-
-class account_budget_report(osv.osv_memory):
+from openerp.osv import fields, osv, orm
+
+
+class account_budget_report(orm.TransientModel):
 
     _name = "account.budget.report"
     _description = "Account Budget report for analytic account"
@@ -52,6 +52,5 @@
             'datas': datas,
         }
 
-account_budget_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_check_writing/account.py'
--- account_check_writing/account.py	2012-12-06 14:56:32 +0000
+++ account_check_writing/account.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import osv,fields
+from openerp.osv import osv,fields, orm
 
-class account_journal(osv.osv):
+class account_journal(orm.Model):
     _inherit = "account.journal"
 
     _columns = {
@@ -29,9 +29,8 @@
         'use_preprint_check': fields.boolean('Use Preprinted Check'),
         }
 
-account_journal()
 
-class res_company(osv.osv):
+class res_company(orm.Model):
     _inherit = "res.company"
     _columns = {
         'check_layout': fields.selection([
@@ -46,5 +45,4 @@
         'check_layout' : lambda *a: 'top',
     }
     
-res_company()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_check_writing/account_voucher.py'
--- account_check_writing/account_voucher.py	2012-12-17 15:46:28 +0000
+++ account_check_writing/account_voucher.py	2012-12-20 15:08:18 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.osv import osv,fields
+from openerp.osv import osv,fields, orm
 from openerp.tools.translate import _
 from openerp.tools.amount_to_text_en import amount_to_text
 from lxml import etree
 
-class account_voucher(osv.osv):
+class account_voucher(orm.Model):
     _inherit = 'account.voucher'
 
     def _make_journal_search(self, cr, uid, ttype, context=None):
@@ -97,4 +97,3 @@
             res['arch'] = etree.tostring(doc)
         return res
 
-account_voucher()
 
=== modified file 'account_check_writing/wizard/account_check_batch_printing.py'
--- account_check_writing/wizard/account_check_batch_printing.py	2012-12-17 15:46:28 +0000
+++ account_check_writing/wizard/account_check_batch_printing.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 from openerp.tools.translate import _
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_check_write(osv.osv_memory):
+class account_check_write(orm.TransientModel):
     _name = 'account.check.write'
     _description = 'Prin Check in Batch'
 
@@ -83,5 +83,4 @@
             'nodestroy': True
             }
 
-account_check_write()
 
 
=== modified file 'account_followup/account_followup.py'
--- account_followup/account_followup.py	2012-12-17 14:43:06 +0000
+++ account_followup/account_followup.py	2012-12-20 15:08:18 +0000
@@ -19,12 +19,12 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from lxml import etree
 
 from openerp.tools.translate import _
 
-class followup(osv.osv):
+class followup(orm.Model):
     _name = 'account_followup.followup'
     _description = 'Account Follow-up'
     _rec_name = 'name'
@@ -39,7 +39,7 @@
     _sql_constraints = [('company_uniq', 'unique(company_id)', 'Only one follow-up per company is allowed')] 
 
 
-class followup_line(osv.osv):
+class followup_line(orm.Model):
 
     def _get_default_template(self, cr, uid, ids, context=None):
         try:
@@ -95,7 +95,7 @@
     ]
 
 
-class account_move_line(osv.osv):
+class account_move_line(orm.Model):
 
     def _get_result(self, cr, uid, ids, name, arg, context=None):
         res = {}
@@ -113,7 +113,7 @@
     }
 
 
-class res_partner(osv.osv):
+class res_partner(orm.Model):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=None, context=None, toolbar=False, submenu=False):
         res = super(res_partner, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context,
 
=== modified file 'account_followup/report/account_followup_report.py'
--- account_followup/report/account_followup_report.py	2012-12-06 14:56:32 +0000
+++ account_followup/report/account_followup_report.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import tools
 
-class account_followup_stat(osv.osv):
+class account_followup_stat(orm.Model):
     _name = "account_followup.stat"
     _description = "Follow-up Statistics"
     _rec_name = 'partner_id'
@@ -91,6 +91,5 @@
                 GROUP BY
                     l.id, l.partner_id, l.company_id, l.blocked, l.period_id
             )""")
-account_followup_stat()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2012-12-10 11:16:54 +0000
+++ account_followup/wizard/account_followup_print.py	2012-12-20 15:08:18 +0000
@@ -23,10 +23,10 @@
 import time
 
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_followup_stat_by_partner(osv.osv):
+class account_followup_stat_by_partner(orm.Model):
     _name = "account_followup.stat.by.partner"
     _description = "Follow-up Statistics by Partner"
     _rec_name = 'partner_id'
@@ -72,10 +72,9 @@
                     GROUP BY
                     l.partner_id, l.company_id
             )""") #Blocked is to take into account litigation
-account_followup_stat_by_partner()
-
-
-class account_followup_sending_results(osv.osv_memory):
+
+
+class account_followup_sending_results(orm.TransientModel):
     
     def do_report(self, cr, uid, ids, context=None):
         if context is None:
@@ -106,10 +105,9 @@
         'description':_get_description,
     }
  
-account_followup_sending_results()
-
-
-class account_followup_print(osv.osv_memory):
+
+
+class account_followup_print(orm.TransientModel):
     _name = 'account_followup.print'
     _description = 'Print Follow-up & Send Mail to Customers'
     _columns = {
@@ -315,6 +313,5 @@
                 to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': stat_line_id}
         return {'partner_ids': partner_list, 'to_update': to_update}
 
-account_followup_print()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/account_invoice.py'
--- account_payment/account_invoice.py	2012-12-06 14:56:32 +0000
+++ account_payment/account_invoice.py	2012-12-20 15:08:18 +0000
@@ -21,9 +21,9 @@
 
 from datetime import datetime
 from openerp.tools.translate import _
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class Invoice(osv.osv):
+class Invoice(orm.Model):
     _inherit = 'account.invoice'
 
     # Forbid to cancel an invoice if the related move lines have already been
@@ -65,6 +65,5 @@
                     'minus the amount which is already in payment order'),
     }
 
-Invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/account_move_line.py'
--- account_payment/account_move_line.py	2012-12-06 14:56:32 +0000
+++ account_payment/account_move_line.py	2012-12-20 15:08:18 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 
 from operator import itemgetter
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_move_line(osv.osv):
+class account_move_line(orm.Model):
     _inherit = "account.move.line"
 
     def amount_to_pay(self, cr, uid, ids, name, arg=None, context=None):
@@ -115,6 +115,5 @@
             type='float', string='Amount to pay', fnct_search=_to_pay_search),
     }
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/account_payment.py'
--- account_payment/account_payment.py	2012-12-06 14:56:32 +0000
+++ account_payment/account_payment.py	2012-12-20 15:08:18 +0000
@@ -22,12 +22,12 @@
 import logging
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import netsvc
 
 _logger = logging.getLogger(__name__)
 
-class payment_mode(osv.osv):
+class payment_mode(orm.Model):
     _name= 'payment.mode'
     _description= 'Payment Mode'
     _columns = {
@@ -63,9 +63,8 @@
         return {'value': result}
 
 
-payment_mode()
 
-class payment_order(osv.osv):
+class payment_order(orm.Model):
     _name = 'payment.order'
     _description = 'Payment Order'
     _rec_name = 'reference'
@@ -174,9 +173,8 @@
             payment_line_obj.write(cr, uid, payment_line_ids, {'date': False}, context=context)
         return super(payment_order, self).write(cr, uid, ids, vals, context=context)
 
-payment_order()
 
-class payment_line(osv.osv):
+class payment_line(orm.Model):
     _name = 'payment.line'
     _description = 'Payment Line'
 
@@ -421,6 +419,5 @@
             res['communication2']['states']['normal'] = [('readonly', False)]
         return res
 
-payment_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/wizard/account_payment_order.py'
--- account_payment/wizard/account_payment_order.py	2012-12-06 14:56:32 +0000
+++ account_payment/wizard/account_payment_order.py	2012-12-20 15:08:18 +0000
@@ -22,9 +22,9 @@
 import time
 from lxml import etree
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class payment_order_create(osv.osv_memory):
+class payment_order_create(orm.TransientModel):
     """
     Create a payment object with lines corresponding to the account move line
     to pay according to the date and the mode provided by the user.
@@ -118,6 +118,5 @@
                 'target': 'new',
         }
 
-payment_order_create()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/wizard/account_payment_pay.py'
--- account_payment/wizard/account_payment_pay.py	2012-12-06 14:56:32 +0000
+++ account_payment/wizard/account_payment_pay.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
 #TODO:REMOVE this wizard is not used 
-class account_payment_make_payment(osv.osv_memory):
+class account_payment_make_payment(orm.TransientModel):
     _name = "account.payment.make.payment"
     _description = "Account make payment"
 
@@ -54,6 +54,5 @@
 #        id = obj_model.read(cr, uid, [result], ['res_id'])[0]['res_id']
 #        return obj_act.read(cr, uid, [id])[0]
 
-account_payment_make_payment()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_payment/wizard/account_payment_populate_statement.py'
--- account_payment/wizard/account_payment_populate_statement.py	2012-12-18 17:55:47 +0000
+++ account_payment/wizard/account_payment_populate_statement.py	2012-12-20 15:08:18 +0000
@@ -22,9 +22,9 @@
 import time
 from lxml import etree
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_payment_populate_statement(osv.osv_memory):
+class account_payment_populate_statement(orm.TransientModel):
     _name = "account.payment.populate.statement"
     _description = "Account Payment Populate Statement"
     _columns = {
@@ -118,6 +118,5 @@
                 line_obj.write(cr, uid, [line.id], {'bank_statement_line_id': st_line_id})
         return {'type': 'ir.actions.act_window_close'}
 
-account_payment_populate_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_sequence/account_sequence.py'
--- account_sequence/account_sequence.py	2012-12-06 14:56:32 +0000
+++ account_sequence/account_sequence.py	2012-12-20 15:08:18 +0000
@@ -20,9 +20,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_move(osv.osv):
+class account_move(orm.Model):
     _inherit = 'account.move'
 
     _columns = {
@@ -40,24 +40,21 @@
                 self.write(cr, uid, [move.id], {'internal_sequence_number': seq_no})
         return res
 
-account_move()
 
-class account_journal(osv.osv):
+class account_journal(orm.Model):
     _inherit = "account.journal"
 
     _columns = {
         'internal_sequence_id': fields.many2one('ir.sequence', 'Internal Sequence', help="This sequence will be used to maintain the internal number for the journal entries related to this journal."),
     }
 
-account_journal()
 
-class account_move_line(osv.osv):
+class account_move_line(orm.Model):
     _inherit = "account.move.line"
 
     _columns = {
         'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', help='Internal Sequence Number', string='Internal Number'),
     }
 
-account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_sequence/account_sequence_installer.py'
--- account_sequence/account_sequence_installer.py	2012-12-06 14:56:32 +0000
+++ account_sequence/account_sequence_installer.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class account_sequence_installer(osv.osv_memory):
+class account_sequence_installer(orm.TransientModel):
     _name = 'account.sequence.installer'
     _inherit = 'res.config.installer'
 
@@ -79,6 +79,5 @@
         ir_values_obj.set(cr, uid, key='default', key2=False, name='internal_sequence_id', models =[('account.journal', False)], value=ir_seq)
         return res
 
-account_sequence_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_test/account_test.py'
--- account_test/account_test.py	2012-12-17 15:46:28 +0000
+++ account_test/account_test.py	2012-12-20 15:08:18 +0000
@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 import pooler
 import netsvc
 import time
@@ -43,7 +43,7 @@
 result = res
 '''
 
-class accounting_assert_test(osv.osv):
+class accounting_assert_test(orm.Model):
     _name = "accounting.assert.test"
     _order = "sequence"
 
@@ -61,5 +61,4 @@
         'sequence': 10,
     }
 
-accounting_assert_test()
 
 
=== modified file 'account_voucher/account_voucher.py'
--- account_voucher/account_voucher.py	2012-12-20 11:47:30 +0000
+++ account_voucher/account_voucher.py	2012-12-20 15:08:18 +0000
@@ -23,11 +23,11 @@
 from lxml import etree
 
 from openerp import netsvc
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import openerp.addons.decimal_precision as dp
 from openerp.tools.translate import _
 
-class res_company(osv.osv):
+class res_company(orm.Model):
     _inherit = "res.company"
     _columns = {
         'income_currency_exchange_account_id': fields.many2one(
@@ -40,9 +40,8 @@
             domain="[('type', '=', 'other')]",),
     }
 
-res_company()
 
-class account_config_settings(osv.osv_memory):
+class account_config_settings(orm.TransientModel):
     _inherit = 'account.config.settings'
     _columns = {
         'income_currency_exchange_account_id': fields.related(
@@ -57,7 +56,7 @@
             string="Loss Exchange Rate Account"),
     }
 
-class account_voucher(osv.osv):
+class account_voucher(orm.Model):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
         for voucher in self.browse(cr, uid, ids, context=context):
@@ -1327,8 +1326,37 @@
             default['date'] = time.strftime('%Y-%m-%d')
         return super(account_voucher, self).copy(cr, uid, id, default, context)
 
-
-class account_voucher_line(osv.osv):
+<<<<<<< TREE
+=======
+    # -----------------------------------------
+    # OpenChatter notifications and need_action
+    # -----------------------------------------
+    _document_type = {
+        'sale': 'Sales Receipt',
+        'purchase': 'Purchase Receipt',
+        'payment': 'Supplier Payment',
+        'receipt': 'Customer Payment',
+        False: 'Payment',
+    }
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s <b>created</b>." % self._document_type[obj.type or False]
+            self.message_post(cr, uid, [obj.id], body=message, subtype="account_voucher.mt_voucher", context=context)
+
+    def post_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
+            self.message_post(cr, uid, [obj.id], body=message, subtype="account_voucher.mt_voucher", context=context)
+
+    def reconcile_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
+            self.message_post(cr, uid, [obj.id], body=message, subtype="account_voucher.mt_voucher", context=context)
+
+>>>>>>> MERGE-SOURCE
+
+class account_voucher_line(orm.Model):
     _name = 'account.voucher.line'
     _description = 'Voucher Lines'
     _order = "move_line_id"
@@ -1476,9 +1504,8 @@
             'type':ttype
         })
         return values
-account_voucher_line()
 
-class account_bank_statement(osv.osv):
+class account_bank_statement(orm.Model):
     _inherit = 'account.bank.statement'
 
     def button_confirm_bank(self, cr, uid, ids, context=None):
@@ -1529,9 +1556,8 @@
                     raise osv.except_osv(_('Unable to change journal !'), _('You can not change the journal as you already reconciled some statement lines!'))
         return super(account_bank_statement, self).write(cr, uid, ids, vals, context=context)
 
-account_bank_statement()
 
-class account_bank_statement_line(osv.osv):
+class account_bank_statement_line(orm.Model):
     _inherit = 'account.bank.statement.line'
 
     def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
@@ -1583,7 +1609,6 @@
         voucher_obj.unlink(cr, uid, unlink_ids, context=context)
         return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
 
-account_bank_statement_line()
 
 def resolve_o2m_operations(cr, uid, target_osv, operations, fields, context):
     results = []
 
=== modified file 'account_voucher/invoice.py'
--- account_voucher/invoice.py	2012-12-06 14:56:32 +0000
+++ account_voucher/invoice.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp.tools.translate import _
 
-class invoice(osv.osv):
+class invoice(orm.Model):
     _inherit = 'account.invoice'
 
     def invoice_pay_customer(self, cr, uid, ids, context=None):
@@ -51,6 +51,5 @@
             }
         }
 
-invoice()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_voucher/report/account_voucher_sales_receipt.py'
--- account_voucher/report/account_voucher_sales_receipt.py	2012-12-06 14:56:32 +0000
+++ account_voucher/report/account_voucher_sales_receipt.py	2012-12-20 15:08:18 +0000
@@ -18,10 +18,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import tools
 
-class sale_receipt_report(osv.osv):
+class sale_receipt_report(orm.Model):
     _name = "sale.receipt.report"
     _description = "Sales Receipt Statistics"
     _auto = False
@@ -126,6 +126,5 @@
             )
         """)
 
-sale_receipt_report()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'account_voucher/wizard/account_statement_from_invoice.py'
--- account_voucher/wizard/account_statement_from_invoice.py	2012-12-18 17:55:47 +0000
+++ account_voucher/wizard/account_statement_from_invoice.py	2012-12-20 15:08:18 +0000
@@ -21,10 +21,10 @@
 
 import time
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
-class account_statement_from_invoice_lines(osv.osv_memory):
+class account_statement_from_invoice_lines(orm.TransientModel):
     """
     Generate Entries by Statement from Invoices
     """
@@ -123,6 +123,5 @@
             }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
-account_statement_from_invoice_lines()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py	2012-12-20 15:05:47 +0000
+++ analytic/analytic.py	2012-12-20 15:08:18 +0000
@@ -22,12 +22,12 @@
 import time
 from datetime import datetime
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import tools
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
-class account_analytic_account(osv.osv):
+class account_analytic_account(orm.Model):
     _name = 'account.analytic.account'
     _inherit = ['mail.thread']
     _description = 'Analytic Account'
@@ -315,7 +315,27 @@
             account_ids = self.search(cr, uid, args, limit=limit, context=context)
         return self.name_get(cr, uid, account_ids, context=context)
 
+<<<<<<< TREE
 class account_analytic_line(osv.osv):
+=======
+    def create(self, cr, uid, vals, context=None):
+        contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
+        if contract:
+            self.create_send_note(cr, uid, [contract], context=context)
+        return contract
+
+    def create_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            message = _("Contract <b>created</b>.")
+            if obj.partner_id:
+                message = _("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name,)
+            self.message_post(cr, uid, [obj.id], body=message,
+                subtype="analytic.mt_account_status", context=context)
+
+
+
+class account_analytic_line(orm.Model):
+>>>>>>> MERGE-SOURCE
     _name = 'account.analytic.line'
     _description = 'Analytic Line'
 
@@ -355,6 +375,5 @@
         (_check_no_view, 'You cannot create analytic line on view account.', ['account_id']),
     ]
 
-account_analytic_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'analytic_contract_hr_expense/analytic_contract_hr_expense.py'
--- analytic_contract_hr_expense/analytic_contract_hr_expense.py	2012-12-18 13:41:18 +0000
+++ analytic_contract_hr_expense/analytic_contract_hr_expense.py	2012-12-20 15:08:18 +0000
@@ -18,11 +18,11 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.osv.orm import intersect
 from openerp.tools.translate import _
 
-class account_analytic_account(osv.osv):
+class account_analytic_account(orm.Model):
     _name = "account.analytic.account"
     _inherit = "account.analytic.account"
 
@@ -137,6 +137,5 @@
             'nodestroy': True,
         }
 
-account_analytic_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'analytic_user_function/analytic_user_function.py'
--- analytic_user_function/analytic_user_function.py	2012-12-18 22:50:15 +0000
+++ analytic_user_function/analytic_user_function.py	2012-12-20 15:08:18 +0000
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 from openerp.tools.translate import _
 import openerp.addons.decimal_precision as dp
 
-class analytic_user_funct_grid(osv.osv):
+class analytic_user_funct_grid(orm.Model):
     _name="analytic.user.funct.grid"
     _description= "Price per User"
     _columns={
@@ -54,14 +54,14 @@
         return {'value': value}
 
 
-class account_analytic_account(osv.osv):
+class account_analytic_account(orm.Model):
     _inherit = "account.analytic.account"
     _columns = {
         'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
 
-class hr_analytic_timesheet(osv.osv):
+class hr_analytic_timesheet(orm.Model):
     _inherit = "hr.analytic.timesheet"
     # Look in account, if no value for the user => look in parent until there is no more parent to look
     # Take the first found... if nothing found => return False
@@ -146,7 +146,7 @@
                 res ['value']['general_account_id']= a
         return res
 
-class account_analytic_line(osv.osv):
+class account_analytic_line(orm.Model):
     _inherit = "account.analytic.line"
     def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
         for grid in account.user_product_ids:
 
=== modified file 'anonymization/anonymization.py'
--- anonymization/anonymization.py	2012-12-20 11:25:28 +0000
+++ anonymization/anonymization.py	2012-12-20 15:08:18 +0000
@@ -29,7 +29,7 @@
     import pickle
 import random
 import datetime
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 from itertools import groupby
@@ -49,7 +49,7 @@
     return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=itemgetter(*cols)), itemgetter(*cols)))
 
 
-class ir_model_fields_anonymization(osv.osv):
+class ir_model_fields_anonymization(orm.Model):
     _name = 'ir.model.fields.anonymization'
     _rec_name = 'field_id'
 
@@ -218,7 +218,7 @@
     }
 
 
-class ir_model_fields_anonymization_history(osv.osv):
+class ir_model_fields_anonymization_history(orm.Model):
     _name = 'ir.model.fields.anonymization.history'
     _order = "date desc"
 
@@ -232,7 +232,7 @@
     }
 
 
-class ir_model_fields_anonymize_wizard(osv.osv_memory):
+class ir_model_fields_anonymize_wizard(orm.TransientModel):
     _name = 'ir.model.fields.anonymize.wizard'
 
     def _get_state(self, cr, uid, ids, name, arg, context=None):
@@ -619,7 +619,7 @@
         return res
 
 
-class ir_model_fields_anonymization_migration_fix(osv.osv):
+class ir_model_fields_anonymization_migration_fix(orm.Model):
     _name = 'ir.model.fields.anonymization.migration.fix'
     _order = "sequence"
 
 
=== modified file 'audittrail/audittrail.py'
--- audittrail/audittrail.py	2012-12-17 15:46:28 +0000
+++ audittrail/audittrail.py	2012-12-20 15:08:18 +0000
@@ -19,15 +19,14 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
-from openerp.osv.osv import object_proxy
+import time
+
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from openerp import pooler
-import time
-from openerp import tools
 from openerp import SUPERUSER_ID
 
-class audittrail_rule(osv.osv):
+class audittrail_rule(orm.Model):
     """
     For Auddittrail Rule
     """
@@ -119,7 +118,7 @@
         #End Loop
         return True
 
-class audittrail_log(osv.osv):
+class audittrail_log(orm.Model):
     """
     For Audittrail Log
     """
@@ -154,7 +153,7 @@
     }
     _order = "timestamp desc"
 
-class audittrail_log_line(osv.osv):
+class audittrail_log_line(orm.Model):
     """
     Audittrail Log Line.
     """
@@ -171,7 +170,7 @@
           'field_description': fields.char('Field Description', size=64),
         }
 
-class audittrail_objects_proxy(object_proxy):
+class audittrail_objects_proxy(osv.object_proxy):
     """ Uses Object proxy for auditing changes on object of subscribed Rules"""
 
     def get_value_text(self, cr, uid, pool, resource_pool, method, field, value):
@@ -519,7 +518,6 @@
             return self.log_fct(cr, uid, model, method, fct_src, *args, **kw)
         return fct_src(cr, uid, model, method, *args, **kw)
 
-audittrail_objects_proxy()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'audittrail/wizard/audittrail_view_log.py'
--- audittrail/wizard/audittrail_view_log.py	2012-12-06 14:56:32 +0000
+++ audittrail/wizard/audittrail_view_log.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,10 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import time
 
-class audittrail_view_log(osv.osv_memory):
+class audittrail_view_log(orm.TransientModel):
 
     _name = "audittrail.view.log"
     _description = "View Log"
@@ -61,6 +61,5 @@
         #End Loop
         return result
 
-audittrail_view_log()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'auth_crypt/auth_crypt.py'
--- auth_crypt/auth_crypt.py	2012-12-19 11:33:39 +0000
+++ auth_crypt/auth_crypt.py	2012-12-20 15:08:18 +0000
@@ -15,7 +15,7 @@
 from string import ascii_letters, digits
 
 import openerp
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
 _logger = logging.getLogger(__name__)
 
@@ -114,7 +114,7 @@
     result = result.encode('base64') # doesnt seem to be crypt(3) compatible
     return '%s%s$%s' % (magic_sha256, salt, result)
 
-class res_users(osv.osv):
+class res_users(orm.Model):
     _inherit = "res.users"
 
     def set_pw(self, cr, uid, id, name, value, args, context):
 
=== modified file 'auth_ldap/users_ldap.py'
--- auth_ldap/users_ldap.py	2012-12-10 11:16:54 +0000
+++ auth_ldap/users_ldap.py	2012-12-20 15:08:18 +0000
@@ -25,11 +25,11 @@
 import openerp.exceptions
 from openerp import pooler
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp import SUPERUSER_ID
 _logger = logging.getLogger(__name__)
 
-class CompanyLDAP(osv.osv):
+class CompanyLDAP(orm.Model):
     _name = 'res.company.ldap'
     _order = 'sequence'
     _rec_name = 'ldap_server'
@@ -228,19 +228,17 @@
         'create_user': True,
     }
 
-CompanyLDAP()
-
-
-class res_company(osv.osv):
+
+
+class res_company(orm.Model):
     _inherit = "res.company"
     _columns = {
         'ldaps': fields.one2many(
             'res.company.ldap', 'company', 'LDAP Parameters'),
     }
-res_company()
-
-
-class users(osv.osv):
+
+
+class users(orm.Model):
     _inherit = "res.users"
     def login(self, db, login, password):
         user_id = super(users, self).login(db, login, password)
@@ -283,5 +281,4 @@
         cr.close()
         raise openerp.exceptions.AccessDenied()
         
-users()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'auth_oauth/auth_oauth.py'
--- auth_oauth/auth_oauth.py	2012-08-18 13:04:11 +0000
+++ auth_oauth/auth_oauth.py	2012-12-20 15:08:18 +0000
@@ -1,6 +1,6 @@
-from openerp.osv import osv, fields
+from openerp.osv import orm, osv, fields
 
-class auth_oauth_provider(osv.osv):
+class auth_oauth_provider(orm.Model):
     """Class defining the configuration values of an OAuth2 provider"""
 
     _name = 'auth.oauth.provider'
 
=== modified file 'auth_oauth/res_config.py'
--- auth_oauth/res_config.py	2012-08-18 13:04:11 +0000
+++ auth_oauth/res_config.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from openerp.osv import orm, osv, fields
 
 import logging
 _logger = logging.getLogger(__name__)
 
=== modified file 'auth_oauth/res_users.py'
--- auth_oauth/res_users.py	2012-11-27 10:06:35 +0000
+++ auth_oauth/res_users.py	2012-12-20 15:08:18 +0000
@@ -6,7 +6,7 @@
 import simplejson
 
 import openerp
-from openerp.osv import osv, fields
+from openerp.osv import orm, osv, fields
 from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
=== modified file 'auth_oauth_signup/res_users.py'
--- auth_oauth_signup/res_users.py	2012-11-26 11:03:01 +0000
+++ auth_oauth_signup/res_users.py	2012-12-20 15:08:18 +0000
@@ -23,7 +23,7 @@
 import simplejson
 
 import openerp
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 
 _logger = logging.getLogger(__name__)
 
 
=== modified file 'auth_openid/res_users.py'
--- auth_openid/res_users.py	2012-12-10 11:16:54 +0000
+++ auth_openid/res_users.py	2012-12-20 15:08:18 +0000
@@ -19,13 +19,13 @@
 #
 ##############################################################################
 from openerp.modules.registry import RegistryManager
-from openerp.osv import osv, fields
+from openerp.osv import orm, fields
 import openerp.exceptions
 from openerp import tools
 
 import utils
 
-class res_users(osv.osv):
+class res_users(orm.Model):
     _inherit = 'res.users'
 
     # TODO create helper fields for autofill openid_url and openid_email -> http://pad.openerp.com/web-openid
@@ -91,7 +91,6 @@
                     raise
                 self._uid_cache.setdefault(db, {})[uid] = passwd
 
-res_users()
 
 
 
 
=== modified file 'auth_signup/res_config.py'
--- auth_signup/res_config.py	2012-12-04 10:31:46 +0000
+++ auth_signup/res_config.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.safe_eval import safe_eval
 
 class base_config_settings(osv.TransientModel):
 
=== modified file 'auth_signup/res_users.py'
--- auth_signup/res_users.py	2012-12-18 15:32:55 +0000
+++ auth_signup/res_users.py	2012-12-20 15:08:18 +0000
@@ -23,7 +23,7 @@
 from urllib import urlencode
 from urlparse import urljoin
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
 from openerp.tools.safe_eval import safe_eval
 from openerp.tools.translate import _
 
=== modified file 'base_action_rule/base_action_rule.py'
--- base_action_rule/base_action_rule.py	2012-12-10 11:16:54 +0000
+++ base_action_rule/base_action_rule.py	2012-12-20 15:08:18 +0000
@@ -42,7 +42,7 @@
     return datetime.strptime(date_field[:19], '%Y-%m-%d %H:%M:%S')
 
 
-class base_action_rule(osv.osv):
+class base_action_rule(orm.Model):
     """ Base Action Rules """
 
     _name = 'base.action.rule'
@@ -330,16 +330,14 @@
         context.update({'action': False})
         return True
 
-base_action_rule()
 
-class actions_server(osv.osv):
+class actions_server(orm.Model):
     _inherit = 'ir.actions.server'
     _columns = {
         'action_rule_id': fields.many2one("base.action.rule", string="Action Rule")
     }
-actions_server()
 
-class ir_cron(osv.osv):
+class ir_cron(orm.Model):
     _inherit = 'ir.cron'
     _init_done = False
 
@@ -361,7 +359,6 @@
 
         super(ir_cron, self)._poolJobs(db_name, check=check)
 
-ir_cron()
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py	2012-12-18 08:59:14 +0000
+++ base_calendar/base_calendar.py	2012-12-20 15:08:18 +0000
@@ -23,7 +23,7 @@
 from dateutil import parser
 from dateutil import rrule
 from dateutil.relativedelta import relativedelta
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.service import web_services
 from openerp.tools.translate import _
 import pytz
@@ -216,7 +216,7 @@
 </html>
 """
 
-class calendar_attendee(osv.osv):
+class calendar_attendee(orm.Model):
     """
     Calendar Attendee Information
     """
@@ -626,9 +626,8 @@
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
         return res
 
-calendar_attendee()
 
-class res_alarm(osv.osv):
+class res_alarm(orm.Model):
     """Resource Alarm """
     _name = 'res.alarm'
     _description = 'Basic Alarm Information'
@@ -757,9 +756,8 @@
                             where id=%%s' % model_obj._table,(data.id,))
         return True
 
-res_alarm()
 
-class calendar_alarm(osv.osv):
+class calendar_alarm(orm.Model):
     _name = 'calendar.alarm'
     _description = 'Event alarm information'
     _inherit = 'res.alarm'
@@ -910,10 +908,9 @@
             self.write(cr, uid, [alarm.id], update_vals)
         return True
 
-calendar_alarm()
-
-
-class calendar_event(osv.osv):
+
+
+class calendar_event(orm.Model):
     _name = "calendar.event"
     _description = "Calendar Event"
     __attribute__ = {}
@@ -1602,9 +1599,8 @@
         """
         return self.write(cr, uid, ids, {'state': 'confirmed'}, context)
 
-calendar_event()
 
-class calendar_todo(osv.osv):
+class calendar_todo(orm.Model):
     """ Calendar Task """
 
     _name = "calendar.todo"
@@ -1651,10 +1647,9 @@
     __attribute__ = {}
 
 
-calendar_todo()
-
-
-class ir_values(osv.osv):
+
+
+class ir_values(orm.Model):
     _inherit = 'ir.values'
 
     def set(self, cr, uid, key, key2, name, models, value, replace=True, \
@@ -1696,9 +1691,8 @@
         return super(ir_values, self).get(cr, uid, key, key2, new_model, \
                          meta, context, res_id_req, without_user, key2_req)
 
-ir_values()
 
-class ir_model(osv.osv):
+class ir_model(orm.Model):
 
     _inherit = 'ir.model'
 
@@ -1722,7 +1716,6 @@
                 val['id'] = base_calendar_id2real_id(val['id'])
         return isinstance(ids, (str, int, long)) and data[0] or data
 
-ir_model()
 
 class virtual_report_spool(web_services.report_spool):
 
@@ -1745,9 +1738,8 @@
             data['id'] = base_calendar_id2real_id(data['id'])
         return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, data, context)
 
-virtual_report_spool()
 
-class res_users(osv.osv):
+class res_users(orm.Model):
     _inherit = 'res.users'
 
     def _get_user_avail(self, cr, uid, ids, context=None):
@@ -1798,6 +1790,5 @@
                     string='Free/Busy'),
     }
 
-res_users()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'base_calendar/crm_meeting.py'
--- base_calendar/crm_meeting.py	2012-12-20 12:49:27 +0000
+++ base_calendar/crm_meeting.py	2012-12-20 15:08:18 +0000
@@ -19,10 +19,15 @@
 #
 ##############################################################################
 
+<<<<<<< TREE
 import time
 
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
+=======
+from openerp.osv import fields, osv, orm
+from openerp import tools
+>>>>>>> MERGE-SOURCE
 from openerp.tools.translate import _
 from base_calendar import get_real_ids, base_calendar_id2real_id
 from openerp.addons.base_status.base_state import base_state
@@ -121,7 +126,7 @@
             thread_id = get_real_ids(thread_id)
         return super(crm_meeting, self).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
 
-class mail_message(osv.osv):
+class mail_message(orm.Model):
     _inherit = "mail.message"
 
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
@@ -139,7 +144,7 @@
                 doc_dict.setdefault(virtual_id, doc_dict[get_real_ids(virtual_id)])
         return super(mail_message, self)._find_allowed_model_wise(cr, uid, doc_model, doc_dict, context=context)
 
-class ir_attachment(osv.osv):
+class ir_attachment(orm.Model):
     _inherit = "ir.attachment"
 
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
@@ -159,7 +164,7 @@
             vals['res_id'] = get_real_ids(vals.get('res_id'))
         return super(ir_attachment, self).write(cr, uid, ids, vals, context=context)
 
-class invite_wizard(osv.osv_memory):
+class invite_wizard(orm.TransientModel):
     _inherit = 'mail.wizard.invite'
 
     def default_get(self, cr, uid, fields, context=None):
 
=== modified file 'base_gengo/ir_translation.py'
--- base_gengo/ir_translation.py	2012-12-06 14:56:32 +0000
+++ base_gengo/ir_translation.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 LANG_CODE_MAPPING = {
 
=== modified file 'base_gengo/res_company.py'
--- base_gengo/res_company.py	2012-12-06 14:56:32 +0000
+++ base_gengo/res_company.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
 
 class res_company(osv.Model):
 
=== modified file 'base_gengo/wizard/base_gengo_translations.py'
--- base_gengo/wizard/base_gengo_translations.py	2012-11-16 13:50:21 +0000
+++ base_gengo/wizard/base_gengo_translations.py	2012-12-20 15:08:18 +0000
@@ -23,7 +23,7 @@
 import re
 import time
 
-from openerp.osv import osv, fields
+from openerp.osv import osv, fields, orm
 from openerp import tools
 from openerp.tools.translate import _
 
@@ -48,7 +48,7 @@
     'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
 }
 
-class base_gengo_translations(osv.osv_memory):
+class base_gengo_translations(orm.TransientModel):
 
     _name = 'base.gengo.translations'
     _columns = {
 
=== modified file 'base_iban/base_iban.py'
--- base_iban/base_iban.py	2012-12-06 14:56:32 +0000
+++ base_iban/base_iban.py	2012-12-20 15:08:18 +0000
@@ -20,7 +20,7 @@
 ##############################################################################
 import string
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 # Reference Examples of IBAN
@@ -77,7 +77,7 @@
         iban_str = iban_str[4:]
     return ' '.join(res)
 
-class res_partner_bank(osv.osv):
+class res_partner_bank(orm.Model):
     _inherit = "res.partner.bank"
 
     def create(self, cr, uid, vals, context=None):
@@ -181,6 +181,5 @@
         (_check_bank, '\nPlease define BIC/Swift code on bank for bank type IBAN Account to make valid payments', ['bic'])
     ]
 
-res_partner_bank()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'base_report_designer/base_report_designer.py'
--- base_report_designer/base_report_designer.py	2012-12-06 14:56:32 +0000
+++ base_report_designer/base_report_designer.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp_sxw2rml import sxw2rml
 from StringIO import StringIO
 import base64
@@ -27,7 +27,7 @@
 from openerp import addons
  
 
-class report_xml(osv.osv):
+class report_xml(orm.Model):
     _inherit = 'ir.actions.report.xml'
 
     def sxwtorml(self, cr, uid, file_sxw, file_type):
@@ -76,7 +76,6 @@
             'report_rml_content': rml_data and base64.encodestring(rml_data) or False
         }
 
-report_xml()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'base_report_designer/installer.py'
--- base_report_designer/installer.py	2012-12-06 14:56:32 +0000
+++ base_report_designer/installer.py	2012-12-20 15:08:18 +0000
@@ -20,12 +20,12 @@
 ##############################################################################
 
 from openerp.osv import fields
-from openerp.osv import osv
+from openerp.osv import osv, orm
 import base64
 from openerp.tools.translate import _
 from openerp import addons
 
-class base_report_designer_installer(osv.osv_memory):
+class base_report_designer_installer(orm.TransientModel):
     _name = 'base_report_designer.installer'
     _inherit = 'res.config.installer'
 
@@ -58,6 +58,5 @@
             4. if your connection success, A message appears like 'You can start creating your report in current document.'.
         """
     }
-base_report_designer_installer()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py'
--- base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py	2012-11-29 22:26:45 +0000
+++ base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py	2012-12-20 15:08:18 +0000
@@ -32,7 +32,6 @@
 
 
 import re
-import string
 import os
 import zipfile
 import xml.dom.minidom
@@ -88,7 +87,7 @@
     def _stringToTuple(self, s):
         """Helper function."""
         try:
-            temp = string.split(s,",")
+            temp = s.split(",")
             return int(temp[0]),int(temp[1])
         except:
             return None
 
=== modified file 'base_report_designer/wizard/base_report_designer_modify.py'
--- base_report_designer/wizard/base_report_designer_modify.py	2012-12-10 11:16:54 +0000
+++ base_report_designer/wizard/base_report_designer_modify.py	2012-12-20 15:08:18 +0000
@@ -21,14 +21,11 @@
 ##############################################################################
 
 import base64
-import time
-import urllib
-
-from openerp import osv, pooler, tools
-from openerp.osv import fields, osv
-from openerp.tools.translate import _
-
-class base_report_sxw(osv.osv_memory):
+
+from openerp import tools
+from openerp.osv import fields, orm
+
+class base_report_sxw(orm.TransientModel):
     """Base Report sxw """
     _name = 'base.report.sxw'
 
@@ -54,9 +51,8 @@
             'target': 'new',
         }
 
-base_report_sxw()
 
-class base_report_file_sxw(osv.osv_memory):
+class base_report_file_sxw(orm.TransientModel):
     """Base Report File sxw """
     _name = 'base.report.file.sxw'
 
@@ -116,9 +112,8 @@
             'type': 'ir.actions.act_window',
             'target': 'new',
         }
-base_report_file_sxw()
 
-class base_report_rml_save(osv.osv_memory):
+class base_report_rml_save(orm.TransientModel):
     """Base Report file Save"""
     _name = 'base.report.rml.save'
     def default_get(self, cr, uid, fields, context=None):
@@ -133,12 +128,11 @@
              @return: A dictionary which of fields with values.
 
         """
-        
         res = super(base_report_rml_save, self).default_get(cr, uid, fields, context=context)
         report_id = self.pool.get('base.report.sxw').search(cr,uid,[])
         data = self.pool.get('base.report.file.sxw').read(cr, uid, report_id, context=context)[0]
         report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context)
-        
+
         if 'file_rml' in fields:
             res['file_rml'] =  base64.encodestring(report.report_rml_content)
         return res
@@ -146,6 +140,5 @@
          'file_rml':fields.binary('Save As'),
          }
 
-base_report_rml_save()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'base_setup/base_setup.py'
--- base_setup/base_setup.py	2012-12-06 14:56:32 +0000
+++ base_setup/base_setup.py	2012-12-20 15:08:18 +0000
@@ -23,12 +23,12 @@
 import cgi
 from openerp import pooler
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 from lxml import etree
 
 # Specify Your Terminology will move to 'partner' module
-class specify_partner_terminology(osv.osv_memory):
+class specify_partner_terminology(orm.TransientModel):
     _name = 'base.setup.terminology'
     _inherit = 'res.config'
     _columns = {
 
=== modified file 'base_setup/res_config.py'
--- base_setup/res_config.py	2012-12-17 14:43:06 +0000
+++ base_setup/res_config.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class base_config_settings(osv.osv_memory):
+class base_config_settings(orm.TransientModel):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
@@ -53,7 +53,7 @@
 # Preferences wizard for Sales & CRM.
 # It is defined here because it is inherited independently in modules sale, crm,
 # plugin_outlook and plugin_thunderbird.
-class sale_config_settings(osv.osv_memory):
+class sale_config_settings(orm.TransientModel):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
 
=== modified file 'base_status/base_stage.py'
--- base_status/base_stage.py	2012-12-18 13:11:42 +0000
+++ base_status/base_stage.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 class base_stage(object):
 
=== modified file 'base_status/base_state.py'
--- base_status/base_state.py	2012-12-18 13:11:42 +0000
+++ base_status/base_state.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.translate import _
 
 class base_state(object):
 
=== modified file 'base_vat/base_vat.py'
--- base_vat/base_vat.py	2012-12-18 17:55:47 +0000
+++ base_vat/base_vat.py	2012-12-20 15:08:18 +0000
@@ -32,7 +32,7 @@
                                           "Install it to support more countries, for example with `easy_install vatnumber`.")
     vatnumber = None
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 from openerp.tools.misc import ustr
 from openerp.tools.translate import _
 
@@ -71,7 +71,7 @@
     'sk': 'SK0012345675',
 }
 
-class res_partner(osv.osv):
+class res_partner(orm.Model):
     _inherit = 'res.partner'
 
     def _split_vat(self, vat):
@@ -243,6 +243,5 @@
             return False
         return check == int(vat[8])
 
-res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'base_vat/res_company.py'
--- base_vat/res_company.py	2012-12-06 14:56:32 +0000
+++ base_vat/res_company.py	2012-12-20 15:08:18 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class res_company_vat (osv.osv):
+class res_company_vat (orm.Model):
     _inherit = 'res.company'
     _columns = {
         'vat_check_vies': fields.boolean('VIES VAT Check',
 
=== modified file 'board/board.py'
--- board/board.py	2012-12-06 14:56:32 +0000
+++ board/board.py	2012-12-20 15:08:18 +0000
@@ -24,9 +24,9 @@
 from textwrap import dedent
 
 from openerp import tools
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 
-class board_board(osv.osv):
+class board_board(orm.Model):
     _name = 'board.board'
     _description = "Board"
     _auto = False
@@ -98,7 +98,7 @@
         return etree.tostring(remove_unauthorized_children(archnode), pretty_print=True)
 
 
-class board_create(osv.osv_memory):
+class board_create(orm.TransientModel):
 
     def board_create(self, cr, uid, ids, context=None):
         assert len(ids) == 1
 
=== modified file 'crm/crm.py'
--- crm/crm.py	2012-12-18 09:32:41 +0000
+++ crm/crm.py	2012-12-20 15:08:18 +0000
@@ -23,7 +23,7 @@
 import time
 from lxml import etree
 from openerp.osv import fields
-from openerp.osv import osv
+from openerp.osv import osv, orm
 from openerp import tools
 from openerp.tools.translate import _
 
@@ -44,7 +44,7 @@
     ('5', 'Lowest'),
 ]
 
-class crm_case_channel(osv.osv):
+class crm_case_channel(orm.Model):
     _name = "crm.case.channel"
     _description = "Channels"
     _order = 'name'
@@ -56,7 +56,7 @@
         'active': lambda *a: 1,
     }
 
-class crm_case_stage(osv.osv):
+class crm_case_stage(orm.Model):
     """ Model for case stages. This models the main stages of a document
         management flow. Main CRM objects (leads, opportunities, project
         issues, ...) will now use only stages, instead of state and stages.
@@ -98,7 +98,7 @@
         'case_default': True,
     }
 
-class crm_case_section(osv.osv):
+class crm_case_section(orm.Model):
     """ Model for sales teams. """
     _name = "crm.case.section"
     _inherits = {'mail.alias': 'alias_id'}
@@ -145,7 +145,7 @@
     ]
 
     _constraints = [
-        (osv.osv._check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
+        (orm.Model._check_recursion, 'Error ! You cannot create recursive Sales team.', ['parent_id'])
     ]
 
     def name_get(self, cr, uid, ids, context=None):
@@ -185,7 +185,7 @@
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
 
-class crm_case_categ(osv.osv):
+class crm_case_categ(orm.Model):
     """ Category of Case """
     _name = "crm.case.categ"
     _description = "Category of Case"
@@ -204,7 +204,7 @@
         'object_id' : _find_object_id
     }
 
-class crm_case_resource_type(osv.osv):
+class crm_case_resource_type(orm.Model):
     """ Resource Type of case """
     _name = "crm.case.resource.type"
     _description = "Campaign"
@@ -221,7 +221,7 @@
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
     return [(r['object'], r['name']) for r in res]
 
-class crm_payment_mode(osv.osv):
+class crm_payment_mode(orm.Model):
     """ Payment Mode for Fund """
     _name = "crm.payment.mode"
     _description = "CRM Payment Mode"
 
=== modified file 'crm/crm_action_rule.py'
--- crm/crm_action_rule.py	2012-12-06 14:56:32 +0000
+++ crm/crm_action_rule.py	2012-12-20 15:08:18 +0000
@@ -25,11 +25,11 @@
 from openerp.tools.translate import _
 from openerp.tools import ustr
 from openerp.osv import fields
-from openerp.osv import osv
+from openerp.osv import osv, orm
 
 import crm
 
-class base_action_rule(osv.osv):
+class base_action_rule(orm.Model):
     """ Base Action Rule """
     _inherit = 'base.action.rule'
     _description = 'Action Rules'
 
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2012-12-20 11:47:30 +0000
+++ crm/crm_lead.py	2012-12-20 15:08:18 +0000
@@ -22,7 +22,7 @@
 from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
-from openerp.osv import fields, osv
+from openerp.osv import fields, osv, orm
 import time
 from openerp import tools
 from openerp.tools.translate import _
@@ -66,7 +66,7 @@
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_lead(base_stage, format_address, osv.osv):
+class crm_lead(base_stage, format_address, orm.Model):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
 
=== modified file 'crm/crm_meeting.py'
--- crm/crm_meeting.py	2012-12-18 12:58:39 +0000
+++ crm/crm_meeting.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,13 @@
 #
 ##############################################################################
 
+<<<<<<< TREE
 from openerp.osv import fields, osv
+=======
+from openerp.osv import fields, osv, orm
+from openerp import tools
+from openerp.tools.translate import _
+>>>>>>> MERGE-SOURCE
 import logging
 _logger = logging.getLogger(__name__)
 
@@ -35,7 +41,7 @@
     }
 
 
-class calendar_attendee(osv.osv):
+class calendar_attendee(orm.Model):
     """ Calendar Attendee """
 
     _inherit = 'calendar.attendee'
@@ -68,7 +74,7 @@
                         relation="crm.case.categ", multi='categ_id'),
     }
 
-class res_users(osv.osv):
+class res_users(orm.Model):
     _name = 'res.users'
     _inherit = 'res.users'
 
 
=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py	2012-12-20 11:47:30 +0000
+++ crm/crm_phonecall.py	2012-12-20 15:08:18 +0000
@@ -22,11 +22,17 @@
 from openerp.addons.base_status.base_state import base_state
 import crm
 from datetime import datetime
+<<<<<<< TREE
 from openerp.osv import fields, osv
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
+=======
+from openerp.osv import fields, osv, orm
+import time
+from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
+>>>>>>> MERGE-SOURCE
 from openerp.tools.translate import _
 
-class crm_phonecall(base_state, osv.osv):
+class crm_phonecall(base_state, orm.Model):
     """ Model for CRM phonecalls """
     _name = "crm.phonecall"
     _description = "Phonecall"
 
=== modified file 'crm/crm_segmentation.py'
--- crm/crm_segmentation.py	2012-12-06 14:56:32 +0000
+++ crm/crm_segmentation.py	2012-12-20 15:08:18 +0000
@@ -21,7 +21,7 @@
 
 from openerp.osv import fields,osv,orm
 
-class crm_segmentation(osv.osv):
+class crm_segmentation(orm.Model):
     '''
         A segmentation is a tool to automatically assign categories on partners.
         These assignations are based on criterions.
@@ -108,9 +108,8 @@
 
         self.write(cr, uid, ids, {'state':'running', 'partner_id':0})
         return self.process_continue(cr, uid, ids, start=True)
-crm_segmentation()
 
-class crm_segmentation_line(osv.osv):
+class crm_segmentation_line(orm.Model):
     """ Segmentation line """
     _name = "crm.segmentation.line"
     _description = "Segmentation line"
@@ -180,7 +179,6 @@
                     return True
         return True
 
-crm_segmentation_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
 
=== modified file 'crm/report/crm_lead_report.py'
--- crm/report/crm_lead_report.py	2012-12-06 14:56:32 +0000
+++ crm/report/crm_lead_report.py	2012-12-20 15:08:18 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from openerp.osv import fields,osv
+from openerp.osv import fields,osv, orm
 from openerp import tools
 from .. import crm
 
@@ -46,7 +46,7 @@
     ('12', 'December')
 ]
 
-class crm_lead_report(osv.osv):
+class crm_lead_report(orm.Model):
     """ CRM Lead Analysis """