openerp-canada team mailing list archive

["Maxime Chambreuil \(http://www.savoirfairelinux.com\)" <maxime.chambreuil@xxxxxxxxxxxxxxxxxxxx>]

Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~openerp-canada/openerp-canada/fix_osv.Model into lp:openerp-canada.

Requested reviews:
  Joao Alfredo Gama Batista (joao-gama)

For more details, see:
https://code.launchpad.net/~openerp-canada/openerp-canada/fix_osv.Model/+merge/152530

[FIX] osv.Model to orm.Model
-- 
https://code.launchpad.net/~openerp-canada/openerp-canada/fix_osv.Model/+merge/152530
Your team OpenERP Canada Team is subscribed to branch lp:~openerp-canada/openerp-canada/fix_osv.Model.

=== modified file 'account_tax_expense_include/account_tax_expense_include.py'
--- account_tax_expense_include/account_tax_expense_include.py	2013-02-27 20:02:47 +0000
+++ account_tax_expense_include/account_tax_expense_include.py	2013-03-08 22:48:21 +0000
@@ -20,10 +20,10 @@
 ##############################################################################
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
-from osv import osv, fields
+from openerp.osv import orm, fields
 from openerp.tools.float_utils import float_round
 
-class account_tax(osv.Model):
+class account_tax(orm.Model):
     _inherit = 'account.tax'
     _columns = {
         'expense_include': fields.boolean('Tax Included in Expense',

=== modified file 'hr_expense_line_supplier/hr_expense_line_supplier.py'
--- hr_expense_line_supplier/hr_expense_line_supplier.py	2013-02-27 20:02:47 +0000
+++ hr_expense_line_supplier/hr_expense_line_supplier.py	2013-03-08 22:48:21 +0000
@@ -21,15 +21,15 @@
 
 import netsvc
 
-from osv import osv, fields
+from openerp.osv import orm, fields
 
-class hr_expense_line(osv.Model):
+class hr_expense_line(orm.Model):
     _inherit = 'hr.expense.line'
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Supplier', required=True),
     }
 
-class hr_expense_expense(osv.Model):
+class hr_expense_expense(orm.Model):
     _inherit = 'hr.expense.expense'
 
     def action_invoice_create(self, cr, uid, ids):

=== modified file 'l10n_ca_hr_payroll/l10n_ca_hr_payroll.py'
--- l10n_ca_hr_payroll/l10n_ca_hr_payroll.py	2013-03-06 18:37:29 +0000
+++ l10n_ca_hr_payroll/l10n_ca_hr_payroll.py	2013-03-08 22:48:21 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, orm
 
 def get_jurisdiction(self, cursor, user_id, context=None):
     return (
@@ -34,7 +34,7 @@
         ('rqap', 'RQAP / RRQ'),
         ('csst', 'CSST'))
 
-class hr_payroll_tax_table(osv.Model):
+class hr_payroll_tax_table(orm.Model):
     '''
     Canadian Tax Payroll Table
     '''
@@ -72,7 +72,7 @@
             'type': 'federal',
             }
 
-class hr_payroll_tax_table_federal_line(osv.Model):
+class hr_payroll_tax_table_federal_line(orm.Model):
     '''
     Federal Lines
     '''
@@ -97,7 +97,7 @@
 
     _rec_name = 'inc_from'
 
-class hr_payroll_tax_table_ei_line(osv.Model):
+class hr_payroll_tax_table_ei_line(orm.Model):
     '''
     Employment Insurance Lines
     '''
@@ -113,7 +113,7 @@
 
     _rec_name = 'inc_from'
 
-class hr_payroll_tax_table_qc_line(osv.Model):
+class hr_payroll_tax_table_qc_line(orm.Model):
     '''
     Quebec Lines
     '''
@@ -144,7 +144,7 @@
 
     _rec_name = 'inc_from'
 
-class hr_payroll_tax_table_rqap_line(osv.Model):
+class hr_payroll_tax_table_rqap_line(orm.Model):
     '''
     RQAP Lines
     '''
@@ -159,7 +159,7 @@
         'max_annual_insurable_earnings': fields.float('Maximum Annual Insurable Earnings', digits=(16, 2)),
         }
 
-class hr_payroll_tax_table_csst_line(osv.Model):
+class hr_payroll_tax_table_csst_line(orm.Model):
     '''
     CSST Lines
     '''
@@ -170,7 +170,7 @@
         'table_id': fields.many2one('hr.payroll.tax.table', 'Table'),
         }
 
-class hr_employee(osv.Model):
+class hr_employee(orm.Model):
     _name = 'hr.employee'
     _inherit = 'hr.employee'
 
@@ -206,7 +206,7 @@
         'erins': 0.00,
         }
 
-class hr_contract(osv.Model):
+class hr_contract(orm.Model):
     _inherit = 'hr.contract'
 
     def _get_pays_per_year(self, cr, uid, ids, names, arg, context=None):

=== modified file 'l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py'
--- l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py	2013-03-06 18:37:29 +0000
+++ l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py	2013-03-08 22:48:21 +0000
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+from openerp.osv import fields, orm
 
-class hr_employee(osv.Model):
+class hr_employee(orm.Model):
     _name = 'hr.employee'
     _inherit = 'hr.employee'