OpenERP Canada

Merge lp:~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406 into lp:openerp-canada

  1. 7.0-bug-1213406
  2. Merge into 7.0
Status: Merged
Merged at revision: 25
Proposed branch: lp:~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406
Merge into: lp:openerp-canada
Diff against target: 43 lines (+12/-2)
3 files modified
l10n_ca_qc_hr_payroll/__openerp__.py (+1/-1)
l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml (+1/-1)
l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml (+10/-0)
To merge this branch: bzr merge lp:~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Sandy Carter (http://www.savoirfairelinux.com) code review, no test Approve
Review via email: mp+206286@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve
Revision history for this message
Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter) wrote :

LGTM

review: Approve (code review, no test)
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) wrote :

Mathieu,

The test should be in the same module than the fix.

review: Needs Fixing
lp:~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406 updated
26. By Mathieu Benoit

[FIX] Move test from l10n_ca_qc_hr_payroll_account to l10n_ca_qc_hr_payroll

Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ca_qc_hr_payroll/__openerp__.py'
2--- l10n_ca_qc_hr_payroll/__openerp__.py 2013-02-27 20:02:47 +0000
3+++ l10n_ca_qc_hr_payroll/__openerp__.py 2014-02-21 19:01:51 +0000
4@@ -37,7 +37,7 @@
5 'l10n_ca_qc_hr_payroll_view.xml',
6 'l10n_ca_qc_hr_payroll_data.xml',
7 ],
8- 'test': [],
9+ 'test': ['l10n_ca_qc_hr_payroll.yml'],
10 'demo': [],
11 'installable': True,
12 'active': False,
13
14=== modified file 'l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml'
15--- l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml 2013-03-08 15:20:04 +0000
16+++ l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml 2014-02-21 19:01:51 +0000
17@@ -309,7 +309,7 @@
18 <field name="name">QPP - Employer Contribution (QPPERC)</field>
19 <field name="sequence" eval="138"/>
20 <field name="code">QPPERC</field>
21- <field name="category_id" ref="hr_payroll.DED"/>
22+ <field name="category_id" ref="l10n_ca_hr_payroll.EMP"/>
23 <field name="appears_on_payslip" eval="0"/>
24 <field name="active" eval="1"/>
25 <field name="condition_select">none</field>
26
27=== added directory 'l10n_ca_qc_hr_payroll/test'
28=== added file 'l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml'
29--- l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml 1970-01-01 00:00:00 +0000
30+++ l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml 2014-02-21 19:01:51 +0000
31@@ -0,0 +1,10 @@
32+-
33+ Check salary rule "QPP - Employer Contribution (QPPERC)", it's supposed to be
34+ define in category "Employer Contribution".
35+ https://bugs.launchpad.net/openerp-canada/+bug/1213406
36+-
37+ !python {model: hr.salary.rule}: |
38+ rule_id = ref('l10n_ca_qc_hr_payroll.rule_qc_qpp_er_c')
39+ rule = self.browse(cr, uid, rule_id)
40+ category_id = ref('l10n_ca_hr_payroll.EMP')
41+ assert (rule.category_id.id == category_id), "Expected the category Employer Contribution"
42
43=== added directory 'l10n_ca_qc_hr_payroll_account/test'

Subscribers

People subscribed via source and target branches