[FIX] crm_claim: move crm_claim settings in sale settings instead of project settings
bzr revid: rco@openerp.com-20120326135527-yze9xycp32zcghyz
This commit is contained in:
parent
ec02c708d8
commit
ff25d241ed
|
@ -3,13 +3,12 @@
|
|||
<data>
|
||||
|
||||
<record id="view_sales_config_crm" model="ir.ui.view">
|
||||
<field name="name">Sales Application</field>
|
||||
<field name="name">crm settings</field>
|
||||
<field name="model">sale.config.settings</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="mail.view_sales_config_plugin"/>
|
||||
<field name="inherit_id" ref="base.view_sale_config_settings"/>
|
||||
<field name="arch" type="xml">
|
||||
<group name="config_emails" position="before">
|
||||
<separator string="Emails" colspan="4"/>
|
||||
<group name="config_emails" position="after">
|
||||
<field name="fetchmail_lead"/>
|
||||
<group colspan="2" attrs="{'invisible': [('fetchmail_lead','=',False)]}">
|
||||
<field name="lead_server" attrs="{'required': [('fetchmail_lead','=',True)]}"/>
|
||||
|
|
|
@ -22,8 +22,8 @@
|
|||
from osv import osv, fields
|
||||
|
||||
class crm_claim_settings(osv.osv_memory):
|
||||
_name = 'project.config.settings'
|
||||
_inherit = ['project.config.settings', 'fetchmail.config.settings']
|
||||
_name = 'sale.config.settings'
|
||||
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
|
||||
|
||||
_columns = {
|
||||
'fetchmail_claim': fields.boolean("Create claims from an email account",
|
||||
|
|
|
@ -3,12 +3,13 @@
|
|||
<data>
|
||||
|
||||
<record id="view_project_config_claim" model="ir.ui.view">
|
||||
<field name="name">Project Application</field>
|
||||
<field name="model">project.config.settings</field>
|
||||
<field name="name">crm_claim settings</field>
|
||||
<field name="model">sale.config.settings</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base.project_settings_form_view"/>
|
||||
<field name="inherit_id" ref="base.view_sale_config_settings"/>
|
||||
<field name="priority" eval="12"/> <!-- to put fetchmail_lead before fetchmail_claim -->
|
||||
<field name="arch" type="xml">
|
||||
<group name="helpdesk" position="after">
|
||||
<group name="config_emails" position="after">
|
||||
<field name="fetchmail_claim"/>
|
||||
<group colspan="2" attrs="{'invisible': [('fetchmail_claim','=',False)]}">
|
||||
<field name="claim_server" attrs="{'required': [('fetchmail_claim','=',True)]}"/>
|
||||
|
|
|
@ -2,16 +2,20 @@
|
|||
<data>
|
||||
|
||||
<record id="view_sales_config_plugin" model="ir.ui.view">
|
||||
<field name="name">Sales Application</field>
|
||||
<field name="name">mail plugins settings</field>
|
||||
<field name="model">sale.config.settings</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base.view_sale_config_settings"/>
|
||||
<field name="priority" eval="8"/> <!-- plugin fields will appear last -->
|
||||
<field name="arch" type="xml">
|
||||
<group name="config_emails" position="inside">
|
||||
<separator string="Emails"/>
|
||||
</group>
|
||||
<group name="config_emails" position="after">
|
||||
<separator string="Plugins" colspan="4"/>
|
||||
<field name="module_plugin_thunderbird"/>
|
||||
<newline/>
|
||||
<field name="module_plugin_outlook"/>
|
||||
<newline/>
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
<data>
|
||||
|
||||
<record id="view_sales_config" model="ir.ui.view">
|
||||
<field name="name">Sales Application</field>
|
||||
<field name="name">sale settings</field>
|
||||
<field name="model">sale.config.settings</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="base.view_sale_config_settings"/>
|
||||
|
|
Loading…
Reference in New Issue