Merge lp:~jeffery9/ocb-addons/ocb-addons-fixups into lp:ocb-addons

[jeffery chen fan]

fixed some bugs in crm application

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Jeffery, is there any bug report associated to this fix? If not, OCB contribution rules say that you have to publish a bug on official project and link it also with OCB to allow OpenERP to merge the fix on the main branch. Here are the details:

https://lists.launchpad.net/openerp-community/msg02197.html

Regards.

review: Needs Information

[jeffery chen fan (jeffery9)]

Hi, Pedro,

have linked the bugs, please review it. thanks, i'm newbie with launchpad.

On Fri, Nov 8, 2013 at 4:55 PM, Pedro Manuel Baeza
<email address hidden> wrote:
> Review: Needs Information
>
> Hi, Jeffery, is there any bug report associated to this fix? If not, OCB contribution rules say that you have to publish a bug on official project and link it also with OCB to allow OpenERP to merge the fix on the main branch. Here are the details:
>
> https://lists.launchpad.net/openerp-community/msg02197.html
>
> Regards.
> --
> https://code.launchpad.net/~jeffery9/ocb-addons/ocb-addons-fixups/+merge/194463
> You are the owner of lp:~jeffery9/ocb-addons/ocb-addons-fixups.

--
Jeffery
 ___
/\__\ "What is the world coming to?"
\/__/

[Pedro Manuel Baeza (pedro.baeza)]

Thank you very much, Jeffery. I don't bother you, but to make easier the review process, we need to have one MP per bug, so that it is easily verifiable the changes that fix the bug. Can you please make this?

Thank you again.

[Pedro Manuel Baeza (pedro.baeza)]

I'm seeing that OpenERP has planned to include the fixes on stable v7, so it's very important that you make the changes exactly the same (spaces, indentation and so on), in order to not get conflicts when the fix will be merged on main branch.

This can be with the "bzr diff" command to extract changes from the fix branch, and apply it with "patch" command.

Thank you for your understanding.

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

There are 2 MP

Which one is the good one ?

https://code.launchpad.net/~jeffery9/ocb-addons/ocb-addons/+merge/193883
https://code.launchpad.net/~jeffery9/ocb-addons/ocb-addons-fixups/+merge/194463

review: Needs Information

[Stefan Rijnhart (Opener) (stefan-opener)]

I agree with Pedro, please create separate proposals per bug. Thanks for helping out!

review: Disapprove

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Disapprove

[Holger Brunn (Therp) (hbrunn)]

Two disapprovals and no replies by the author in months, so I set this one to 'disapproved'.

Unmerged revisions

9648. By jeffery chen fan on 2013-11-08

merge with another fixups tree

9647. By jeffery chen fan on 2013-11-08

fix logical bugs in crm_lead2opportunity_partner and _lead_create_contact
that should not create dupcated partner

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2013-08-27 16:20:36 +0000
+++ crm/crm_lead.py	2013-11-08 08:51:23 +0000
@@ -738,7 +738,11 @@
             'is_company': is_company,
             'type': 'contact'
         }
-        partner = partner.create(cr, uid, vals, context=context)
+        partner_ids = partner.search(cr, uid, [('name', '=', name),('is_company','=',True)], context=context)
+        if partner_ids:
+            partner = partner_ids[0]
+        else:
+            partner = partner.create(cr, uid, vals, context=context)
         return partner
 
     def _create_lead_partner(self, cr, uid, lead, context=None):
 
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2012-10-23 16:05:04 +0000
+++ crm/crm_phonecall_view.xml	2013-11-08 08:51:23 +0000
@@ -133,12 +133,12 @@
                 <field name="partner_id"
                     on_change="onchange_partner_id(partner_id)"/>
                 <field name="partner_phone"
-                    invisible="1"/>
+                    />
                 <field name="user_id"/>
                 <field name="categ_id" widget="selection"
                     domain="[('object_id.model', '=', 'crm.phonecall')]"
-                    invisible="1"/>
-                <field name="state" invisible="1"/>
+                    />
+                <field name="state"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1" on_change="on_change_opportunity(opportunity_id)"/>
                 <button string="Schedule Other Call"
 
=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py	2013-09-30 14:12:02 +0000
+++ crm/wizard/crm_lead_to_opportunity.py	2013-11-08 08:51:23 +0000
@@ -37,6 +37,9 @@
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities'),
     }
 
+    def onchange_action(self, cr, uid, ids, action, context=None):
+        return {'value': {'partner_id': False if action != 'exist' else self._find_matching_partner(cr, uid, context=context)}}
+
     def default_get(self, cr, uid, fields, context=None):
         """
         Default get for name, opportunity_ids.
 
=== modified file 'crm/wizard/crm_lead_to_opportunity_view.xml'
--- crm/wizard/crm_lead_to_opportunity_view.xml	2012-10-23 16:05:04 +0000
+++ crm/wizard/crm_lead_to_opportunity_view.xml	2013-11-08 08:51:23 +0000
@@ -27,7 +27,7 @@
                         </field>
                     </group>
                     <group name="action" attrs="{'invisible': [('name', '!=', 'convert')]}">
-                        <field name="action" class="oe_inline"/>
+                        <field name="action" on_change="onchange_action(action, context)" class="oe_inline"/>
                         <field name="partner_id"
                             attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
                             class="oe_inline"/>
 
=== modified file 'crm/wizard/crm_partner_binding.py'
--- crm/wizard/crm_partner_binding.py	2012-10-23 16:05:04 +0000
+++ crm/wizard/crm_partner_binding.py	2013-11-08 08:51:23 +0000
@@ -73,6 +73,13 @@
                 if partner_ids:
                     partner_id = partner_ids[0]
             # Search through the existing partners based on the lead's partner or contact name
+            elif active_model.partner_name and active_model.contact_name:
+                company_ids = partner_obj.search(cr, uid, [('name', 'ilike', '%'+active_model.partner_name+'%')], context=context)
+                if company_ids:
+                    company_id = company_ids[0]
+                    partner_ids = partner_obj.search(cr, uid, [('name', 'ilike', '%'+active_model.contact_name+'%'),('parent_id', '=', company_id)], context=context) 
+                    if partner_ids:
+                        partner_id = partner_ids[0]
             elif active_model.partner_name:
                 partner_ids = partner_obj.search(cr, uid, [('name', 'ilike', '%'+active_model.partner_name+'%')], context=context)
                 if partner_ids:
 
=== modified file 'crm/wizard/crm_phonecall_to_phonecall_view.xml'
--- crm/wizard/crm_phonecall_to_phonecall_view.xml	2012-10-23 16:05:04 +0000
+++ crm/wizard/crm_phonecall_to_phonecall_view.xml	2013-11-08 08:51:23 +0000
@@ -36,6 +36,7 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="phonecall_to_phonecall_view"/>
             <field name="target">new</field>
+            <field name="context">{'default_state': 'open'}</field>
         </record>
 
     </data>