Purnendu Singh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-bug-usability-issues-psi into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-usability-issues-psi/+merge/75479
Hello,
Usability issues:
1) payslip: move the worked_days and input tab as first
2) payslip act_window 'payslip lines': rename into "payslip computation
detail"
Thanks,
Purnendu Singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-usability-issues-psi/+merge/75479
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-bug-usability-issues-psi.
=== modified file 'hr_payroll/hr_payroll_view.xml'
--- hr_payroll/hr_payroll_view.xml 2011-09-14 12:31:08 +0000
+++ hr_payroll/hr_payroll_view.xml 2011-09-15 05:31:27 +0000
@@ -270,6 +270,48 @@
<field name="credit_note"/>
</group>
<notebook colspan="4">
+ <page string="Worked Days & Inputs">
+ <field name="worked_days_line_ids" colspan="4" nolabel="1">
+ <tree string="Worked Days" editable="bottom">
+ <field name="name"/>
+ <field name="code"/>
+ <field name="number_of_days" sum="Total Working Days"/>
+ <field name="number_of_hours"/>
+ <field name="contract_id" groups="base.group_extended"/>
+ <field name="sequence" invisible="True"/>
+ </tree>
+ <form string="Worked Day">
+ <group>
+ <field name="name" select="1"/>
+ <field name="code" select="1"/>
+ <field name="payslip_id"/>
+ <field name="sequence" groups="base.group_extended"/>
+ <field name="number_of_days"/>
+ <field name="number_of_hours"/>
+ <field name="contract_id" groups="base.group_extended"/>
+ </group>
+ </form>
+ </field>
+ <field name="input_line_ids" colspan="4" nolabel="1">
+ <tree string="Input Data" editable="bottom">
+ <field name="name"/>
+ <field name="code"/>
+ <field name="amount"/>
+ <field name="contract_id" groups="base.group_extended"/>
+ <field name="sequence" invisible="True"/>
+ </tree>
+ <form string="Payslip Line">
+ <group>
+ <field name="name" select="1"/>
+ <field name="code" select="1"/>
+ <field name="payslip_id"/>
+ <field name="sequence" groups="base.group_extended"/>
+ <field name="amount"/>
+ <field name="contract_id" groups="base.group_extended"/>
+ </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">
@@ -305,50 +347,6 @@
</tree>
</field>
</page>
-
- <page string="Worked Days & Inputs">
- <field name="worked_days_line_ids" colspan="4" nolabel="1">
- <tree string="Worked Days" editable="bottom">
- <field name="name"/>
- <field name="code"/>
- <field name="number_of_days" sum="Total Working Days"/>
- <field name="number_of_hours"/>
- <field name="contract_id" groups="base.group_extended"/>
- <field name="sequence" invisible="True"/>
- </tree>
- <form string="Worked Day">
- <group>
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="payslip_id"/>
- <field name="sequence" groups="base.group_extended"/>
- <field name="number_of_days"/>
- <field name="number_of_hours"/>
- <field name="contract_id" groups="base.group_extended"/>
- </group>
- </form>
- </field>
- <field name="input_line_ids" colspan="4" nolabel="1">
- <tree string="Input Data" editable="bottom">
- <field name="name"/>
- <field name="code"/>
- <field name="amount"/>
- <field name="contract_id" groups="base.group_extended"/>
- <field name="sequence" invisible="True"/>
- </tree>
- <form string="Payslip Line">
- <group>
- <field name="name" select="1"/>
- <field name="code" select="1"/>
- <field name="payslip_id"/>
- <field name="sequence" groups="base.group_extended"/>
- <field name="amount"/>
- <field name="contract_id" groups="base.group_extended"/>
- </group>
- </form>
- </field>
- </page>
-
<page string="Other Information">
<separator colspan="4" string="Other Information"/>
<group col="5" colspan="2">
@@ -734,7 +732,12 @@
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 Detail"
+ domain="[('slip_id', '=', active_id)]"
+ context="{'search_default_register_id': 1}"
+ res_model="hr.payslip.line"
+ src_model="hr.payslip"
+ id="act_payslip_lines"/>
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
