[MERGE] Merge with lp:openobject-addons

bzr revid: sbh@tinyerp.com-20101203084745-zl9kfm7ghyvf9gtk

diff --cc addons/crm/wizard/crm_partner_to_opportunity_view.xml
index e9eac0b,4dbf54e..7ceb9bc
--- 1/addons/crm/wizard/crm_partner_to_opportunity_view.xml
--- 2/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@@ -33,14 -33,13 +33,15 @@@
              <field name="target">new</field>
          </record>
  
 -        <!-- partner To Opportunity wizard -->
 +          <!-- partner To Opportunity wizard -->
  
 -       <act_window id="crm_partner2opportunity"
 -            key2="client_action_multi" name="Create Opportunity"
 -            res_model="crm.partner2opportunity" src_model="res.partner"
 -            view_mode="form" target="new" view_type="form"
 -            groups="base.group_extended"/>
 +         <act_window id="crm_partner2opportunity"
 +              key2="client_action_multi" name="Create Opportunity"
 +              res_model="crm.partner2opportunity" src_model="res.partner"
 +              view_id="view_crm_partner2opportunity"
 +              view_mode="form" target="new" view_type="form"
 +              groups="base.group_extended"/>
 +
 +      </data>
+ 
 -     </data>
  </openerp>