diff options
| author | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-12-07 15:57:58 +0530 |
|---|---|---|
| committer | Bhumi Thakkar (Open ERP) <bth@tinyerp.com> | 2012-12-07 15:57:58 +0530 |
| commit | 0ed3f4e91b7fbbc2df7c3f0f45eb5b9529c2c23d (patch) | |
| tree | f30be0fde41f7fe2f70aafe41d6e240a8a8fcef0 /addons | |
| parent | 20d606c5c63a5f829c4f866cb7e49329a5c7ad3d (diff) | |
| parent | 7a81c5e8ca933e631dd70454f33715b3226c8f0d (diff) | |
[IMP] If marketing module installed then displayed channel_id and type_id field in leand & opportunity, Misc section is created for reffered.
bzr revid: bth@tinyerp.com-20121207102758-x2f425l2dza3xfji
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/crm/crm_lead_view.xml | 15 | ||||
| -rw-r--r-- | addons/marketing/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/marketing/marketing_view.xml | 28 |
3 files changed, 33 insertions, 12 deletions
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index c552b1835f2..98e11dee646 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -206,18 +206,18 @@ </page> <page string="Extra Info"> <group> - <group string="Categorization"> + <group string="Categorization" groups="base.group_multi_company"> <field name="company_id" - groups="base.group_multi_company" widget="selection" colspan="2"/> - <field name="type_id"/> - <field name="channel_id" widget="selection"/> - <field name="referred"/> <field name="state" groups="base.group_no_one"/> </group> <group string="Mailings"> <field name="opt_out"/> </group> + <group string="Misc"> + <field name="active"/> + <field name="referred"/> + </group> </group> </page> </notebook> @@ -496,11 +496,6 @@ <field name="mobile"/> <field name="fax"/> </group> - - <group string="Categorization"> - <field name="type_id" /> - <field name="channel_id" widget="selection"/> - </group> <group string="Mailings"> <field name="opt_out"/> </group> diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py index 0c77fe59a86..e46c58b9959 100644 --- a/addons/marketing/__openerp__.py +++ b/addons/marketing/__openerp__.py @@ -23,7 +23,7 @@ { 'name': 'Marketing', 'version': '1.1', - 'depends': ['base', 'base_setup'], + 'depends': ['base', 'base_setup', 'crm'], 'author': 'OpenERP SA', 'category': 'Hidden/Dependency', 'description': """ diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml index 965818cf65e..f6753e733cd 100644 --- a/addons/marketing/marketing_view.xml +++ b/addons/marketing/marketing_view.xml @@ -7,6 +7,32 @@ id="base.marketing_menu" groups="marketing.group_marketing_user,marketing.group_marketing_manager" sequence="85"/> - + <record id="view_crm_lead_form" model="ir.ui.view"> + <field name="name">crm.lead.inherit.form</field> + <field name="model">crm.lead</field> + <field name="inherit_id" ref="crm.crm_case_form_view_leads"/> + <field name="arch" type="xml"> + <xpath expr="//group[@string='Categorization']" position="attributes"> + <attribute name="string">Marketing</attribute> + </xpath> + <xpath expr="//field[@name='company_id']" position="after"> + <field name="type_id"/> + <field name="channel_id" widget="selection"/> + </xpath> + </field> + </record> + <record id="view_crm_opportunity_form" model="ir.ui.view"> + <field name="name">crm.lead.inherit.form</field> + <field name="model">crm.lead</field> + <field name="inherit_id" ref="crm.crm_case_form_view_oppor"/> + <field name="arch" type="xml"> + <xpath expr="//group[@string='Mailings']" position="before"> + <group string="Marketing"> + <field name="type_id" /> + <field name="channel_id" widget="selection"/> + </group> + </xpath> + </field> + </record> </data> </openerp> |