odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] l10n_be_payroll: rules ok 

bzr revid: osenda-20110330082730-9esh7xn89mv9s0v5
This commit is contained in:
Osenda 2011-03-30 10:27:30 +02:00
parent 2e4287681d
commit ca98534357
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr_payroll/hr_payroll.py
View File

@ -1429,7 +1429,8 @@ class hr_salary_rule(osv.osv):
],'Company Amount Type', select=True),
'contribute_per':fields.float('Company Contribution', digits=(16, 4), help='Define Company contribution ratio 1.00=100% contribution.'),
'company_contribution':fields.boolean('Company Contribution',help="This rule has Company Contributions."),
'expression_result':fields.char('Expression based on', size=1024, required=False, readonly=False, help='result will be affected to a variable'),
'expression_result':fields.char('Expression based on',size=1024, required=True, readonly=False, help='result will be affected to a variable'),
'parent_rule_id':fields.many2one('hr.salary.rule', 'Parent Salary Rule', select=True),
}
_defaults = {
'python_compute': '''# basic\n# employee: hr.employee object or None\n# contract: hr.contract object or None\n\nresult = basic * 0.10''',

27
addons/hr_payroll/hr_payroll_view.xml
View File

@ -614,7 +614,10 @@
<field name="code"/>
<field name="type"/>
<field name="amount_type"/>
<field name="amount"/>
<field name="condition_range_min"/>
<field name="condition_range_max"/>
<!-- <field name="amount"/>-->
<!--<field name="parent_rule_id"/>-->
</tree>
</field>
</record>
@ -645,7 +648,8 @@
<field name="condition_range_min" attrs="{'invisible':[('condition_select','=','python')]}" colspan="1"/>
<field name="condition_range_max" attrs="{'invisible':[('condition_select','=','python')]}" colspan="1"/>
<field name="amount_type"/>
<field name="expression_result"/>
<field name="parent_rule_id"/>
<field name="expression_result"/>
<field name="amount" on_change="onchange_amount(amount, amount_type)" attrs="{'invisible':[('amount_type','=','code')]}"/>
<group col="2" colspan="2" attrs="{'invisible':[('amount_type','&lt;&gt;','code')]}">
<separator colspan="2" string="Compute Code"/>
@ -681,6 +685,25 @@
</field>
</record>
<record id="view_hr_payslip_filter" model="ir.ui.view">
<field name="name">hr.salary.rule.select</field>
<field name="model">hr.salary.rule</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Salary Rule">
<group col="8" colspan="4">
<field name="name"/>
<field name="condition_range_min"/>
</group>
<newline/>
<group col="8" colspan="4" expand="0" string="Group By...">
<filter string="Name" icon="terp-folder-yellow" name="name" context="{'group_by':'name'}"/>
</group>
</search>
</field>
</record>
<record id="action_salary_rule_form" model="ir.actions.act_window">
<field name="name">Salary Rules</field>
<field name="res_model">hr.salary.rule</field>