Merge lp:~openerp-dev/openobject-addons/trunk-imp-crm-salesteam-another-amb into lp:openobject-addons

[Thibault Delavallée (OpenERP)]

[lp:~openerp-dev/openobject-addons/trunk-imp-crm-salesteam-another-amb]

9087. By Niko (OpenERP) on 2014-02-28

[IMP] Add some video to manisfest ( website, website_blog, website_event, website_ecommerce)

9137. By Amit Vora(OpenERP) on 2014-03-07

[MERGE] merge with main branch

9138. By Amit Vora(OpenERP) on 2014-03-12

[MERGE] merge with main branch

9139. By Amit Vora(OpenERP) on 2014-03-14

[IMP] improve code

9140. By Amit Vora(OpenERP) on 2014-03-18

[MERGE] merge with main branch

9141. By Amit Vora(OpenERP) on 2014-03-18

[IMP] improve code

9142. By Amit Vora(OpenERP) on 2014-03-18

[IMP] give default value to section_id

9143. By Amit Vora(OpenERP) on 2014-03-19

[IMP] improve code

Unmerged revisions

9143. By Amit Vora(OpenERP) on 2014-03-19

[IMP] improve code

9142. By Amit Vora(OpenERP) on 2014-03-18

[IMP] give default value to section_id

9141. By Amit Vora(OpenERP) on 2014-03-18

[IMP] improve code

9140. By Amit Vora(OpenERP) on 2014-03-18

[MERGE] merge with main branch

9139. By Amit Vora(OpenERP) on 2014-03-14

[IMP] improve code

9138. By Amit Vora(OpenERP) on 2014-03-12

[MERGE] merge with main branch

9137. By Amit Vora(OpenERP) on 2014-03-07

[MERGE] merge with main branch

9136. By Amit Bhavsar (Open ERP) on 2014-02-12

[merge] lp:~openerp-dev/openobject-addons/trunk-imp-crm-salesteam-amb

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-03-18 13:27:41 +0000
+++ crm/crm_lead.py	2014-03-19 09:31:19 +0000
@@ -63,6 +63,19 @@
     'partner_name']
 
 
+class res_users(osv.Model):
+    _inherit = 'res.users'
+    _columns = {
+        'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
+    }
+
+    def __init__(self, pool, cr):
+        init_res = super(res_users, self).__init__(pool, cr)
+        # duplicate list to avoid modifying the original reference
+        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
+        self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
+        return init_res
+
 class crm_lead(format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
@@ -103,13 +116,19 @@
         """
         if context is None:
             context = {}
-        if type(context.get('default_section_id')) in (int, long):
-            return context.get('default_section_id')
-        if isinstance(context.get('default_section_id'), basestring):
-            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=context['default_section_id'], context=context)
-            if len(section_ids) == 1:
-                return int(section_ids[0][0])
-        return None
+        section_id = context.get('default_section_id', False)
+        if section_id and isinstance(section_id, basestring):
+            section_ids = self.pool.get('crm.case.section').name_search(cr, uid, name=section_id, context=context)
+            if section_ids and len(section_ids):
+                section_id = int(section_ids[0][0])
+            else:
+                section_id = False
+        if not section_id:
+           user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+           section_id = user.default_section_id and user.default_section_id.id or False
+        if not section_id:
+           model, section_id = self.pool['ir.model.data'].get_object_reference(cr, uid, 'crm', 'section_sales_department')
+        return section_id
 
     def _resolve_type_from_context(self, cr, uid, context=None):
         """ Returns the type (lead or opportunity) from the type context
@@ -945,7 +964,7 @@
         lead = self.browse(cr, uid, id, context=context)
         local_context = dict(context)
         local_context.setdefault('default_type', lead.type)
-        local_context.setdefault('default_section_id', lead.section_id)
+        local_context.setdefault('default_section_id', lead.section_id and lead.section_id.id)
         if lead.type == 'opportunity':
             default['date_open'] = fields.datetime.now()
         else:

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2014-03-18 13:27:41 +0000
+++ crm/crm_lead_view.xml	2014-03-19 09:31:19 +0000
@@ -631,5 +631,33 @@
             <field eval="'ir.actions.server,%d'%action_mark_as_lost" name="value"/>
         </record>
 
+        <!-- Update user form !-->
+        <record model="ir.ui.view" id="res_user_form">
+            <field name="name">Users Preferences</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <data>
+                    <xpath expr="//field[@name='tz']" position="after">
+                        <field name="default_section_id"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
+        <!-- Update Preferences form !-->
+        <record id="view_users_form_preferences" model="ir.ui.view">
+            <field name="name">res.users.preferences.form</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+            <field name="arch" type="xml">
+            <data>
+                    <xpath expr="//field[@name='company_id']" position="before">
+                        <field name="default_section_id" readonly="0"/>
+                    </xpath>
+                </data>
+            </field>
+        </record>
+
     </data>
 </openerp>

=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py	2014-02-10 06:46:42 +0000
+++ crm/crm_phonecall.py	2014-03-19 09:31:19 +0000
@@ -77,7 +77,8 @@
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
         'state':  _get_default_state,
         'user_id': lambda self, cr, uid, ctx: uid,
-        'active': 1
+        'active': 1,
+        'section_id': lambda self, cr, uid, c=None: self.pool.get('crm.lead')._get_default_section_id(cr, uid, c),
     }
 
     def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):

=== modified file 'crm/res_partner.py'
--- crm/res_partner.py	2014-01-15 09:38:05 +0000
+++ crm/res_partner.py	2014-03-19 09:31:19 +0000
@@ -49,7 +49,7 @@
         'opportunity_count': fields.function(_opportunity_meeting_count, string="Opportunity", type='integer', multi='opp_meet'),
         'meeting_count': fields.function(_opportunity_meeting_count, string="# Meetings", type='integer', multi='opp_meet'),
     }
-
+    
     def copy(self, cr, uid, record_id, default=None, context=None):
         if default is None:
             default = {}

=== modified file 'crm_helpdesk/crm_helpdesk.py'
--- crm_helpdesk/crm_helpdesk.py	2013-11-27 15:32:57 +0000
+++ crm_helpdesk/crm_helpdesk.py	2014-03-19 09:31:19 +0000
@@ -80,6 +80,7 @@
     _defaults = {
         'active': lambda *a: 1,
         'user_id': lambda s, cr, uid, c: uid,
+        'section_id': lambda self, cr, uid, c=None: self.pool.get('crm.lead')._get_default_section_id(cr, uid, c),
         'state': lambda *a: 'draft',
         'date': fields.datetime.now,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),

=== modified file 'sale_crm/sale_crm.py'
--- sale_crm/sale_crm.py	2013-12-18 15:57:15 +0000
+++ sale_crm/sale_crm.py	2014-03-19 09:31:19 +0000
@@ -26,19 +26,6 @@
 from openerp import tools
 from openerp.osv import osv, fields
 
-class res_users(osv.Model):
-    _inherit = 'res.users'
-    _columns = {
-        'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
-    }
-
-    def __init__(self, pool, cr):
-        init_res = super(res_users, self).__init__(pool, cr)
-        # duplicate list to avoid modifying the original reference
-        self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
-        self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
-        return init_res
-
 class sale_order(osv.osv):
     _inherit = 'sale.order'
     _columns = {
@@ -115,28 +102,13 @@
     def action_forecast(self, cr, uid, id, value, context=None):
         return self.write(cr, uid, [id], {'invoiced_forecast': round(float(value))}, context=context)
 
-class sale_crm_lead(osv.Model):
-    _inherit = 'crm.lead'
-
-    def on_change_user(self, cr, uid, ids, user_id, context=None):
-        """ Override of on change user_id on lead/opportunity; when having sale
-            the new logic is :
-            - use user.default_section_id
-            - or fallback on previous behavior """
-        if user_id:
-            user = self.pool.get('res.users').browse(cr, uid, user_id, context=context)
-            if user.default_section_id and user.default_section_id.id:
-                return {'value': {'section_id': user.default_section_id.id}}
-        return super(sale_crm_lead, self).on_change_user(cr, uid, ids, user_id, context=context)
-
-
 class account_invoice(osv.osv):
     _inherit = 'account.invoice'
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
     _defaults = {
-        'section_id': lambda self, cr, uid, c=None: self.pool.get('res.users').browse(cr, uid, uid, c).default_section_id.id or False,
+        'section_id': lambda self, cr, uid, c=None: self.pool.get('crm.lead')._get_default_section_id(cr, uid, c),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'sale_crm/sale_crm_view.xml'
--- sale_crm/sale_crm_view.xml	2014-03-11 14:52:05 +0000
+++ sale_crm/sale_crm_view.xml	2014-03-19 09:31:19 +0000
@@ -94,34 +94,6 @@
             </field>
         </record>
 
-        <!-- Update user form !-->
-        <record model="ir.ui.view" id="res_user_form">
-            <field name="name">Users Preferences</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='tz']" position="after">
-                        <field name="default_section_id"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
-        <!-- Update Preferences form !-->
-        <record id="view_users_form_preferences" model="ir.ui.view">
-            <field name="name">res.users.preferences.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
-            <field name="arch" type="xml">
-            <data>
-                    <xpath expr="//field[@name='company_id']" position="before">
-                        <field name="default_section_id" readonly="0"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
         <!-- search by Salesteams -->
 
         <record id="action_orders_salesteams" model="ir.actions.act_window">