savoirfairelinux-openerp team mailing list archive

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

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

Requested reviews:
  OpenERP Community Reviewer/Maintainer (openerp-community-reviewer)
Related bugs:
  Bug #1213406 in OpenERP Canada: "QPP - Employer Contribution (QPPERC) is include in Deduction Category"
  https://bugs.launchpad.net/openerp-canada/+bug/1213406

For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406/+merge/206286
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406/+merge/206286
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-canada/7.0-bug-1213406.

=== 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-13 21:52:47 +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>

=== modified file 'l10n_ca_qc_hr_payroll_account/__openerp__.py'
--- l10n_ca_qc_hr_payroll_account/__openerp__.py	2013-02-27 20:02:47 +0000
+++ l10n_ca_qc_hr_payroll_account/__openerp__.py	2014-02-13 21:52:47 +0000
@@ -47,7 +47,7 @@
     'data': [
         'l10n_ca_qc_hr_payroll_account_data.xml',
     ],
-    'test': [],
+    'test': ['test/l10n_ca_qc_hr_payroll_account.yml'],
     'demo': [],
     'installable': True,
     'active': False,

=== added directory 'l10n_ca_qc_hr_payroll_account/test'
=== added file 'l10n_ca_qc_hr_payroll_account/test/l10n_ca_qc_hr_payroll_account.yml'
--- l10n_ca_qc_hr_payroll_account/test/l10n_ca_qc_hr_payroll_account.yml	1970-01-01 00:00:00 +0000
+++ l10n_ca_qc_hr_payroll_account/test/l10n_ca_qc_hr_payroll_account.yml	2014-02-13 21:52:47 +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"