Merge lp:~openerp-dev/openobject-addons/trunk-bug-1163392-amitvora into lp:openobject-addons

[Amit Vora(OpenERP)]

Hello,
     I have fixed the issue search view vs form view, fields missing.

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-bug-1163392-amitvora]

8665. By Mehul Mehta(OpenERP) on 2013-09-06

[Merge] merge with main addons

Unmerged revisions

8665. By Mehul Mehta(OpenERP) on 2013-09-06

[Merge] merge with main addons

8664. By Amit Vora(OpenERP) on 2013-04-05

[FIX] add type_id and channel_id fields in form view

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2013-12-18 15:57:15 +0000
+++ crm/crm_lead_view.xml	2014-01-15 16:15:57 +0000
@@ -85,7 +85,7 @@
                 view_mode="tree,form,calendar"
                 context="{'default_duration': 4.0, 'default_opportunity_id': active_id}"
                 view_type="form"/>
-
+"addons/trunk/crm/crm_lead_view.xml"
 
         <!-- CRM Lead Form View  -->
         <record model="ir.ui.view" id="crm_case_form_view_leads">
@@ -98,8 +98,12 @@
                             attrs="{'invisible': [('probability', '=', 100)]}"
                             help="Convert to Opportunity" class="oe_highlight"/>
                     <field name="stage_id" widget="statusbar" clickable="True"
+<<<<<<< TREE
                             domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
                             options="{'fold_field': 'fold'}"
+=======
+                        domain="['&amp;', '|', ('case_default', '=', True), ('section_ids', '=', section_id), '|', ('type', '=', type), ('type', '=', 'both')]"
+>>>>>>> MERGE-SOURCE
                             on_change="onchange_stage_id(stage_id)"/>
                 </header>
                 <sheet>
@@ -111,6 +115,7 @@
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name" placeholder="Describe the lead..."/></h1>
+                        <field name="probability" invisible="1"/>
                     </div>
                     <group>
                         <group>
@@ -170,6 +175,7 @@
                         <field name="description"/>
                     </page>
                     <page string="Extra Info">
+<<<<<<< TREE
                         <group>
                             <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
                                 <field name="company_id"
@@ -182,6 +188,20 @@
                             </group>
                             <group string="Misc">
                                 <field name="probability" groups="base.group_no_one"/>
+=======
+                        <group>
+                            <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
+                                <field name="company_id"
+                                    groups="base.group_multi_company"
+                                    widget="selection" colspan="2"/>
+                                <field name="type_id" select="1" widget="selection"/>
+                                <field name="channel_id" select="1" widget="selection"/>
+                            </group>
+                            <group string="Mailings">
+                                <field name="opt_out"/>
+                            </group>
+                            <group string="Misc">
+>>>>>>> MERGE-SOURCE
                                 <field name="active"/>
                                 <field name="referred"/>
                             </group>
@@ -449,7 +469,7 @@
                         </page>
                         <page string="Lead">
                             <group>
-                                <group>
+                                <group name='category'>
                                     <field name="partner_name"/>
                                     <label for="street" string="Address"/>
                                     <div>
@@ -462,6 +482,8 @@
                                         </div>
                                         <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                                     </div>
+                                    <field name="type_id" widget="selection"/>
+                                    <field name="channel_id" widget="selection"/>
                                 </group>
 
                                 <group>
 
=== modified file 'marketing/marketing_view.xml'
--- marketing/marketing_view.xml	2013-10-27 12:31:04 +0000
+++ marketing/marketing_view.xml	2014-01-15 16:15:57 +0000
@@ -17,25 +17,19 @@
                     <attribute name="string">Marketing</attribute>
                     <attribute name="groups"></attribute>
                 </xpath>
-                <xpath expr="//field[@name='company_id']" position="after">
-                    <field name="type_id"/>
-                    <field name="channel_id" widget="selection"/>
-                </xpath>
             </field>
-        </record>
+         </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[@name='mailings']" position="before">
-                    <group string="Marketing">
-                        <field name="type_id" />
-                        <field name="channel_id" widget="selection"/>
-                    </group>
+                <xpath expr="//field[@name='type_id']" position="before">
+                    <group string='Marketing'/>
+                    <div></div>
                 </xpath>
-            </field>
+           </field>
         </record>
     </data>
 </openerp>