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
20
##############################################################################
20
##############################################################################
6
21
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
21
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7
22
22
9
23
from osv import osv, fields
23
from openerp.osv import orm, fields
10
24
from openerp.tools.float_utils import float_round
24
from openerp.tools.float_utils import float_round
11
25
25
13
26
class account_tax(osv.Model):
26
class account_tax(orm.Model):
14
27
    _inherit = 'account.tax'
27
    _inherit = 'account.tax'
15
28
    _columns = {
28
    _columns = {
16
29
        'expense_include': fields.boolean('Tax Included in Expense',
29
        'expense_include': fields.boolean('Tax Included in Expense',
17
30
30
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
21
21
23
22
import netsvc
22
import netsvc
24
23
23
26
24
from osv import osv, fields
24
from openerp.osv import orm, fields
27
25
25
29
26
class hr_expense_line(osv.Model):
26
class hr_expense_line(orm.Model):
30
27
    _inherit = 'hr.expense.line'
27
    _inherit = 'hr.expense.line'
31
28
    _columns = {
28
    _columns = {
32
29
        'partner_id': fields.many2one('res.partner', 'Supplier', required=True),
29
        'partner_id': fields.many2one('res.partner', 'Supplier', required=True),
33
30
    }
30
    }
34
31
31
36
32
class hr_expense_expense(osv.Model):
32
class hr_expense_expense(orm.Model):
37
33
    _inherit = 'hr.expense.expense'
33
    _inherit = 'hr.expense.expense'
38
34
34
39
35
    def action_invoice_create(self, cr, uid, ids):
35
    def action_invoice_create(self, cr, uid, ids):
40
36
36
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
19
#
19
#
46
20
##############################################################################
20
##############################################################################
47
21
21
49
22
from osv import fields, osv
22
from openerp.osv import fields, orm
50
23
23
51
24
def get_jurisdiction(self, cursor, user_id, context=None):
24
def get_jurisdiction(self, cursor, user_id, context=None):
52
25
    return (
25
    return (
53
@@ -34,7 +34,7 @@
54
34
        ('rqap', 'RQAP / RRQ'),
34
        ('rqap', 'RQAP / RRQ'),
55
35
        ('csst', 'CSST'))
35
        ('csst', 'CSST'))
56
36
36
58
37
class hr_payroll_tax_table(osv.Model):
37
class hr_payroll_tax_table(orm.Model):
59
38
    '''
38
    '''
60
39
    Canadian Tax Payroll Table
39
    Canadian Tax Payroll Table
61
40
    '''
40
    '''
62
@@ -72,7 +72,7 @@
63
72
            'type': 'federal',
72
            'type': 'federal',
64
73
            }
73
            }
65
74
74
67
75
class hr_payroll_tax_table_federal_line(osv.Model):
75
class hr_payroll_tax_table_federal_line(orm.Model):
68
76
    '''
76
    '''
69
77
    Federal Lines
77
    Federal Lines
70
78
    '''
78
    '''
71
@@ -97,7 +97,7 @@
72
97
97
73
98
    _rec_name = 'inc_from'
98
    _rec_name = 'inc_from'
74
99
99
76
100
class hr_payroll_tax_table_ei_line(osv.Model):
100
class hr_payroll_tax_table_ei_line(orm.Model):
77
101
    '''
101
    '''
78
102
    Employment Insurance Lines
102
    Employment Insurance Lines
79
103
    '''
103
    '''
80
@@ -113,7 +113,7 @@
81
113
113
82
114
    _rec_name = 'inc_from'
114
    _rec_name = 'inc_from'
83
115
115
85
116
class hr_payroll_tax_table_qc_line(osv.Model):
116
class hr_payroll_tax_table_qc_line(orm.Model):
86
117
    '''
117
    '''
87
118
    Quebec Lines
118
    Quebec Lines
88
119
    '''
119
    '''
89
@@ -144,7 +144,7 @@
90
144
144
91
145
    _rec_name = 'inc_from'
145
    _rec_name = 'inc_from'
92
146
146
94
147
class hr_payroll_tax_table_rqap_line(osv.Model):
147
class hr_payroll_tax_table_rqap_line(orm.Model):
95
148
    '''
148
    '''
96
149
    RQAP Lines
149
    RQAP Lines
97
150
    '''
150
    '''
98
@@ -159,7 +159,7 @@
99
159
        'max_annual_insurable_earnings': fields.float('Maximum Annual Insurable Earnings', digits=(16, 2)),
159
        'max_annual_insurable_earnings': fields.float('Maximum Annual Insurable Earnings', digits=(16, 2)),
100
160
        }
160
        }
101
161
161
103
162
class hr_payroll_tax_table_csst_line(osv.Model):
162
class hr_payroll_tax_table_csst_line(orm.Model):
104
163
    '''
163
    '''
105
164
    CSST Lines
164
    CSST Lines
106
165
    '''
165
    '''
107
@@ -170,7 +170,7 @@
108
170
        'table_id': fields.many2one('hr.payroll.tax.table', 'Table'),
170
        'table_id': fields.many2one('hr.payroll.tax.table', 'Table'),
109
171
        }
171
        }
110
172
172
112
173
class hr_employee(osv.Model):
173
class hr_employee(orm.Model):
113
174
    _name = 'hr.employee'
174
    _name = 'hr.employee'
114
175
    _inherit = 'hr.employee'
175
    _inherit = 'hr.employee'
115
176
176
116
@@ -206,7 +206,7 @@
117
206
        'erins': 0.00,
206
        'erins': 0.00,
118
207
        }
207
        }
119
208
208
121
209
class hr_contract(osv.Model):
209
class hr_contract(orm.Model):
122
210
    _inherit = 'hr.contract'
210
    _inherit = 'hr.contract'
123
211
211
124
212
    def _get_pays_per_year(self, cr, uid, ids, names, arg, context=None):
212
    def _get_pays_per_year(self, cr, uid, ids, names, arg, context=None):
125
213
213
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
19
#
19
#
131
20
##############################################################################
20
##############################################################################
132
21
21
134
22
from osv import fields, osv
22
from openerp.osv import fields, orm
135
23
23
137
24
class hr_employee(osv.Model):
24
class hr_employee(orm.Model):
138
25
    _name = 'hr.employee'
25
    _name = 'hr.employee'
139
26
    _inherit = 'hr.employee'
26
    _inherit = 'hr.employee'
140
27
27
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Joao Alfredo Gama Batista		2013-03-08	Approve on 2013-03-12
Review via email: mp+152530@code.launchpad.net
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	20	##############################################################################	20	##############################################################################
6	21	# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:	21	# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
7	22		22
9	23	from osv import osv, fields	23	from openerp.osv import orm, fields
10	24	from openerp.tools.float_utils import float_round	24	from openerp.tools.float_utils import float_round
11	25		25
13	26	class account_tax(osv.Model):	26	class account_tax(orm.Model):
14	27	_inherit = 'account.tax'	27	_inherit = 'account.tax'
15	28	_columns = {	28	_columns = {
16	29	'expense_include': fields.boolean('Tax Included in Expense',	29	'expense_include': fields.boolean('Tax Included in Expense',
17	30		30
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	21		21
23	22	import netsvc	22	import netsvc
24	23		23
26	24	from osv import osv, fields	24	from openerp.osv import orm, fields
27	25		25
29	26	class hr_expense_line(osv.Model):	26	class hr_expense_line(orm.Model):
30	27	_inherit = 'hr.expense.line'	27	_inherit = 'hr.expense.line'
31	28	_columns = {	28	_columns = {
32	29	'partner_id': fields.many2one('res.partner', 'Supplier', required=True),	29	'partner_id': fields.many2one('res.partner', 'Supplier', required=True),
33	30	}	30	}
34	31		31
36	32	class hr_expense_expense(osv.Model):	32	class hr_expense_expense(orm.Model):
37	33	_inherit = 'hr.expense.expense'	33	_inherit = 'hr.expense.expense'
38	34		34
39	35	def action_invoice_create(self, cr, uid, ids):	35	def action_invoice_create(self, cr, uid, ids):
40	36		36
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	19	#	19	#
46	20	##############################################################################	20	##############################################################################
47	21		21
49	22	from osv import fields, osv	22	from openerp.osv import fields, orm
50	23		23
51	24	def get_jurisdiction(self, cursor, user_id, context=None):	24	def get_jurisdiction(self, cursor, user_id, context=None):
52	25	return (	25	return (
53	@@ -34,7 +34,7 @@
54	34	('rqap', 'RQAP / RRQ'),	34	('rqap', 'RQAP / RRQ'),
55	35	('csst', 'CSST'))	35	('csst', 'CSST'))
56	36		36
58	37	class hr_payroll_tax_table(osv.Model):	37	class hr_payroll_tax_table(orm.Model):
59	38	'''	38	'''
60	39	Canadian Tax Payroll Table	39	Canadian Tax Payroll Table
61	40	'''	40	'''
62	@@ -72,7 +72,7 @@
63	72	'type': 'federal',	72	'type': 'federal',
64	73	}	73	}
65	74		74
67	75	class hr_payroll_tax_table_federal_line(osv.Model):	75	class hr_payroll_tax_table_federal_line(orm.Model):
68	76	'''	76	'''
69	77	Federal Lines	77	Federal Lines
70	78	'''	78	'''
71	@@ -97,7 +97,7 @@
72	97		97
73	98	_rec_name = 'inc_from'	98	_rec_name = 'inc_from'
74	99		99
76	100	class hr_payroll_tax_table_ei_line(osv.Model):	100	class hr_payroll_tax_table_ei_line(orm.Model):
77	101	'''	101	'''
78	102	Employment Insurance Lines	102	Employment Insurance Lines
79	103	'''	103	'''
80	@@ -113,7 +113,7 @@
81	113		113
82	114	_rec_name = 'inc_from'	114	_rec_name = 'inc_from'
83	115		115
85	116	class hr_payroll_tax_table_qc_line(osv.Model):	116	class hr_payroll_tax_table_qc_line(orm.Model):
86	117	'''	117	'''
87	118	Quebec Lines	118	Quebec Lines
88	119	'''	119	'''
89	@@ -144,7 +144,7 @@
90	144		144
91	145	_rec_name = 'inc_from'	145	_rec_name = 'inc_from'
92	146		146
94	147	class hr_payroll_tax_table_rqap_line(osv.Model):	147	class hr_payroll_tax_table_rqap_line(orm.Model):
95	148	'''	148	'''
96	149	RQAP Lines	149	RQAP Lines
97	150	'''	150	'''
98	@@ -159,7 +159,7 @@
99	159	'max_annual_insurable_earnings': fields.float('Maximum Annual Insurable Earnings', digits=(16, 2)),	159	'max_annual_insurable_earnings': fields.float('Maximum Annual Insurable Earnings', digits=(16, 2)),
100	160	}	160	}
101	161		161
103	162	class hr_payroll_tax_table_csst_line(osv.Model):	162	class hr_payroll_tax_table_csst_line(orm.Model):
104	163	'''	163	'''
105	164	CSST Lines	164	CSST Lines
106	165	'''	165	'''
107	@@ -170,7 +170,7 @@
108	170	'table_id': fields.many2one('hr.payroll.tax.table', 'Table'),	170	'table_id': fields.many2one('hr.payroll.tax.table', 'Table'),
109	171	}	171	}
110	172		172
112	173	class hr_employee(osv.Model):	173	class hr_employee(orm.Model):
113	174	_name = 'hr.employee'	174	_name = 'hr.employee'
114	175	_inherit = 'hr.employee'	175	_inherit = 'hr.employee'
115	176		176
116	@@ -206,7 +206,7 @@
117	206	'erins': 0.00,	206	'erins': 0.00,
118	207	}	207	}
119	208		208
121	209	class hr_contract(osv.Model):	209	class hr_contract(orm.Model):
122	210	_inherit = 'hr.contract'	210	_inherit = 'hr.contract'
123	211		211
124	212	def _get_pays_per_year(self, cr, uid, ids, names, arg, context=None):	212	def _get_pays_per_year(self, cr, uid, ids, names, arg, context=None):
125	213		213
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	19	#	19	#
131	20	##############################################################################	20	##############################################################################
132	21		21
134	22	from osv import fields, osv	22	from openerp.osv import fields, orm
135	23		23
137	24	class hr_employee(osv.Model):	24	class hr_employee(orm.Model):
138	25	_name = 'hr.employee'	25	_name = 'hr.employee'
139	26	_inherit = 'hr.employee'	26	_inherit = 'hr.employee'
140	27		27