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

[IMP] merge with parent branch 

bzr revid: fka@tinyerp.com-20120720070334-yr5212uozyfhre2b
bzr revid: apa@tinyerp.com-20120720095344-crjqqnuzblreungv
bzr revid: fka@tinyerp.com-20120720112517-stj0j8mao1y9cgwh
This commit is contained in:
Foram Katharotiya (OpenERP) 2012-07-20 16:55:17 +05:30
parent acb9039944 476b8cf4da
commit 0f221d5c2a
12 changed files with 337 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
addons/base_setup/res_config_view.xml
View File

@ -6,30 +6,46 @@
<field name="model">base.config.settings</field> <field name="model">base.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="General Settings" version="7.0"> <form string="General Settings" version="7.0" class="oe_form_configuration">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Company Settings"/>
<group> <group>
<group string="Company Settings"> <label for="id" string="Company"/>
<field name="module_multi_company"/> <div>
<separator string="External Accesses" colspan="2"/>
<field name="module_share"/>
<field name="module_portal"/>
</group>
<group>
<div> <div>
You will also find several configuration options on your company data: <field name="module_multi_company" class="oe_inline"/>
address for the header and footer, overdue payments texts, etc. <label for="module_multi_company"/>
</div> </div>
<button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute"/> <div>
<separator string="Others" colspan="2"/> <label string="You will also find several configuration options on your company data:
<label for="id" string="Outgoing Mail Servers"/> address for the header and footer, overdue payments texts, etc."/>
<button type="action" name="%(base.action_ir_mail_server_list)d" <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
string="Configure" icon="gtk-execute"/> </div>
</group> </div>
</group>
<separator string="External Accesses"/>
<group>
<label for="id" string="External Accesses"/>
<div>
<div>
<field name="module_share" class="oe_inline"/>
<label for="module_share"/>
</div>
<div>
<field name="module_portal" class="oe_inline"/>
<label for="module_portal"/>
</div>
</div>
</group>
<separator string="Others"/>
<group>
<label for="id" string="Outgoing Mail Servers"/>
<button type="action" name="%(base.action_ir_mail_server_list)d"
string="Configure" icon="gtk-execute" class="oe_link"/>
</group> </group>
</form> </form>
</field> </field>

60
addons/hr/res_config_view.xml
View File

@ -20,26 +20,56 @@
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Additional Features"/>
<group> <group>
<group string="Additional Features" name="left_column"> <label for="id" string="Additional Features"/>
<field name="module_hr_expense"/> <div>
<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> <div>
<field name="module_hr_payroll"/> <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" <button name="%(open_payroll_modules)d" type="action"
string="Install Country-Specific Payroll" icon="gtk-go-forward" 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> </div>
<group string="Timesheets" name="right_column"> </group>
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)"/> <separator string="Timesheets"/>
<field name="module_hr_timesheet" on_change="onchange_hr_timesheet(module_hr_timesheet)"/> <group name="timesheet_grp">
<field name="module_hr_timesheet_sheet"/> <label for="id" string="Timesheet Features"/>
</group> <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> </form>
</field> </field>

8
addons/hr_payroll/res_config_view.xml
View File

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

26
addons/hr_recruitment/res_config_view.xml
View File

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

14
addons/hr_timesheet_sheet/res_config_view.xml
View File

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

43
addons/knowledge/res_config_view.xml
View File

@ -1,3 +1,4 @@
<openerp> <openerp>
<data> <data>
@ -6,27 +7,47 @@
<field name="model">knowledge.config.settings</field> <field name="model">knowledge.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Knowledge" version="7.0"> <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Wiki"/>
<group> <group>
<group string="Wiki"> <label for="id" string="Wiki Settings"/>
<field name="module_wiki_faq"/> <div>
<field name="module_wiki_quality_manual"/> <div>
</group> <field name="module_wiki_faq" class="oe_inline"/>
<group string="Documents"> <label for="module_wiki_faq"/>
<field name="module_document"/> </div>
<field name="module_document_ftp"/> <div>
<field name="module_document_webdav"/> <field name="module_wiki_quality_manual" class="oe_inline"/>
</group> <label for="module_wiki_quality_manual"/>
</div>
</div>
</group>
<separator string="Documents"/>
<group>
<label for="id" string="Document 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> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_knowledge_configuration" model="ir.actions.act_window"> <record id="action_knowledge_configuration" model="ir.actions.act_window">
<field name="name">Configure Knowledge</field> <field name="name">Configure Knowledge</field>
<field name="res_model">knowledge.config.settings</field> <field name="res_model">knowledge.config.settings</field>

23
addons/marketing/res_config_view.xml
View File

@ -6,17 +6,30 @@
<field name="model">marketing.config.settings</field> <field name="model">marketing.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Marketing" version="7.0"> <form string="Configure Marketing" class="oe_form_configuration" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<group string="Campaigns"> <separator string="Campaigns"/>
<field name="module_marketing_campaign"/> <group>
<field name="module_marketing_campaign_crm_demo"/> <label for="id" string="Campaigns Settings"/>
<field name="module_crm_profiling"/> <div>
<div>
<field name="module_marketing_campaign" class="oe_inline"/>
<label for="module_marketing_campaign"/>
</div>
<div>
<field name="module_marketing_campaign_crm_demo" class="oe_inline"/>
<label for="module_marketing_campaign_crm_demo"/>
</div>
<div>
<field name="module_crm_profiling" class="oe_inline"/>
<label for="module_crm_profiling"/>
</div>
</div>
</group> </group>
</form> </form>
</field> </field>

77
addons/mrp/res_config_view.xml
View File

@ -1,38 +1,79 @@
<openerp> <openerp>
<data> <data>
<record id="view_mrp_config" model="ir.ui.view"> <record id="view_mrp_config" model="ir.ui.view">
<field name="name">mrp settings</field> <field name="name">mrp settings</field>
<field name="model">mrp.config.settings</field> <field name="model">mrp.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Manufacturing" version="7.0"> <form string="Configure Manufacturing" class= "oe_form_configuration" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Manufacturing Order"/>
<group> <group>
<group string="Manufacturing Order"> <label for="id" string="Order Settings"/>
<field name="module_mrp_operations"/> <div>
<field name="module_stock_planning"/> <div>
<field name="module_mrp_subproduct"/> <field name="module_mrp_operations" class="oe_inline"/>
<field name="module_mrp_repair"/> <label for="module_mrp_operations" />
<separator string="Logistics" colspan="2"/> </div>
<field name="module_mrp_jit"/> <div>
<field name="module_stock_no_autopicking"/> <field name="module_stock_planning" class="oe_inline"/>
</group> <label for="module_stock_planning"/>
<group string="Products"> </div>
<field name="module_product_manufacturer"/> <div>
<separator string="Bill Of Material" colspan="2"/> <field name="module_mrp_subproduct" class="oe_inline"/>
<field name="group_mrp_routings"/> <label for="module_mrp_subproduct"/>
<field name="group_mrp_properties"/> </div>
</group> <div>
<field name="module_mrp_repair" class="oe_inline"/>
<label for="module_mrp_repair"/>
</div>
</div>
</group>
<separator string="Logistics" />
<group >
<label for="id" string="Logistics Settings"/>
<div>
<div>
<field name="module_mrp_jit" class="oe_inline"/>
<label for="module_mrp_jit" string="Real-Time"/>
</div>
<div>
<field name="module_stock_no_autopicking" class="oe_inline"/>
<label for="module_stock_no_autopicking" />
</div>
</div>
</group>
<separator string="Products"/>
<group >
<label for="id" string="Product Settings"/>
<div>
<div>
<field name="module_product_manufacturer" class="oe_inline"/>
<label for="module_product_manufacturer"/>
</div>
</div>
</group>
<separator string="Bill Of Material" />
<group >
<label for="id" string="BOM Settings"/>
<div>
<div>
<field name="group_mrp_routings" class="oe_inline"/>
<label for="group_mrp_routings"/>
</div>
<div>
<field name="group_mrp_properties" class="oe_inline"/>
<label for="group_mrp_properties" />
</div>
</div>
</group> </group>
</form> </form>
</field> </field>
</record> </record>
<record id="action_mrp_configuration" model="ir.actions.act_window"> <record id="action_mrp_configuration" model="ir.actions.act_window">
<field name="name">Configure Manufacturing</field> <field name="name">Configure Manufacturing</field>
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>

74
addons/project/res_config_view.xml
View File

@ -6,30 +6,68 @@
<field name="type">form</field> <field name="type">form</field>
<field name="priority" eval="20"/> <field name="priority" eval="20"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Project" version="7.0"> <form string="Configure Project" version="7.0" class="oe_form_configuration">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Project and Planing"/>
<group> <group>
<group> <label for="id" string="Project"/>
<separator string="Project" colspan="2"/> <div>
<field name="module_project_mrp"/> <div>
<field name="module_project_timesheet"/> <field name="module_project_mrp" class="oe_inline"/>
<field name="module_pad"/> <label for="module_project_mrp"/>
<field name="group_tasks_work_on_tasks"/> </div>
<field name="group_time_work_estimation_tasks"/> <div>
<field name="group_manage_delegation_task"/> <field name="module_project_timesheet" class="oe_inline"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"/> <label for="module_project_timesheet"/>
</group> </div>
<group name="project_left_column"> <div>
<separator string="Planing" colspan="2"/> <field name="module_pad" class="oe_inline"/>
<field name="module_project_long_term"/> <label for="module_pad"/>
<separator string="Helpdesk and Support" colspan="2"/> </div>
<field name="module_project_issue"/> <div>
<field name="module_project_issue_sheet"/> <field name="group_tasks_work_on_tasks" class="oe_inline"/>
</group> <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> </group>
</form> </form>
</field> </field>

17
addons/project_issue/res_config_view.xml
View File

@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<openerp> <openerp>
<data> <data>
<record id="view_config_settings" model="ir.ui.view"> <record id="view_config_settings" model="ir.ui.view">
<field name="name">Project Application</field> <field name="name">Project Application</field>
<field name="model">project.config.settings</field> <field name="model">project.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="project.view_config_settings"/> <field name="inherit_id" ref="project.view_config_settings"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="module_project_issue_sheet" position="after"> <div name="module_project_issue_sheet" position="after">
<label for="fetchmail_issue"/>
<div> <div>
<field name="fetchmail_issue"/> <field name="fetchmail_issue" class="oe_inline"/>
<button name="configure_fetchmail_issue" type="object" string="Configure" icon="gtk-go-forward" <label for="fetchmail_issue"/>
attrs="{'invisible': [('fetchmail_issue','=',False)]}"/> <button name="configure_fetchmail_issue"
type="object"
string="Configure"
icon="gtk-go-forward"
attrs="{'invisible': [('fetchmail_issue','=',False)]}" class="oe_link"/>
</div> </div>
</field> </div>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>

66
addons/purchase/res_config_view.xml
View File

@ -1,34 +1,64 @@
<openerp> <openerp>
<data> <data>
<record id="view_purchase_configuration" model="ir.ui.view"> <record id="view_purchase_configuration" model="ir.ui.view">
<field name="name">purchase settings</field> <field name="name">purchase settings</field>
<field name="model">purchase.config.settings</field> <field name="model">purchase.config.settings</field>
<field name="type">form</field> <field name="type">form</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Configure Purchases" version="7.0"> <form string="Configure Purchases" class="oe_form_configuration" version="7.0">
<header> <header>
<button string="Apply" type="object" name="execute" class="oe_highlight"/> <button string="Apply" type="object" name="execute" class="oe_highlight"/>
or or
<button string="Cancel" type="object" name="cancel" class="oe_link"/> <button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header> </header>
<separator string="Purchase Order"/>
<group> <group>
<group> <label for="id" string="Order Setting"/>
<separator string="Purchase Order" colspan="2"/> <div>
<field name="group_purchase_pricelist"/> <div>
<field name="group_uom"/> <field name="group_purchase_pricelist" class="oe_inline"/>
<field name="group_purchase_delivery_address"/> <label for="group_purchase_pricelist"/>
<field name="module_purchase_double_validation"/> </div>
<field name="module_purchase_requisition"/> <div>
<field name="module_warning"/> <field name="group_uom" class="oe_inline"/>
<field name="module_purchase_analytic_plans"/> <label for="group_uom"/>
</group> </div>
<group> <div>
<separator string="Invoicing" colspan="2"/> <field name="group_purchase_delivery_address" class="oe_inline"/>
<field name="default_invoice_method" class="oe_inline"/> <label for="group_purchase_delivery_address"/>
<field name="decimal_precision" class="oe_inline"/> </div>
</group> <div name="module_purchase_double_validation">
</group> <field name="module_purchase_double_validation" class="oe_inline"/>
<label for="module_purchase_double_validation"/>
</div>
<div>
<field name="module_purchase_requisition" class="oe_inline"/>
<label for="module_purchase_requisition"/>
</div>
<div>
<field name="module_warning" class="oe_inline"/>
<label for="module_warning"/>
</div>
<div>
<field name="module_purchase_analytic_plans" class="oe_inline"/>
<label for="module_purchase_analytic_plans"/>
</div>
</div>
</group>
<separator string="Invoicing"/>
<group>
<label for="id" string="Invoicing Setting"/>
<div>
<div>
<label for="default_invoice_method"/>
<field name="default_invoice_method" class="oe_inline"/>
</div>
<div>
<label for="decimal_precision"/>
<field name="decimal_precision" class="oe_inline"/>
</div>
</div>
</group>
</form> </form>
</field> </field>
</record> </record>

10
addons/purchase_double_validation/purchase_double_validation_installer.xml
View File

@ -7,11 +7,13 @@
<field name="type">form</field> <field name="type">form</field>
<field name="inherit_id" ref="purchase.view_purchase_configuration"/> <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<field name="module_purchase_double_validation" position="after"> <div name="module_purchase_double_validation" position="before">
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}"/> <div>
</field> <label for="limit_amount"/>
<field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
</div>
</div>
</field> </field>
</record> </record>
</data> </data>
</openerp> </openerp>