From 7bb38ca8a5a56c633083bacfc8820f6e57f66187 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 28 Aug 2012 17:02:41 +0530
Subject: [PATCH 1/3] [IMP] made some improvements

bzr revid: bde@tinyerp.com-20120828113241-ttauphl06kvt62n4
---
 addons/base_calendar/crm_meeting_view.xml    |  6 +-
 addons/crm/crm.py                            |  3 +-
 addons/crm/crm_lead.py                       |  2 +-
 addons/crm/crm_phonecall_view.xml            | 83 ++++++++++----------
 addons/crm/res_partner_view.xml              |  4 +-
 addons/purchase/board_purchase_view.xml      |  1 +
 addons/purchase/security/ir.model.access.csv |  1 +
 addons/sale/security/ir.model.access.csv     |  1 +
 8 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 6009251a460..84385f9d2b7 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -111,8 +111,10 @@
                                     <field name="date_deadline" 
                                         string="End Date" attrs="{'invisible': [('allday','=',True)]}"
                                         on_change="onchange_dates(date,False,date_deadline)"/>
-                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
-                                    <label for="allday" string="All Day?"/>)
+                                    <div class="oe_edit_only">
+                                        (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                                        <label for="allday" string="All Day?"/>)
+                                    </div>
                                 </div>
                                     <field name="recurrency"
                                         attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index b45b8ea8712..e79aeb26d75 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -90,9 +90,10 @@ class crm_case_stage(osv.osv):
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'state': 'draft',
+        'state': 'open',
         'fold': False,
         'type': 'both',
+        'case_default': True,
     }
 
 class crm_case_section(osv.osv):
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 25a47ecbadc..1ab60408864 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -267,7 +267,7 @@ class crm_lead(base_stage, osv.osv):
     _defaults = {
         'active': 1,
         'type': 'lead',
-        'user_id': lambda s, cr, uid, c: s._get_default_user(cr, uid, c),
+        'user_id': lambda self, cr, uid, context: uid,
         'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3b5162288a4..287b8da8ad2 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -106,56 +106,55 @@
         <field name="arch" type="xml">
             <form string="Phone Call" version="7.0">
             <header>
-                <button name="case_close" string="Held" type="object" class="oe_highlight"
+                <button name="case_close" string="Call Done" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
-                <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}"/>
-                <button string="Convert to Opportunity" class="oe_highlight"
-                        name="%(phonecall2opportunity_act)d"
-                        type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
-                <button string="Schedule Other Call"
-                        name="%(phonecall_to_phonecall_act)d"
-                        type="action"/>
-                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
             </header>
-            <sheet string="Phone Call">
-                  <div class="oe_title">
-                      <div class="oe_edit_only">
-                          <label for="name" string="Title"/>
-                      </div>
-                      <h1><field name="name" required="1"/></h1>
-                      <div class="oe_edit_only">
-                        <label for="partner_phone" string="Phone"/>
-                      </div>
-                      <h2><field name="partner_phone"/></h2>
-                  </div>
-                 <group col="4">
-                    <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="duration" widget="float_time"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile"/>
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
-                </group>
+                <sheet string="Phone Call">
+                    <div class="oe_right"> 
+                        <button string="Convert to Opportunity"
+                            name="%(phonecall2opportunity_act)d"
+                            type="action"
+                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"/>
+                        <button string="Schedule Other Call"
+                                name="%(phonecall_to_phonecall_act)d"
+                                type="action"/>
+                        <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+                    </div>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name" string="Title"/>
+                        </div>
+                        <h1><field name="name" required="1"/></h1>
+                        <div class="oe_edit_only">
+                            <label for="partner_phone" string="Phone"/>
+                        </div>
+                        <h2><field name="partner_phone"/></h2>
+                    </div>
+  
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="duration" widget="float_time"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="partner_mobile"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
 
-                <field name="description" placeholder="Description..."/>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_ids" widget="mail_thread"/>
-                <field name="message_follower_ids" widget="mail_followers"/>
-            </div>
+                    <field name="description" placeholder="Description..."/>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index a3c60d4421c..f98e7a70db5 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -130,10 +130,10 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
-                        string="Schedule a Meeting"
+                        string="Meetings"
                         name="%(base_calendar.action_crm_meeting)d"
                         context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
-                    <button type="action" string="Schedule a Call" 
+                    <button type="action" string="Call" 
                         name="%(crm.crm_case_categ_phone_create_partner)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 67c3981f383..6e95c8ca0bc 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -85,6 +85,7 @@
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"
+                  groups="group_purchase_user"
                   sequence="20"/>
 
     </data>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index 3c8d072c536..014d8615f4a 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -65,3 +65,4 @@ access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_sto
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
+access_purchase_order_partner_manager,purchase.order,model_purchase_order,base.group_partner_manager,1,0,0,0
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 617678eccbe..46c021eccab 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -60,3 +60,4 @@ access_product_pricelist_version_sale_manager,product.pricelist.version sale_man
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
 access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
 access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
+access_sale_order_partner_manager,sale.order,model_sale_order,base.group_partner_manager,1,0,0,0

From d4b44bd628e0793cf1a575f9fb2c6d22ba63e8c7 Mon Sep 17 00:00:00 2001
From: "pso (OpenERP)" <pso@tinyerp.com>
Date: Wed, 29 Aug 2012 17:10:47 +0530
Subject: [PATCH 2/3] [IMP] Improvements

bzr revid: pso@tinyerp.com-20120829114047-ltiwub2nvqjhqd18
---
 addons/import_sugarcrm/import_sugarcrm.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
index 440a7b2b6f6..4afe7b23f90 100644
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ b/addons/import_sugarcrm/import_sugarcrm.py
@@ -444,11 +444,9 @@ class sugar_import(import_framework):
     import Tasks
     """
     task_state = {
-            'Completed' : 'done',
+            'Completed' : 'open',
             'Not Started':'draft',
-            'In Progress': 'open',
             'Pending Input': 'draft',
-            'deferred': 'cancel'
         }
 
     def import_task(self, val):

From c85f2c4a54acd424370a36a821d21de36072a921 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 11 Sep 2012 17:34:14 +0530
Subject: [PATCH 3/3] [ADD] added address fields in def
 onchange_partner_address_id

bzr revid: bde@tinyerp.com-20120911120414-b6p6zzumwb84ugt3
---
 addons/base_status/base_stage.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 529e70fdb49..f9a9489ac00 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -77,8 +77,16 @@ class base_stage(object):
         data = {'value': {'email_from': False, 'phone':False}}
         if add:
             address = self.pool.get('res.partner').browse(cr, uid, add)
-            data['value'] = {'email_from': address and address.email or False ,
-                             'phone':  address and address.phone or False}
+            data['value'] = {'partner_name': address and address.name or False,
+                             'email_from': address and address.email or False,
+                             'phone':  address and address.phone or False,
+                             'street': address and address.street or False,
+                             'street2': address and address.street2 or False,
+                             'city': address and address.city or False,
+                             'state_id': address.state_id and address.state_id.id or False,
+                             'zip': address and address.zip or False,
+                             'country_id': address.country_id and address.country_id.id or False,
+                             }
         if 'phone' not in self._columns:
             del data['value']['phone']
         return data