OpenERP Canada

Merge lp:~openerp-canada/openerp-canada/fix_osv.Model into lp:openerp-canada

  1. fix_osv.Model
  2. Merge into 7.0
Status: Merged
Merged at revision: 9
Proposed branch: lp:~openerp-canada/openerp-canada/fix_osv.Model
Merge into: lp:openerp-canada
Diff against target: 139 lines (+16/-16)
4 files modified
account_tax_expense_include/account_tax_expense_include.py (+2/-2)
hr_expense_line_supplier/hr_expense_line_supplier.py (+3/-3)
l10n_ca_hr_payroll/l10n_ca_hr_payroll.py (+9/-9)
l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-canada/openerp-canada/fix_osv.Model
Reviewer Review Type Date Requested Status
Joao Alfredo Gama Batista Approve
Review via email: mp+152530@code.launchpad.net

Description of the change

[FIX] osv.Model to orm.Model

To post a comment you must log in.
Revision history for this message
Joao Alfredo Gama Batista (joao-gama) wrote :

lgtm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_tax_expense_include/account_tax_expense_include.py'
2--- account_tax_expense_include/account_tax_expense_include.py 2013-02-27 20:02:47 +0000
3+++ account_tax_expense_include/account_tax_expense_include.py 2013-03-08 22:48:21 +0000
4@@ -20,10 +20,10 @@
5 ##############################################################################
6 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7
8-from osv import osv, fields
9+from openerp.osv import orm, fields
10 from openerp.tools.float_utils import float_round
11
12-class account_tax(osv.Model):
13+class account_tax(orm.Model):
14 _inherit = 'account.tax'
15 _columns = {
16 'expense_include': fields.boolean('Tax Included in Expense',
17
18=== modified file 'hr_expense_line_supplier/hr_expense_line_supplier.py'
19--- hr_expense_line_supplier/hr_expense_line_supplier.py 2013-02-27 20:02:47 +0000
20+++ hr_expense_line_supplier/hr_expense_line_supplier.py 2013-03-08 22:48:21 +0000
21@@ -21,15 +21,15 @@
22
23 import netsvc
24
25-from osv import osv, fields
26+from openerp.osv import orm, fields
27
28-class hr_expense_line(osv.Model):
29+class hr_expense_line(orm.Model):
30 _inherit = 'hr.expense.line'
31 _columns = {
32 'partner_id': fields.many2one('res.partner', 'Supplier', required=True),
33 }
34
35-class hr_expense_expense(osv.Model):
36+class hr_expense_expense(orm.Model):
37 _inherit = 'hr.expense.expense'
38
39 def action_invoice_create(self, cr, uid, ids):
40
41=== modified file 'l10n_ca_hr_payroll/l10n_ca_hr_payroll.py'
42--- l10n_ca_hr_payroll/l10n_ca_hr_payroll.py 2013-03-06 18:37:29 +0000
43+++ l10n_ca_hr_payroll/l10n_ca_hr_payroll.py 2013-03-08 22:48:21 +0000
44@@ -19,7 +19,7 @@
45 #
46 ##############################################################################
47
48-from osv import fields, osv
49+from openerp.osv import fields, orm
50
51 def get_jurisdiction(self, cursor, user_id, context=None):
52 return (
53@@ -34,7 +34,7 @@
54 ('rqap', 'RQAP / RRQ'),
55 ('csst', 'CSST'))
56
57-class hr_payroll_tax_table(osv.Model):
58+class hr_payroll_tax_table(orm.Model):
59 '''
60 Canadian Tax Payroll Table
61 '''
62@@ -72,7 +72,7 @@
63 'type': 'federal',
64 }
65
66-class hr_payroll_tax_table_federal_line(osv.Model):
67+class hr_payroll_tax_table_federal_line(orm.Model):
68 '''
69 Federal Lines
70 '''
71@@ -97,7 +97,7 @@
72
73 _rec_name = 'inc_from'
74
75-class hr_payroll_tax_table_ei_line(osv.Model):
76+class hr_payroll_tax_table_ei_line(orm.Model):
77 '''
78 Employment Insurance Lines
79 '''
80@@ -113,7 +113,7 @@
81
82 _rec_name = 'inc_from'
83
84-class hr_payroll_tax_table_qc_line(osv.Model):
85+class hr_payroll_tax_table_qc_line(orm.Model):
86 '''
87 Quebec Lines
88 '''
89@@ -144,7 +144,7 @@
90
91 _rec_name = 'inc_from'
92
93-class hr_payroll_tax_table_rqap_line(osv.Model):
94+class hr_payroll_tax_table_rqap_line(orm.Model):
95 '''
96 RQAP Lines
97 '''
98@@ -159,7 +159,7 @@
99 'max_annual_insurable_earnings': fields.float('Maximum Annual Insurable Earnings', digits=(16, 2)),
100 }
101
102-class hr_payroll_tax_table_csst_line(osv.Model):
103+class hr_payroll_tax_table_csst_line(orm.Model):
104 '''
105 CSST Lines
106 '''
107@@ -170,7 +170,7 @@
108 'table_id': fields.many2one('hr.payroll.tax.table', 'Table'),
109 }
110
111-class hr_employee(osv.Model):
112+class hr_employee(orm.Model):
113 _name = 'hr.employee'
114 _inherit = 'hr.employee'
115
116@@ -206,7 +206,7 @@
117 'erins': 0.00,
118 }
119
120-class hr_contract(osv.Model):
121+class hr_contract(orm.Model):
122 _inherit = 'hr.contract'
123
124 def _get_pays_per_year(self, cr, uid, ids, names, arg, context=None):
125
126=== modified file 'l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py'
127--- l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py 2013-03-06 18:37:29 +0000
128+++ l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll.py 2013-03-08 22:48:21 +0000
129@@ -19,9 +19,9 @@
130 #
131 ##############################################################################
132
133-from osv import fields, osv
134+from openerp.osv import fields, orm
135
136-class hr_employee(osv.Model):
137+class hr_employee(orm.Model):
138 _name = 'hr.employee'
139 _inherit = 'hr.employee'
140

Subscribers

People subscribed via source and target branches