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

[IMP] usaiblity improvements 

bzr revid: qdp-launchpad@openerp.com-20110711160549-n2rgb060zuo51g65
This commit is contained in:
Quentin (OpenERP) 2011-07-11 18:05:49 +02:00
parent 4f77873577
commit cc5639bbac
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_contract/hr_contract_view.xml
View File

@ -163,7 +163,7 @@
<field name="trial_date_end" />
</group>
<group col="2" colspan="2">
<separator colspan="2" string="Advantages"/>
<separator name="advantages" colspan="2" string="Advantages"/>
<field name="advantages" nolabel="1" colspan="2"/>
</group>
<separator colspan="4" string="Notes"/>

3
addons/hr_payroll/hr_payroll.py
View File

@ -769,7 +769,7 @@ class hr_salary_rule(osv.osv):
'amount_python_compute':fields.text('Python Code'),
'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
'child_ids':fields.one2many('hr.salary.rule', 'parent_rule_id', 'Child Salary Rule'),
'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Contribution register for the rule"),
'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Eventual third party involved in the salary payment of the employees."),
'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'),
'note':fields.text('Description'),
}
@ -918,7 +918,6 @@ class hr_payslip_line(osv.osv):
'contract_id':fields.many2one('hr.contract', 'Contract', required=True),
'amount': fields.float('Amount', digits_compute=dp.get_precision('Payroll')),
'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Payroll')),
'company_contrib': fields.float('Company Contribution', readonly=True, digits_compute=dp.get_precision('Payroll')),
'total': fields.function(_calculate_total, method=True, type='float', string='Total', digits_compute=dp.get_precision('Payroll'),store=True ),
}

10
addons/hr_payroll/hr_payroll_view.xml
View File

@ -44,7 +44,8 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="/form/notebook/page/group/field[@name='advantages']" position="before">
<xpath expr="/form/notebook/page/group/separator[@name='advantages']" position="before">
<separator string="Payslip Info" colspan="2"/>
<field name="struct_id" required="1"/>
</xpath>
<xpath expr="/form/notebook/page/group/field[@name='working_hours']" position="after">
@ -125,7 +126,7 @@
id="menu_hr_employee_function"
action="action_view_hr_employee_grade_form"
parent="payroll_configure"
sequence="13"
sequence="1"
/>
<!-- End Salary structure -->
@ -169,10 +170,6 @@
<field name="amount_percentage" attrs="{'readonly':[('amount_select','&lt;&gt;','percentage')]}"/>
<field name="sequence" groups="base.group_extended"/>
</group>
<group col="2" colspan="2">
<separator colspan="4" string="Company contribution"/>
<field name="company_contrib"/>
</group>
<notebook colspan="4">
<page string="Description">
<separator colspan="4" string="Description"/>
@ -491,6 +488,7 @@
<field name="name">Contribution Registers</field>
<field name="res_model">hr.contribution.register</field>
<field name="view_type">form</field>
<field name="help">A contribution register is a third party involved in the salary payment of the employees. It can be the social security, the estate or anyone that collect or inject money on payslips.</field>
<field name="view_id" ref="hr_contribution_register_tree"/>
</record>
<menuitem