Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa-hr-sgo into
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-hr-sgo/+merge/115736
Hello sir,
Improve layout of hr config wizard
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-hr-sgo/+merge/115736
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa.
=== modified file 'hr/res_config_view.xml'
--- hr/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ hr/res_config_view.xml 2012-07-19 13:38:04 +0000
@@ -20,27 +20,57 @@
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_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)]}"/>
- </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"/>
- </group>
- </group>
+ attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
+ </div>
+ </div>
+ </group>
+ <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>
</form>
</field>
</record>
=== modified file 'hr_payroll/res_config_view.xml'
--- hr_payroll/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ hr_payroll/res_config_view.xml 2012-07-19 13:38:04 +0000
@@ -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>
=== modified file 'hr_recruitment/res_config_view.xml'
--- hr_recruitment/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ hr_recruitment/res_config_view.xml 2012-07-19 13:38:04 +0000
@@ -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>
=== modified file 'hr_timesheet_sheet/res_config_view.xml'
--- hr_timesheet_sheet/res_config_view.xml 2012-06-25 07:56:32 +0000
+++ hr_timesheet_sheet/res_config_view.xml 2012-07-19 13:38:04 +0000
@@ -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>
_______________________________________________
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
