Randhir Mayatra (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa-Knowladge-wizard-rma
into lp:openobject-addons.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-Knowladge-wizard-rma/+merge/115919
Hello Sir,
I have Make Changes into the Knowledge Wizard.
Thank you..
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-config-wizard-apa-Knowladge-wizard-rma/+merge/115919
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-config-wizard-apa-Knowladge-wizard-rma.
=== 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-20 09:33:10 +0000
@@ -20,26 +20,56 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
+ <separator string="Additional Features"/>
<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"/>
- <div>
- <field name="module_hr_payroll"/>
+ <label for="id" string="Additional Features"/>
+ <div>
+ <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>
+ 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>
=== 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-20 09:33:10 +0000
@@ -7,9 +7,11 @@
<field name="type">form</field>
<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-20 09:33:10 +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-20 09:33:10 +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>
=== modified file 'knowledge/res_config_view.xml'
--- knowledge/res_config_view.xml 2012-07-09 05:27:38 +0000
+++ knowledge/res_config_view.xml 2012-07-20 09:33:10 +0000
@@ -1,3 +1,4 @@
+
<openerp>
<data>
@@ -6,27 +7,47 @@
<field name="model">knowledge.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Configure Knowledge" version="7.0">
+ <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <group>
- <group string="Wiki">
- <field name="module_wiki_faq"/>
- <field name="module_wiki_quality_manual"/>
- </group>
- <group string="Documents">
- <field name="module_document"/>
- <field name="module_document_ftp"/>
- <field name="module_document_webdav"/>
- </group>
- </group>
+ <separator string="Wiki"/>
+ <group>
+ <label for="id" string="Wiki Settings"/>
+ <div>
+ <div>
+ <field name="module_wiki_faq" class="oe_inline"/>
+ <label for="module_wiki_faq"/>
+ </div>
+ <div>
+ <field name="module_wiki_quality_manual" class="oe_inline"/>
+ <label for="module_wiki_quality_manual"/>
+ </div>
+ </div>
+ </group>
+ <separator string="Documents"/>
+ <group>
+ <label for="id" string="Documents Settings"/>
+ <div>
+ <div>
+ <field name="module_document" class="oe_inline"/>
+ <label for="module_document"/>
+ </div>
+ <div>
+ <field name="module_document_ftp" class="oe_inline"/>
+ <label for="module_document_ftp"/>
+ </div>
+ <div>
+ <field name="module_document_webdav" class="oe_inline"/>
+ <label for="module_document_webdav"/>
+ </div>
+ </div>
+ </group>
</form>
</field>
</record>
-
<record id="action_knowledge_configuration" model="ir.actions.act_window">
<field name="name">Configure Knowledge</field>
<field name="res_model">knowledge.config.settings</field>
=== modified file 'project/res_config_view.xml'
--- project/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ project/res_config_view.xml 2012-07-20 09:33:10 +0000
@@ -6,30 +6,68 @@
<field name="type">form</field>
<field name="priority" eval="20"/>
<field name="arch" type="xml">
- <form string="Configure Project" version="7.0">
+ <form string="Configure Project" version="7.0" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <group>
- <group>
- <separator string="Project" colspan="2"/>
- <field name="module_project_mrp"/>
- <field name="module_project_timesheet"/>
- <field name="module_pad"/>
- <field name="group_tasks_work_on_tasks"/>
- <field name="group_time_work_estimation_tasks"/>
- <field name="group_manage_delegation_task"/>
- <field name="time_unit" domain="[('category_id.name','=','Working Time')]"/>
- </group>
- <group name="project_left_column">
- <separator string="Planing" colspan="2"/>
- <field name="module_project_long_term"/>
- <separator string="Helpdesk and Support" colspan="2"/>
- <field name="module_project_issue"/>
- <field name="module_project_issue_sheet"/>
- </group>
+ <separator string="Project and Planing"/>
+ <group>
+ <label for="id" string="Project"/>
+ <div>
+ <div>
+ <field name="module_project_mrp" class="oe_inline"/>
+ <label for="module_project_mrp"/>
+ </div>
+ <div>
+ <field name="module_project_timesheet" class="oe_inline"/>
+ <label for="module_project_timesheet"/>
+ </div>
+ <div>
+ <field name="module_pad" class="oe_inline"/>
+ <label for="module_pad"/>
+ </div>
+ <div>
+ <field name="group_tasks_work_on_tasks" class="oe_inline"/>
+ <label for="group_tasks_work_on_tasks" />
+ </div>
+ <div>
+ <field name="group_time_work_estimation_tasks" class="oe_inline"/>
+ <label for="group_time_work_estimation_tasks"/>
+ </div>
+ <div>
+ <field name="group_manage_delegation_task" class="oe_inline"/>
+ <label for="group_manage_delegation_task"/>
+ </div>
+ <div>
+ <label for="time_unit"/>
+ <field name="time_unit" class="oe_inline" domain="[('category_id.name','=','Working Time')]"/>
+ </div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Planing"/>
+ <div>
+ <div>
+ <field name="module_project_long_term" class="oe_inline"/>
+ <label for="module_project_long_term"/>
+ </div>
+ </div>
+ </group>
+ <separator string="Helpdesk and Support"/>
+ <group>
+ <label for="id" string="Helpdesk and Support"/>
+ <div>
+ <div>
+ <field name="module_project_issue" class="oe_inline"/>
+ <label for="module_project_issue"/>
+ </div>
+ <div name="module_project_issue_sheet">
+ <field name="module_project_issue_sheet" class="oe_inline"/>
+ <label for="module_project_issue_sheet"/>
+ </div>
+ </div>
</group>
</form>
</field>
=== modified file 'project_issue/res_config_view.xml'
--- project_issue/res_config_view.xml 2012-07-05 09:35:04 +0000
+++ project_issue/res_config_view.xml 2012-07-20 09:33:10 +0000
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
-
<record id="view_config_settings" model="ir.ui.view">
<field name="name">Project Application</field>
<field name="model">project.config.settings</field>
<field name="type">form</field>
<field name="inherit_id" ref="project.view_config_settings"/>
<field name="arch" type="xml">
- <field name="module_project_issue_sheet" position="after">
- <label for="fetchmail_issue"/>
+ <div name="module_project_issue_sheet" position="after">
<div>
- <field name="fetchmail_issue"/>
- <button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward"
- attrs="{'invisible': [('fetchmail_issue','=',False)]}"/>
+ <field name="fetchmail_issue" class="oe_inline"/>
+ <label for="fetchmail_issue"/>
+ <button name="configure_fetchmail_issue"
+ type="object"
+ string="Configure"
+ icon="gtk-go-forward"
+ attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
</div>
- </field>
+ </div>
</field>
</record>
-
</data>
</openerp>
=== modified file 'stock/res_config_view.xml'
--- stock/res_config_view.xml 2012-07-16 13:43:14 +0000
+++ stock/res_config_view.xml 2012-07-20 09:33:10 +0000
@@ -7,36 +7,88 @@
<field name="model">stock.config.settings</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Configure Warehouse" version="7.0">
+ <form string="Configure Warehouse" version="7.0" class="oe_form_configuration">
<header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/>
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <group>
- <group>
- <separator string="Traceability" colspan="2"/>
- <field name="group_stock_production_lot"/>
- <field name="group_stock_tracking_lot"/>
- <field name="module_product_expiry"
- attrs="{'invisible': [('group_stock_production_lot','=',False)]}"/>
- <separator string="Logistics" colspan="2"/>
- <field name="group_stock_multiple_locations"/>
- <field name="module_stock_invoice_directly"/>
- <field name="module_stock_location"/>
- <field name="decimal_precision" class="oe_inline"/>
- </group>
- <group>
- <separator string="Partners" colspan="2"/>
- <field name="module_claim_from_delivery"/>
- <separator string="Products" colspan="2"/>
- <field name="group_stock_packaging"/>
- <field name="group_uom"/>
- <field name="group_uos"/>
- <field name="group_stock_inventory_valuation" class="oe_inline"/>
- <field name="group_product_variant"/>
- </group>
- </group>
+ <div>
+ <separator string="Traceability & Logistics"/>
+ <group>
+ <label for="id" string="Traceability"/>
+ <div>
+ <div>
+ <field name="group_stock_production_lot" class="oe_inline"/>
+ <label for="group_stock_production_lot"/>
+ </div>
+ <div attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
+ <field name="module_product_expiry" class="oe_inline"/>
+ <label for="module_product_expiry"/>
+ </div>
+ <div>
+ <field name="group_stock_tracking_lot" class="oe_inline"/>
+ <label for="group_stock_tracking_lot"/>
+ </div>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Logistics"/>
+ <div>
+ <div>
+ <field name="group_stock_multiple_locations" class="oe_inline"/>
+ <label for="group_stock_multiple_locations"/>
+ </div>
+ <div>
+ <field name="module_stock_invoice_directly" class="oe_inline"/>
+ <label for="module_stock_invoice_directly"/>
+ </div>
+ <div>
+ <field name="module_stock_location" class="oe_inline"/>
+ <label for="module_stock_location"/>
+ </div>
+ <div>
+ <label for="decimal_precision"/>
+ <field name="decimal_precision" class="oe_inline"/>
+ </div>
+ </div>
+ </group>
+ </div>
+ <div>
+ <separator string="Partners & Products"/>
+ <group>
+ <label for="id" string="Partners"/>
+ <div>
+ <field name="module_claim_from_delivery" class="oe_inline"/>
+ <label for="module_claim_from_delivery"/>
+ </div>
+ </group>
+ <group>
+ <label for="id" string="Products"/>
+ <div>
+ <div>
+ <field name="group_stock_packaging" class="oe_inline"/>
+ <label for="group_stock_packaging"/>
+ </div>
+ <div>
+ <field name="group_uom" class="oe_inline"/>
+ <label for="group_uom"/>
+ </div>
+ <div>
+ <field name="group_uos" class="oe_inline"/>
+ <label for="group_uos" string="Unit of Measure (for Sale)"/>
+ </div>
+ <div>
+ <field name="group_stock_inventory_valuation" class="oe_inline"/>
+ <label for="group_stock_inventory_valuation"/>
+ </div>
+ <div>
+ <field name="group_product_variant" class="oe_inline"/>
+ <label for="group_product_variant"/>
+ </div>
+ </div>
+ </group>
+ </div>
</form>
</field>
</record>
_______________________________________________
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
