openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

Meera Trambadia (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr/+merge/57285

hr_payroll: corrected m2m field rule_ids in demo data
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr/+merge/57285
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-payroll-demo-data-mtr into lp:~openerp-dev/openobject-addons/trunk-payroll.

=== modified file 'hr_payroll/hr_payroll_demo.xml'
--- hr_payroll/hr_payroll_demo.xml	2011-04-12 08:44:27 +0000
+++ hr_payroll/hr_payroll_demo.xml	2011-04-12 08:53:26 +0000
@@ -72,7 +72,7 @@
         <record id="structure_002" model="hr.payroll.structure">
             <field name="code">MEQP</field>
             <field name="name">Marketing Executive for Quentin Paolino</field>
-            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'),(hr_salary_rule_meal_voucher)])]" name="rule_ids"/>
+            <field eval="[(6, 0, [ref('hr_salary_rule_ca_paolino'), ref('hr_salary_rule_meal_voucher')])]" name="rule_ids"/>
             <field name="company_id" ref="base.main_company"/>
             <field name="parent_id" ref="structure_001"/>
         </record>