From 0e3577dcbfc0a4aad725cf51c7919d7ce3136b08 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 11:23:57 +0530
Subject: [PATCH 01/23] [IMP] crm_claim, crm_helpdesk : After Sales Service
 menu (helpdesk and claims) moved from Project to Sales menu.

bzr revid: mdi@tinyerp.com-20120917055357-q7c144zboqzg74jf
---
 addons/crm_claim/crm_claim_menu.xml       | 2 +-
 addons/crm_helpdesk/crm_helpdesk_menu.xml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index bb881d62a58..3782a3a7c00 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -10,7 +10,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
-            parent="base.menu_main_pm" sequence="2" />
+            parent="base.menu_base_partner" sequence="2" />
 
         <!-- Claims Menu -->
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index b70662e3339..0a9644ff8f9 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -3,11 +3,11 @@
     <data noupdate="1">
 
         <!-- Top menu item -->
-        <menuitem name="Project"
-            id="base.menu_main_pm"
+        <menuitem name="Sales"
+            id="base.menu_base_partner"
             sequence="90"/>
 
-        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" />
 
         <!-- Help Desk (menu) -->
 

From 066b30e5c8ec5a19e331b2f41237f8443bb77c6c Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 14:14:36 +0530
Subject: [PATCH 02/23] [IMP] base_calendar : Improved the  Invitation Wizard
 View.

bzr revid: mdi@tinyerp.com-20120917084436-00kqv09ueod3h709
---
 .../base_calendar_invite_attendee_view.xml    | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
index 5510259a7a7..e3f07fee833 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
@@ -9,27 +9,28 @@
             <field name="model">base_calendar.invite.attendee</field>
             <field name="arch" type="xml">
                 <form string="Invite People" version="7.0">
-                    <separator string="Invite People" colspan="4"/>
-                    <field name="type"/>
-                    <field name="send_mail"/>
-                    <notebook colspan="4">
-                        <page string="Data">
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
-                                <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
-                                <separator string="Users" colspan="4"/>
-                                <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
-                                <newline/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
-                                <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
-                                <newline/>
-                                <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
-                            </group>
-                        </page>
-                    </notebook>
+                    <group>
+                        <group>
+                            <field name="type"/>
+                        </group>
+                        <group>
+                            <field name="send_mail"/>
+                        </group>
+                    </group>
+                    <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
+                        <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
+                    </group>
+                    <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
+                        <separator string="Users" colspan="4"/>
+                        <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
+                        <newline/>
+                    </group>
+                    <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
+                        <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
+                        <newline/>
+                        <separator string="Partner Contacts" colspan="6"/>
+                        <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
+                    </group>
                     <footer>
                         <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
                         or

From 3bdedaeb248e1a8528408cec2c98fa9da63804f7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 15:20:53 +0530
Subject: [PATCH 03/23] [IMP] crm : Calls, Opportunities, Leads should be
 restricted to the group Sales/User see all leads.

bzr revid: mdi@tinyerp.com-20120917095053-1v2b71j9b4cl8hxe
---
 addons/crm/crm_lead_menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 04758f4ffe0..34b1f28169d 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -82,8 +82,8 @@
      </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman"/>
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman"/>
 
 </data>
 </openerp>

From ff4347bebdde5462755a940413c6fcab7e89d246 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 15:41:09 +0530
Subject: [PATCH 04/23] [FIX] crm_helpdesk : Send Reminder doesn't work.

bzr revid: mdi@tinyerp.com-20120917101109-owcdooikeo6ecv23
---
 addons/base_status/base_stage.py    | 2 +-
 addons/crm_helpdesk/crm_helpdesk.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 529e70fdb49..5f9fd57ffe5 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -297,7 +297,7 @@ class base_stage(object):
                 destination=False)
 
     def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        if 'message_post' in self:
+        if hasattr(self, 'message_post'):
             for case in self.browse(cr, uid, ids, context=context):
                 if destination:
                     recipient_id = case.user_id.partner_id.id
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 612537bdb77..9bd56cf3944 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from base_status.base_state import base_state
+from base_status.base_stage import base_stage
 from crm import crm
 from osv import fields, osv
 import tools
@@ -31,7 +32,7 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_helpdesk(base_state, osv.osv):
+class crm_helpdesk(base_state, base_stage, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"

From e21d8c69685ff69527946855b6a68d73eeda1195 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 17 Sep 2012 17:01:14 +0530
Subject: [PATCH 05/23] [IMP] product : Put Pricelists menu under
 Sales/Configuration/Pricelists.

bzr revid: mdi@tinyerp.com-20120917113114-s81w72chvmh63o1e
---
 addons/product/pricelist_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index dc120660c43..01cb4dc54eb 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -219,7 +219,7 @@
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
-            parent="base.menu_base_config" sequence="20" groups="product.group_sale_pricelist"/>
+            parent="product.menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
 
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>

From 34935043bc8c4e6d5ef0d357ec5f67ae1e8d7e84 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 12:48:15 +0530
Subject: [PATCH 06/23] [IMP] crm : when lead has already a customer assigned
 to it and we click on convert to opp, it should not propose to create new
 customer in that wizard, it should give option 'Link to an Existing Customer'
 with the customer assigned to that lead.

bzr revid: mdi@tinyerp.com-20120918071815-n1x7v0wvaarpyc1r
---
 addons/crm/wizard/crm_lead_to_partner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index a9e74f306e5..c354c8eccc8 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -60,7 +60,7 @@ class crm_lead2partner(osv.osv_memory):
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
-        if not this.partner_id and this.partner_name:
+        if this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]

From e88e7b3f2c5f2d9e2ce4f36147764a04b223a0ad Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 14:05:35 +0530
Subject: [PATCH 07/23] [IMP] crm : when selecting a customer, his adress
 appears in the lead view but not the phone & email.

bzr revid: mdi@tinyerp.com-20120918083535-ul2dp0h6rbbj5scv
---
 addons/base_status/base_stage.py | 1 +
 addons/crm/crm_lead.py           | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 5f9fd57ffe5..f6ce6a4d79b 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -92,6 +92,7 @@ class base_stage(object):
         if  part:
             addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
+        print "----------data---------------------",data
         return {'value': data}
 
     def _get_default_section_id(self, cr, uid, context=None):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index fff47205582..550dc04e6d9 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -300,6 +300,10 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'city' : partner.city,
                 'state_id' : partner.state_id and partner.state_id.id or False,
                 'country_id' : partner.country_id and partner.country_id.id or False,
+                'email_from' : partner.email,
+                'phone' : partner.phone,
+                'mobile' : partner.mobile,
+                'fax' : partner.fax,
             }
         return {'value' : values}
 

From 6c6f9671ce3280e59826dbfd13c08aa699d237fb Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 14:13:42 +0530
Subject: [PATCH 08/23] [FIX] crm_profiling : View type 'form' is not supported
 in One2Many.

bzr revid: mdi@tinyerp.com-20120918084342-o6sh8kn8oj755m32
---
 addons/crm_profiling/wizard/open_questionnaire_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 8da8533f494..d51d36425d0 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Open Questionnaire" version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree" width="550" height="200"/>
                     <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or

From 67f1ac5053c4afe72aa7b3ba284cf6ba82575e21 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 16:28:56 +0530
Subject: [PATCH 09/23] [ADD] google_map : Added a functionality to open a
 google map based on partner's address.

bzr revid: mdi@tinyerp.com-20120918105856-gyam9rsxo3jp4okr
---
 addons/google_map/__openerp__.py      |  4 +++-
 addons/google_map/google_map_view.xml | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 addons/google_map/google_map_view.xml

diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index f5577b17994..36a10355990 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -33,7 +33,9 @@ Using this you can directly open Google Map from the URL widget.""",
     'website': 'http://www.openerp.com',
     'images': ['images/google_map.jpeg'],
     'depends': ['base'],
-    'data': [],
+    'data': [
+        'google_map_view.xml'
+    ],
     'demo': [],
     'js': ['static/src/js/google_map.js'],
     'installable': True,
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
new file mode 100644
index 00000000000..46cf9d48807
--- /dev/null
+++ b/addons/google_map/google_map_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_partner_google_map_inherit">
+            <field name="name">res.partner.google.map.inherit</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="arch" type="xml">
+                <field name="website" position="before">
+                    <label for="open_map" string="Open Google Map"/>
+                    <div>
+                        <button name="open_map"
+                        string="Map" type="object"/>
+                    </div>
+                </field>
+            </field>
+        </record>
+
+    </data>
+</openerp>
+

From f9c2b3796bcd3621f5c4e0a6a23f235c259a2ed7 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 16:33:03 +0530
Subject: [PATCH 10/23] [REM] google_map : Removed unneccessary object
 references.

bzr revid: mdi@tinyerp.com-20120918110303-d72pun3jc7hq0ski
---
 addons/google_map/google_map_launch.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
index 8ee9a16fb0a..1298fac7e6f 100644
--- a/addons/google_map/google_map_launch.py
+++ b/addons/google_map/google_map_launch.py
@@ -25,8 +25,7 @@ class launch_map(osv.osv):
     _inherit = "res.partner"
 
     def open_map(self, cr, uid, ids, context=None):
-        address_obj= self.pool.get('res.partner')
-        partner = address_obj.browse(cr, uid, ids, context=context)[0]
+        partner = self.browse(cr, uid, ids, context=context)[0]
         url="http://maps.google.com/maps?oi=map&q="
         if partner.street:
             url+=partner.street.replace(' ','+')

From db39306c85cdf5e209529685390fa674548b30fc Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 16:49:29 +0530
Subject: [PATCH 11/23] [IMP] google_map : Improved the identation.

bzr revid: mdi@tinyerp.com-20120918111929-m90m7fy6gqwi3380
---
 addons/google_map/google_map_launch.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
index 1298fac7e6f..f3ac20ac734 100644
--- a/addons/google_map/google_map_launch.py
+++ b/addons/google_map/google_map_launch.py
@@ -38,9 +38,9 @@ class launch_map(osv.osv):
         if partner.zip:
             url+='+'+partner.zip.replace(' ','+')
         return {
-        'type': 'ir.actions.act_url',
-        'url':url,
-        'target': 'new'
+            'type': 'ir.actions.act_url',
+            'url':url,
+            'target': 'new'
         }
 
 launch_map()

From 7eeeb908396b7c58073c4e723f54f5ea43205d40 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 18 Sep 2012 17:19:12 +0530
Subject: [PATCH 12/23] [IMP] base_status : Removed the print statement.

bzr revid: mdi@tinyerp.com-20120918114912-4o119iwbkojdgl94
---
 addons/base_status/base_stage.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index f6ce6a4d79b..5f9fd57ffe5 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -92,7 +92,6 @@ class base_stage(object):
         if  part:
             addr = self.pool.get('res.partner').address_get(cr, uid, [part], ['contact'])
             data.update(self.onchange_partner_address_id(cr, uid, ids, addr['contact'])['value'])
-        print "----------data---------------------",data
         return {'value': data}
 
     def _get_default_section_id(self, cr, uid, context=None):

From 8ec05330975d0796c525fdc0d845a29ac3e867ec Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 21 Sep 2012 14:27:34 +0530
Subject: [PATCH 13/23] [IMP] base_calendar : Hide the 'remainder' field from
 Meeting and Event Form View.

bzr revid: mdi@tinyerp.com-20120921085734-iijxvz7pg65f2rbc
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 addons/base_calendar/crm_meeting_view.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index d374c2e6d88..285898f299a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -207,7 +207,7 @@
                             on_change="onchange_dates(date,False,date_deadline)"/>
                         <field name="location"/>
                         <field name="alarm_id" string="Reminder"
-                            widget="selection"/>
+                            widget="selection" invisible="1"/>
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>
                         </group>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b963de68130..29cf0d29576 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -116,7 +116,7 @@
                                         attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
                             </group>
                             <group>
-                                <field name="alarm_id" widget="selection" />
+                                <field name="alarm_id" widget="selection" invisible="1"/>
                                 <field name="class"/>
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>

From 779b1aea56f64cc5a7b6f7b5eabd979e54f843bf Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Fri, 21 Sep 2012 14:41:16 +0530
Subject: [PATCH 14/23] [IMP] base_calendar : Unhide the 'remainder' field from
 Event Form View.

bzr revid: mdi@tinyerp.com-20120921091116-3hedoofp7p3w7bvy
---
 addons/base_calendar/base_calendar_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 285898f299a..d374c2e6d88 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -207,7 +207,7 @@
                             on_change="onchange_dates(date,False,date_deadline)"/>
                         <field name="location"/>
                         <field name="alarm_id" string="Reminder"
-                            widget="selection" invisible="1"/>
+                            widget="selection"/>
                         <group colspan="2" col="4" attrs="{'readonly': [('state','=','done')]}">
                            <field name="recurrency"/>
                         </group>

From a9fd3d15c078e25380e9cbc26e3f812f9f2344a8 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Mon, 24 Sep 2012 19:02:37 +0530
Subject: [PATCH 15/23] [IMP] base_calendar:  When an invited person is
 accepted, it should appear in attendee.

bzr revid: mdi@tinyerp.com-20120924133237-yfttw2aeard17rr1
---
 addons/base_calendar/base_calendar.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 85199d09c60..269c30a9bea 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -551,6 +551,8 @@ property or property parameter."),
         @param context: A standard dictionary for contextual values
         @return: True
         """
+        meeting_obj = self.pool.get('crm.meeting')
+
         if context is None:
             context = {}
 
@@ -560,6 +562,18 @@ property or property parameter."),
                 defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id}
                 mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
+            cr.execute('SELECT event_id '\
+                       'FROM meeting_attendee_rel '\
+                       'WHERE attendee_id = %s', (vals.id,))
+            res = cr.fetchone()
+            if res:
+                partner_ids = [partner.id for partner in meeting_obj.browse(cr, uid, res[0], context=context).partner_ids]
+                if vals.user_id:
+                    partner_ids.append(vals.user_id.partner_id.id)
+                    meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
+                if vals.partner_id:
+                    partner_ids.append(vals.partner_id.id)
+                    meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
 
         return True
 

From c4479b8c953d1d42ffb6f386091a2d596f8a79b1 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 10:59:28 +0530
Subject: [PATCH 16/23] [IMP] base_calendar: When an invited person is
 accepted, it should appear in attendee.

bzr revid: mdi@tinyerp.com-20120925052928-0o3renqjqhzr0rno
---
 addons/base_calendar/base_calendar.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 269c30a9bea..58dbe707e7d 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -568,11 +568,13 @@ property or property parameter."),
             res = cr.fetchone()
             if res:
                 partner_ids = [partner.id for partner in meeting_obj.browse(cr, uid, res[0], context=context).partner_ids]
-                if vals.user_id:
-                    partner_ids.append(vals.user_id.partner_id.id)
+                if vals.user_id and vals.user_id.partner_id:
+                    if vals.user_id.partner_id.id not in partner_ids:
+                        partner_ids.append(vals.user_id.partner_id.id)
                     meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
                 if vals.partner_id:
-                    partner_ids.append(vals.partner_id.id)
+                    if vals.partner_id.id not in partner_ids:
+                        partner_ids.append(vals.partner_id.id)
                     meeting_obj.write(cr, uid, res[0], {'partner_ids': [(6, 0, partner_ids)]})
 
         return True

From 624c34cb789f25355a5addf4f7d38bac56f41380 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 15:26:35 +0530
Subject: [PATCH 17/23] [FIX] crm : When I have created new Lead without
 selecting customer, After that convert to opportunity and that time I have
 select Link to an exisiting customer and select customer and create
 Opportunity. In that Opportunity Form view  i can not see email and phone of
 that customer.

bzr revid: mdi@tinyerp.com-20120925095635-93grheoj3oyh0o2i
---
 addons/crm/crm_lead.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 550dc04e6d9..ae862e4c6c0 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -588,6 +588,16 @@ class crm_lead(base_stage, format_address, osv.osv):
         else:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
         stage_id = stage_ids and stage_ids[0] or False
+        email = False
+        phone = False
+        if customer and customer.email:
+            email = customer.email
+        else:
+            email = lead.email_from
+        if customer and customer.phone:
+            phone = customer.phone
+        else:
+            phone = lead.phone
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -598,6 +608,8 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'email_from': email,
+                'phone': phone,
         }
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):

From caa8b00673a82bd41619bf066f066f4addff5108 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 15:59:16 +0530
Subject: [PATCH 18/23] [IMP] crm : Calls, Opportunities, Leads should be
 restricted to the group Sales/User see all leads.

bzr revid: mdi@tinyerp.com-20120925102916-b4szb2i209g66gjo
---
 addons/crm/crm_lead_menu.xml      | 4 ++--
 addons/crm/crm_phonecall_menu.xml | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 34b1f28169d..bc8fdfd86be 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -82,8 +82,8 @@
      </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman"/>
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman"/>
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman_all_leads"/>
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman_all_leads"/>
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index ba8c4768c09..58d01c981ef 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -56,7 +56,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_sale_salesman"
+        groups="base.group_sale_salesman_all_leads"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
@@ -105,6 +105,7 @@
 
     <menuitem name="Logged Calls" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
+        groups="base.group_sale_salesman_all_leads"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">

From 64f63a6358538ed3defc64dd3bdea0f23d2599e4 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 16:10:30 +0530
Subject: [PATCH 19/23] [IMP] crm_helpdesk : Improved the menu order.

bzr revid: mdi@tinyerp.com-20120925104030-lru50ixxxv7bhgrt
---
 addons/crm_helpdesk/crm_helpdesk_menu.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index 0a9644ff8f9..58b522d0dee 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -4,8 +4,7 @@
 
         <!-- Top menu item -->
         <menuitem name="Sales"
-            id="base.menu_base_partner"
-            sequence="90"/>
+            id="base.menu_base_partner"/>
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" />
 

From e7b573230ed170d66b4a6dd88381c61872f23e74 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 17:24:05 +0530
Subject: [PATCH 20/23] [IMP] crm : Revert the unnecessary changes.

bzr revid: mdi@tinyerp.com-20120925115405-12fhakbpgabjsgig
---
 addons/crm/crm_lead_menu.xml      | 4 ++--
 addons/crm/crm_phonecall_menu.xml | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index bc8fdfd86be..04758f4ffe0 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -82,8 +82,8 @@
      </record>
 
     <menuitem name="Sales" id="base.menu_sales" parent="base.menu_base_partner" sequence="1" />
-    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" groups="base.group_sale_salesman_all_leads"/>
-    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" groups="base.group_sale_salesman_all_leads"/>
+    <menuitem name="Leads" id="menu_crm_leads" parent="base.menu_sales" action="crm_case_category_act_leads_all" sequence="2" />
+    <menuitem name="Opportunities" id="menu_crm_opportunities" parent="base.menu_sales" action="crm_case_category_act_oppor11" sequence="3" />
 
 </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index 58d01c981ef..ba8c4768c09 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -56,7 +56,7 @@
     </record>
 
     <menuitem name="Phone Calls" id="menu_crm_case_phone"
-        groups="base.group_sale_salesman_all_leads"
+        groups="base.group_sale_salesman"
         parent="base.menu_base_partner" sequence="4" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
@@ -105,7 +105,6 @@
 
     <menuitem name="Logged Calls" id="menu_crm_case_phone_inbound"
         parent="crm.menu_crm_case_phone"
-        groups="base.group_sale_salesman_all_leads"
         action="crm_case_categ_phone_incoming0" />
 
     <record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">

From 96c82ce02127d7d56aac151081c613fc6bbf4e40 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Tue, 25 Sep 2012 17:51:16 +0530
Subject: [PATCH 21/23] [ADD] crm : Added record rule on the phone calls to
 show only its own phone calls'.

bzr revid: mdi@tinyerp.com-20120925122116-mnrtftl4ygawfxr8
---
 addons/crm/security/crm_security.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 3b382a072f4..b6199f8696f 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -60,5 +60,12 @@
         <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
     </record>
 
+    <record id="crm_rule_personal_phonecall" model="ir.rule">
+        <field name="name">Personal Phone Calls</field>
+        <field ref="model_crm_phonecall" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+
     </data>
 </openerp>

From c4e443e0d66c72aa34ded4831ce2f45a7095c380 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 10:29:04 +0530
Subject: [PATCH 22/23] [FIX] crm : When I have created new Lead without
 selecting customer, After that convert to opportunity and that time I have
 select Link to an exisiting customer and select customer and create
 Opportunity. In that Opportunity Form view  i can not see email and phone of
 that customer.

bzr revid: mdi@tinyerp.com-20120926045904-0lool27m8jkw2s5p
---
 addons/crm/crm_lead.py | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index ae862e4c6c0..5532f3ed75d 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -588,16 +588,6 @@ class crm_lead(base_stage, format_address, osv.osv):
         else:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
         stage_id = stage_ids and stage_ids[0] or False
-        email = False
-        phone = False
-        if customer and customer.email:
-            email = customer.email
-        else:
-            email = lead.email_from
-        if customer and customer.phone:
-            phone = customer.phone
-        else:
-            phone = lead.phone
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -608,8 +598,8 @@ class crm_lead(base_stage, format_address, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
-                'email_from': email,
-                'phone': phone,
+                'email_from': customer.email if customer else lead.email_from,
+                'phone': customer.phone if customer else lead.phone,
         }
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):

From acf3ddf8098eab30465ac41243d42cc47e055e56 Mon Sep 17 00:00:00 2001
From: "Divyesh Makwana (Open ERP)" <mdi@tinyerp.com>
Date: Wed, 26 Sep 2012 10:49:33 +0530
Subject: [PATCH 23/23] [IMP] crm : when lead has already a customer assigned
 to it and we click on convert to opp, it should not propose to create new
 customer in that wizard, it should give option 'Link to an Existing Customer'
 with the customer assigned to that lead.

bzr revid: mdi@tinyerp.com-20120926051933-59ln6fw4q0uz6mvp
---
 addons/crm/wizard/crm_lead_to_partner.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index c354c8eccc8..3ab3334e7d9 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -60,10 +60,12 @@ class crm_lead2partner(osv.osv_memory):
             partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
-        if this.partner_id and this.partner_name:
+        if not this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
             if partner_ids:
                 partner_id = partner_ids[0]
+        if this.partner_id:
+            partner_id = this.partner_id.id
         return partner_id
 
     def default_get(self, cr, uid, fields, context=None):