diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml index 2f53f2c322d..b468762ed13 100644 --- a/addons/base_setup/base_setup_data.xml +++ b/addons/base_setup/base_setup_data.xml @@ -8,8 +8,8 @@
- - + + diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 16f3bb0355c..5af9b789d2a 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -115,9 +115,7 @@ class crm_lead(osv.osv, crm_case): 'section_id': fields.many2one('crm.case.section', 'Sales Team', \ select=True, help='Sales team to which this case belongs to. Defines responsible user and e-mail address for the mail gateway.'), 'create_date': fields.datetime('Creation Date' , readonly=True), - 'email_cc': fields.text('Watchers Emails', size=252 , help="These \ -addresses(Comma-separated) will receive a copy of the future e-mail communication between partner \ -and users"), + 'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"), 'description': fields.text('Notes'), 'write_date': fields.datetime('Update Date' , readonly=True), diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml index 6edce727647..0bb854fea17 100644 --- a/addons/crm/crm_lead_menu.xml +++ b/addons/crm/crm_lead_menu.xml @@ -11,6 +11,7 @@ {"search_default_user_id":uid,'search_default_current':1} {'search_default_current':1, 'default_type': 'lead'} + A lead is a first, unqualified, contact with a new prospect. Use leads when you import a database of prospects or integrate your website's contact form with OpenERP. After having been qualified, the lead can be converted to a partner and a business opportunity for a further detailed tracking of the related activities. diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index 027ebed0a7a..3d8c92b44f1 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -52,6 +52,7 @@ {"search_default_user_id":uid} + The calendar of meetings is shared between sales teams and fully integrated with the others applications like the employee holidays. You can also synchronize meetings with your mobile phone using the caldav interface. diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py index 5869f94e72e..1b7658a1ff9 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -150,6 +150,19 @@ class crm_opportunity(osv.osv): return {'value':{}} return {'value':{'probability': stage.probability}} + def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context={}): + """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of stage’s IDs + @stage_id: change state id on run time """ + + if not partner_assigned_id: + return {'value':{'date_assign': False}} + else: + return {'value':{'date_assign': time.strftime('%Y-%m-%d')}} + _defaults = { 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c), 'priority': crm.AVAILABLE_PRIORITIES[2][0], diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml index 60ade626071..27d25e34ef9 100644 --- a/addons/crm/crm_opportunity_menu.xml +++ b/addons/crm/crm_opportunity_menu.xml @@ -30,6 +30,8 @@ {'search_default_user_id':uid,'search_default_current':1, 'default_type': 'opportunity'} + Opportunities allows you to track your best deals pipeline: history of the communication, expected revenues, stage of each opportunity, excepted closings, etc. Opportunities are usually connected with the email gateway: new emails may create opportunities and each opportunity automatically gets the history of the conversation with the customer. + Your teams will be able to plan meeting and phonecalls from opportunities, to convert opportunities into quotations, to manage documents related to the opportunity, to track all activities related to this customer, etc. diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index a598466865c..894a4e86ea3 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -29,8 +29,8 @@ -