[IMP]hr:hr config_wizard view improvement

bzr revid: sgo@tinyerp.com-20120719112103-gt818a5mgshjlccn
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-07-19 16:51:03 +05:30
parent 537126dbad
commit 2ad16d53ba
4 changed files with 86 additions and 31 deletions

View File

@ -20,27 +20,65 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<group>
<group string="Additional Features" name="left_column">
<field name="module_hr_expense"/>
<field name="module_hr_evaluation"/>
<field name="module_hr_holidays"/>
<field name="module_hr_recruitment"/>
<field name="module_hr_contract"/>
<label for="module_hr_payroll"/>
<separator string="Additional Features"/>
<group>
<label for="id" string="Additional Features"/>
<div>
<field name="module_hr_payroll"/>
<button name="%(open_payroll_modules)d" type="action"
<div>
<field name="module_hr_expense" class="oe_inline"/>
<label for="module_hr_expense"/>
</div>
<div>
<field name="module_hr_evaluation" class="oe_inline"/>
<label for="module_hr_evaluation"/>
</div>
<div>
<field name="module_hr_holidays" class="oe_inline"/>
<label for="module_hr_holidays"/>
</div>
<div>
<field name="module_hr_expense" class="oe_inline"/>
<label for="module_hr_expense"/>
</div>
<div>
<field name="module_hr_expense" class="oe_inline"/>
<label for="module_hr_expense"/>
</div>
<div>
<field name="module_hr_recruitment" class="oe_inline"/>
<label for="module_hr_recruitment"/>
</div>
<div>
<field name="module_hr_contract" class="oe_inline"/>
<label for="module_hr_contract"/>
</div>
<div name="hr_payroll">
<field name="module_hr_payroll" class="oe_inline"/>
<label for="module_hr_payroll"/>
<button name="%(open_payroll_modules)d" type="action"
string="Install Country-Specific Payroll" icon="gtk-go-forward"
attrs="{'invisible': [('module_hr_payroll','=',False)]}"/>
attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
</div>
</div>
</group>
<group string="Timesheets" name="right_column">
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/>
<field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/>
<field name="module_hr_timesheet_sheet"/>
<separator string="Timesheets"/>
<group name="timesheet_grp">
<label for="id" string="Timesheet Features"/>
<div>
<div>
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
<label for="module_hr_attendance"/>
</div>
<div>
<field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)" class="oe_inline"/>
<label for="module_hr_timesheet"/>
</div>
<div name="hr_timesheet">
<field name="module_hr_timesheet_sheet" class="oe_inline"/>
<label for="module_hr_timesheet_sheet"/>
</div>
</div>
</group>
</group>
</form>
</field>
</record>

View File

@ -8,8 +8,11 @@
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<!-- put after the element <div><field name="module_hr_payroll" class="oe_inline"/> ...</div> -->
<xpath expr="//group[@name='left_column']" position="inside">
<field name="module_hr_payroll_account"/>
<xpath expr="//div[@name='hr_payroll']" position="after">
<div>
<field name="module_hr_payroll_account" class="oe_inline"/>
<label for="module_hr_payroll_account"/>
</div>
</xpath>
</field>
</record>

View File

@ -7,15 +7,23 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<group name="right_column" position="inside">
<separator string="Recruitment" colspan="2"/>
<field name="module_document_ftp"/>
<label for="fetchmail_applicants"/>
<div>
<field name="fetchmail_applicants"/>
<button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_applicants','=',False)]}"/>
</div>
<group name="timesheet_grp" position="after">
<separator string="Recruitment"/>
<group>
<label for="id" string="Recruitment Features"/>
<div>
<div>
<field name="module_document_ftp" class="oe_inline"/>
<label for="module_document_ftp"/>
</div>
<div>
<field name="fetchmail_applicants" class="oe_inline"/>
<label for="fetchmail_applicants"/>
<button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
</div>
</div>
</group>
</group>
</field>
</record>

View File

@ -7,10 +7,16 @@
<field name="type">form</field>
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<field name="module_hr_timesheet_sheet" position="after">
<field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
<field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}"/>
</field>
<xpath expr="//div[@name='hr_timesheet']" position="after">
<div>
<label for="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
<field name="timesheet_range" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
</div>
<div>
<label for="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)]}"/>
<field name="timesheet_max_difference" attrs="{'invisible': [('module_hr_timesheet_sheet','=',False)], 'required': [('module_hr_timesheet_sheet','=',True)]}" class="oe_inline"/>
</div>
</xpath>
</field>
</record>
</data>