[Merge]with: lp:openobject-addons

bzr revid: dbr@tinyerp.com-20110914051815-eufzxqhse757el5w

diff --cc addons/crm/__openerp__.py
Simple merge

diff --cc addons/crm_partner_assign/test/test_crm_partner_assign.yml
index c8a044b,4d982da..1b42d50
--- 1/addons/crm_partner_assign/test/test_crm_partner_assign.yml
--- 2/addons/crm_partner_assign/test/test_crm_partner_assign.yml
+++ b/addons/crm_partner_assign/test/test_crm_partner_assign.yml
@@@ -31,18 -31,13 +31,18 @@@
    !record {model: res.partner, id: base.res_partner_desertic_hispafuentes}:
      grade_id: res_partner_grade_first0
  -
 +  I change the User email id or partner if needed.
 +-
 +  !python {model: res.partner}: |
 +    self.geo_localize(cr, uid, [ref('base.res_partner_desertic_hispafuentes')], context)
 +-
    I assgin a reply-to email address to Sales Team.
- - 
+ -
    !record {model: crm.case.section, id: crm.section_sales_department}:
      reply_to: sales_openerp@openerp.com
- - 
+ -
    I create an opportunity 'Questionnaire on OpenERP'.
- - 
+ -
    !record {model: crm.lead, id: crm_lead_questionnaireonopenerp0}:
      categ_id: crm.categ_oppor7
      section_id: crm.section_sales_department
@@@ -104,11 -62,10 +104,11 @@@
    !python {model: crm.lead.forward.to.partner}: |
      from tools import config
      vals = {
-        'name': 'email',
+        'subject': 'email',
         'email_to': 'info@axelor.com',
         'email_from': 'Administrator <admin@openerp.com>',
 -       'reply_to': 'sales_openerp@openerp.com'
 +       'reply_to': 'sales_openerp@openerp.com',
 +       'history': 'latest', 
      }
      ids = self.create(cr, uid, vals, context={'active_id': ref('crm_lead_questionnaireonopenerp0'), 'active_model': 'crm.lead'})
      host = config.get('smtp_user', '127.0.0.1')