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

[IMP]reorganize group in contract form and remove total from my timesheet 

bzr revid: sgo@tinyerp.com-20120629064443-kwyp4r59620qse3k
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-06-29 12:14:43 +05:30
parent 1325558868
commit faddab4935
5 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/hr_contract/hr_contract_view.xml
View File

@ -84,16 +84,13 @@
<field name="date_end" />
<field name="working_hours"/>
</group>
<group string="Trial Period">
<group name="trail" string="Trial Period">
<field name="trial_date_start" />
<field name="trial_date_end" />
<separator string="Advantages" colspan="2"/>
<field name="advantages" nolabel="1"/>
</group>
</group>
<group>
<group name="right_column" string="Advantages">
<field name="advantages" nolabel="1"/>
</group>
</group>
<separator string="Notes"/>
<field name="notes"/>
</page>

2
addons/hr_payroll/hr_payroll_view.xml
View File

@ -18,7 +18,7 @@
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<data>
<xpath expr="//group[@name='right_column']" position="before">
<xpath expr="//group[@name='trail']" position="after">
<group string="Payslip Info">
<field name="struct_id" required="1"/>
</group>

9
addons/hr_payroll_account/hr_payroll_account_view.xml
View File

@ -44,10 +44,11 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='advantages']" position="after">
<separator colspan="4" string="Accounting"/>
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="journal_id"/>
<xpath expr="//group[@name='trail']" position="after">
<group string="Accounting">
<field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
<field name="journal_id"/>
</group>
</xpath>
</field>
</record>

3
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -106,7 +106,6 @@
</group>
<group col="4">
<field name="state_attendance"/>
<field name="total_attendance_day" widget="float_time"/>
</group>
<field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
<tree editable="top" string="Timesheet Lines">
@ -136,8 +135,6 @@
<field name="user_id" required="1"/>
</form>
</field>
<field name="total_difference_day" widget="float_time"/>
<field name="total_timesheet_day" widget="float_time"/>
</page>
<page string="Summary">
<field colspan="4" name="period_ids" nolabel="1">

18
addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
View File

@ -15,15 +15,17 @@
<field name="misc_onss_deduction"/>
<field name="meal_voucher_amount"/>
<field name="misc_advantage_amount"/>
<separator string="Miscellaneous" colspan="2"/>
<field name="additional_net_amount"/>
<field name="retained_net_amount"/>
</xpath>
<xpath expr="//field[@name='trial_date_end']" position="after">
<separator string="By Worker" colspan="2"/>
<field name="insurance_employee_deduction"/>
<field name="meal_voucher_employee_deduction"/>
<field name="car_employee_deduction"/>
<xpath expr="//group[@name='trail']" position="after">
<group string="Miscellaneous">
<field name="additional_net_amount"/>
<field name="retained_net_amount"/>
</group>
<group string="By Worker">
<field name="insurance_employee_deduction"/>
<field name="meal_voucher_employee_deduction"/>
<field name="car_employee_deduction"/>
</group>
</xpath>
</data>
</field>