diff options
| author | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2011-09-15 18:30:50 +0200 |
|---|---|---|
| committer | Quentin (OpenERP) <qdp-launchpad@openerp.com> | 2011-09-15 18:30:50 +0200 |
| commit | ffd416e00eb4ca4fbb083f28d63dc42b09f61fe3 (patch) | |
| tree | dc5a113a297fec42c029409c5aaf209b791dfc57 | |
| parent | d4c1e8ad34af2ef09a1b5c645e3842801c0d0b89 (diff) | |
| parent | 4960c39193fae617f62ccd743551623586f91404 (diff) | |
[MERGE[ hr_payroll: usability enhancement
bzr revid: qdp-launchpad@openerp.com-20110915163050-n2ueot8ee2vb0ljq
| -rw-r--r-- | addons/hr_payroll/hr_payroll_view.xml | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index 510fe49f75c..ef2423daeab 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -270,43 +270,7 @@ <field name="credit_note"/> </group> <notebook colspan="4"> - <page string="Salary Computation" > - <field name="line_ids" colspan="4" nolabel="1"> - <tree string="Salary Structure" editable="bottom" colors="blue:total == 0"> - <field name="name"/> - <field name="code"/> - <field name="category_id"/> - <field name="sequence" invisible="1"/> - <field name="quantity" string="Quantity/Rate"/> - <field name="amount"/> - <field name="total"/> - </tree> - <form string="Payslip Line"> - <group> - <field name="name" select="1"/> - <field name="code" select="1"/> - <field name="category_id"/> - <field name="sequence" groups="base.group_extended"/> - <field name="quantity" string="Quantity/Rate"/> - <field name="amount"/> - <field name="total"/> - <field name="salary_rule_id" groups="base.group_extended"/> - </group> - </form> - </field> - </page> - <page string="Details By Salary Rule Category"> - <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1"> - <tree string="Payslip Lines" colors="blue:total == 0"> - <field name="category_id"/> - <field name="name"/> - <field name="code"/> - <field name="total"/> - </tree> - </field> - </page> - - <page string="Worked Days & Inputs"> + <page string="Worked Days & Inputs"> <field name="worked_days_line_ids" colspan="4" nolabel="1"> <tree string="Worked Days" editable="bottom"> <field name="name"/> @@ -347,8 +311,42 @@ </group> </form> </field> + </page> + <page string="Salary Computation" > + <field name="line_ids" colspan="4" nolabel="1"> + <tree string="Salary Structure" editable="bottom" colors="blue:total == 0"> + <field name="name"/> + <field name="code"/> + <field name="category_id"/> + <field name="sequence" invisible="1"/> + <field name="quantity" string="Quantity/Rate"/> + <field name="amount"/> + <field name="total"/> + </tree> + <form string="Payslip Line"> + <group> + <field name="name" select="1"/> + <field name="code" select="1"/> + <field name="category_id"/> + <field name="sequence" groups="base.group_extended"/> + <field name="quantity" string="Quantity/Rate"/> + <field name="amount"/> + <field name="total"/> + <field name="salary_rule_id" groups="base.group_extended"/> + </group> + </form> + </field> + </page> + <page string="Details By Salary Rule Category"> + <field name="details_by_salary_rule_category" context="{'group_by':'category_id'}" domain="[('appears_on_payslip', '=', True)]" nolabel="1"> + <tree string="Payslip Lines" colors="blue:total == 0"> + <field name="category_id"/> + <field name="name"/> + <field name="code"/> + <field name="total"/> + </tree> + </field> </page> - <page string="Other Information"> <separator colspan="4" string="Other Information"/> <group col="5" colspan="2"> @@ -735,7 +733,11 @@ id="act_hr_employee_payslip_list" groups="base.group_hr_manager"/> - <act_window domain="[('slip_id', '=', active_id)]" context="{'search_default_register_id': 1}" id="act_payslip_lines" name="Payslip Lines" res_model="hr.payslip.line" src_model="hr.payslip"/> + <act_window name="Payslip Computation Details" + domain="[('slip_id', '=', active_id)]" + res_model="hr.payslip.line" + src_model="hr.payslip" + id="act_payslip_lines"/> <act_window name="Payslip Lines" domain="[('register_id', '=', active_id)]" |