Merge lp:~openerp-dev/openobject-addons/trunk-bug-916526-mdi into lp:openobject-addons

[DJ Patel (OpenERP)]

Hello Sir,

I have fix the issue: https://bugs.launchpad.net/openobject-addons/+bug/916526 "
hr payroll please correct text".

Thanks and Regards,

Divyesh Makwana(MDI)

[Purnendu Singh (OpenERP) (purnendu-singh)]

review: Approve

[Raphael Collet (OpenERP) (rco-openerp)]

Can you please rewrite this sentence in proper English? It's incomprehensible to me.
I propose : "This will be used to compute the % fields values; in general it is on basic, but you can also use categories code fields in lowercase as a variable names (hra, ma, lta, etc.) and the variable basic." (This is based on my understanding of the sentence.)

Thanks,
Raphael

review: Needs Fixing

[Purnendu Singh (OpenERP) (purnendu-singh)]

Hello Raphael Collet,

Improve the help string as per your suggestion.

Thanks,
Purnendu Singh

review: Needs Fixing

[Purnendu Singh (OpenERP) (purnendu-singh)]

review: Needs Resubmitting

[Raphael Collet (OpenERP) (rco-openerp)]

Thanks,
Raphael

review: Approve

=== modified file 'hr_payroll/hr_payroll.py'
--- hr_payroll/hr_payroll.py	2012-01-05 08:13:25 +0000
+++ hr_payroll/hr_payroll.py	2012-01-27 05:46:19 +0000
@@ -772,7 +772,7 @@
         'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True),
         'company_id':fields.many2one('res.company', 'Company', required=False),
         'condition_select': fields.selection([('none', 'Always True'),('range', 'Range'), ('python', 'Python Expression')], "Condition Based on", required=True),
-        'condition_range':fields.char('Range Based on',size=1024, readonly=False, help='This will use to computer the % fields values, in general its on basic, but You can use all categories code field in small letter as a variable name i.e. hra, ma, lta, etc...., also you can use, static varible basic'),
+        'condition_range':fields.char('Range Based on',size=1024, readonly=False, help='This will be used to compute the % fields values; in general it is on basic, but you can also use categories code fields in lowercase as a variable names (hra, ma, lta, etc.) and the variable basic.'),
         'condition_python':fields.text('Python Condition', required=True, readonly=False, help='Applied this rule for calculation if condition is true. You can specify condition like basic > 1000.'),#old name = conditions
         'condition_range_min': fields.float('Minimum Range', required=False, help="The minimum amount, applied for this rule."),
         'condition_range_max': fields.float('Maximum Range', required=False, help="The maximum amount, applied for this rule."),