[Merge]Trunk

bzr revid: mba@tinyerp.com-20140214071943-t2wnxm8vmtxcejsc

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

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

diff --cc addons/crm/crm_lead_view.xml
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment.py
index fe92e43,05c3914..de7c7a5
--- 1/addons/hr_recruitment/hr_recruitment.py
--- 2/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@@ -22,15 -22,15 +22,13 @@@
  from datetime import datetime
  from openerp.osv import fields, osv
  from openerp.tools.translate import _
- from openerp.tools import html2plaintext
+ 
  
  AVAILABLE_PRIORITIES = [
 -    ('', ''),
 -    ('5', 'Not Good'),
 -    ('4', 'On Average'),
 -    ('3', 'Good'),
 +    ('0', 'On Average'),
 +    ('1', 'Good'),
      ('2', 'Very Good'),
 -    ('1', 'Excellent')
 +    ('3', 'Excellent')
  ]
  
  class hr_recruitment_source(osv.osv):

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
Simple merge

diff --cc addons/project/project_view.xml
Simple merge