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

[Maxime Chambreuil (http://www.savoirfairelinux.com)]

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

LGTM

review: Approve (code review, no test)

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Mathieu,

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

review: Needs Fixing

[lp:~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406]

26. By Mathieu Benoit on 2014-02-21

[FIX] Move test from l10n_ca_qc_hr_payroll_account to l10n_ca_qc_hr_payroll

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve

=== modified file 'l10n_ca_qc_hr_payroll/__openerp__.py'
--- l10n_ca_qc_hr_payroll/__openerp__.py	2013-02-27 20:02:47 +0000
+++ l10n_ca_qc_hr_payroll/__openerp__.py	2014-02-21 19:01:51 +0000
@@ -37,7 +37,7 @@
         'l10n_ca_qc_hr_payroll_view.xml',
         'l10n_ca_qc_hr_payroll_data.xml',
     ],
-    'test': [],
+    'test': ['l10n_ca_qc_hr_payroll.yml'],
     'demo': [],
     'installable': True,
     'active': False,
 
=== modified file 'l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml'
--- l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml	2013-03-08 15:20:04 +0000
+++ l10n_ca_qc_hr_payroll/l10n_ca_qc_hr_payroll_data.xml	2014-02-21 19:01:51 +0000
@@ -309,7 +309,7 @@
             <field name="name">QPP - Employer Contribution (QPPERC)</field>
             <field name="sequence" eval="138"/>
             <field name="code">QPPERC</field>
-            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="category_id" ref="l10n_ca_hr_payroll.EMP"/>
             <field name="appears_on_payslip" eval="0"/>
             <field name="active" eval="1"/>
             <field name="condition_select">none</field>
 
=== added directory 'l10n_ca_qc_hr_payroll/test'
=== added file 'l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml'
--- l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml	1970-01-01 00:00:00 +0000
+++ l10n_ca_qc_hr_payroll/test/l10n_ca_qc_hr_payroll.yml	2014-02-21 19:01:51 +0000
@@ -0,0 +1,10 @@
+-
+  Check salary rule "QPP - Employer Contribution (QPPERC)", it's supposed to be
+  define in category "Employer Contribution".
+  https://bugs.launchpad.net/openerp-canada/+bug/1213406
+-
+  !python {model: hr.salary.rule}: |
+    rule_id = ref('l10n_ca_qc_hr_payroll.rule_qc_qpp_er_c')
+    rule = self.browse(cr, uid, rule_id)
+    category_id = ref('l10n_ca_hr_payroll.EMP')
+    assert (rule.category_id.id == category_id), "Expected the category Employer Contribution"
 
=== added directory 'l10n_ca_qc_hr_payroll_account/test'