Merge lp:~openerp-dev/openobject-addons/6.1-opw-576855-nep into lp:openobject-addons/6.1

Proposed by Nehal Panchal (OpenERP)
Status: Approved
Approved by: Naresh(OpenERP)
Approved revision: 6897
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-576855-nep
Merge into: lp:openobject-addons/6.1
Diff against target: 21 lines (+2/-2)
1 file modified
hr_payroll/hr_payroll_demo.xml (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-576855-nep
Reviewer Review Type Date Requested Status
Naresh(OpenERP) (community) Approve
Review via email:

Description of the change


Improved Salary Rule's Python Code and Quantity for payslip computation.


To post a comment you must log in.
Revision history for this message
Naresh(OpenERP) (nch-openerp) wrote :


This bug was qualified as Already Fixed on Trunk (means that it was already fixed and merged in Trunk). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Naresh Soni

Revision history for this message
Naresh(OpenERP) (nch-openerp) :
review: Approve

Unmerged revisions

6897. By Nehal Panchal (OpenERP)

[FIX] hr_payroll : Fixed Salary Rule's Python Code and Quantity for payslip computation

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_payroll/hr_payroll_demo.xml'
2--- hr_payroll/hr_payroll_demo.xml 2011-12-22 13:35:59 +0000
3+++ hr_payroll/hr_payroll_demo.xml 2012-07-19 12:45:59 +0000
4@@ -75,7 +75,7 @@
5 <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
6 <field name="amount_select">fix</field>
7 <field eval="10" name="amount_fix"/>
8- <field name="quantity">worked_days.WORK100.number_of_days</field>
9+ <field name="quantity">worked_days.WORK100 and worked_days.WORK100.number_of_days</field>
10 <field name="code">MA</field>
11 <field name="category_id" ref="hr_payroll.ALW"/>
12 <field name="register_id" ref="hr_meal_voucher_register"/>
13@@ -89,7 +89,7 @@
14 <field name="category_id" ref="hr_payroll.ALW"/>
15 <field name="name">Get 1% of sales</field>
16 <field name="sequence" eval="17"/>
17- <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
18+ <field name="amount_python_compute">result = ((inputs.SALEURO and inputs.SALEURO.amount) + (inputs.SALASIA and inputs.SALASIA.amount)) * 0.01</field>
19 </record>
21 <!-- Rule Inputs -->