[FIX]crm_sale_stock

bzr revid: pat@tinyerp.com-20120627072342-du6rrus64c0t0cq3

diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml
index 5f94e3d..c6f5a6a 100644 (file)
--- a/addons/crm/crm_meeting_menu.xml
+++ b/addons/crm/crm_meeting_menu.xml
@@ -7,7 +7,6 @@
         res_model="crm.meeting"
         view_mode="calendar,tree,form,gantt"
         context="{'search_default_partner_id': active_id, 'default_duration': 4.0}"
-        domain="[('partner_id', '=', active_id)]"
     />
 
     <record model="ir.actions.act_window" id="crm_case_categ_meet_create_partner">

diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index 85e9864..646bd11 100644 (file)
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -101,7 +101,7 @@
                             attrs="{'readonly': [('state', '=', 'done')]}"
                             context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" colspan="4"
-                            nolabel="1" widget="one2many" mode="tree,form">
+                            nolabel="1" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
                                 <field name="sent_by_uid" string="From"/>
                                 <field name="user_id" string="To"/>

diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 4b2cf00..fa605a9 100644 (file)
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -100,8 +100,8 @@
                     <button type="action" string="Schedule a Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}" />
-                    <button type="action" string="Create an Opportunity"
-                        name="%(crm.action_view_crm_partner2opportunity)d" />
+                    <button type="action" string="Opportunity"
+                        name="%(crm.action_tree_view_crm_partner2opportunity)d" />
                 </xpath>
             </field>
         </record>

diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index c7641d8..2101c9a 100644 (file)
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -33,6 +33,36 @@
             <field name="target">new</field>
      </record>
 
+
+        <!-- partner To Opportunity tree -->
+
+          <record id="tree_view_crm_partner2opportunity" model="ir.ui.view">
+          <field name="name">crm.crm.partner2opportunity.tree</field>
+          <field name="model">crm.partner2opportunity</field>
+          <field name="type">tree</field>
+          <field name="arch" type="xml">
+              <tree string="Create Opportunity" version="7.0">
+                    <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                    <button name="make_opportunity" string="Create Opportunity" type="object" icon="gtk-ok"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="planned_revenue"/>
+                    <field name="probability"/>
+              </tree>
+          </field>
+       </record>
+
+<!-- partner To Opportunity Action  tree view-->
+
+      <record model="ir.actions.act_window" id="action_tree_view_crm_partner2opportunity">
+            <field name="name">Create Opportunity</field>
+            <field name="res_model">crm.lead</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="target">new</field>
+     </record>
+
+
         <!-- partner To Opportunity wizard -->
 
      <act_window id="crm_partner2opportunity"

diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d2a7c2d..276b5ff 100644 (file)
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1219,7 +1219,7 @@
                     <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
                 <sheet>
                     <group>
@@ -1410,7 +1410,7 @@
                     <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
                     <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
                     <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                 </header>
                 <sheet>
                 <group>