Merge lp:~openerp-dev/openobject-addons/trunk-widget-tooltip-mba into lp:openobject-addons

[Mahendra Barad(OpenERP)]

Hello ,
I have removed .THIS file.
Thanks

[Richard Mathot (Odoo, formerly OpenERP) (rim-openerp)]

A .THIS file has been left in the code... please remove it
(we will review the code later)

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-widget-tooltip-mba]

9074. By Mahendra Barad(OpenERP) on 2014-05-05

[Merge]with trunk

9075. By Mahendra Barad(OpenERP) on 2014-05-05

[IMP]improve resolved conflict code

9076. By Mahendra Barad(OpenERP) on 2014-05-07

[Merge]with trunk

Unmerged revisions

9076. By Mahendra Barad(OpenERP) on 2014-05-07

[Merge]with trunk

9075. By Mahendra Barad(OpenERP) on 2014-05-05

[IMP]improve resolved conflict code

9074. By Mahendra Barad(OpenERP) on 2014-05-05

[Merge]with trunk

9073. By Mahendra Barad(OpenERP) on 2014-04-28

[IMP]remove .THIS file

9072. By Mahendra Barad(OpenERP) on 2014-04-28

[IMP]improve the tooltip

9071. By Mahendra Barad(OpenERP) on 2014-04-28

[Merge]with trunk

9070. By Mahendra Barad(OpenERP) on 2014-04-25

[Merge]with trunk

9069. By Mahendra Barad(OpenERP) on 2014-04-15

[IMP]currency symbol in kanban

9068. By Mahendra Barad(OpenERP) on 2014-04-14

[IMP]demo data

9067. By Mahendra Barad(OpenERP) on 2014-04-14

[Add]data for legends

=== modified file 'crm/crm.py'
--- crm/crm.py	2014-02-11 11:09:36 +0000
+++ crm/crm.py	2014-05-07 10:11:23 +0000
@@ -28,11 +28,11 @@
 from openerp.osv import osv
 
 AVAILABLE_PRIORITIES = [
-    ('1', 'Highest'),
-    ('2', 'High'),
-    ('3', 'Normal'),
-    ('4', 'Low'),
-    ('5', 'Lowest'),
+    ('0', 'Very Low'),
+    ('1', 'Low'),
+    ('2', 'Normal'),
+    ('3', 'High'),
+    ('4', 'Very High'),
 ]
 
 class crm_case_channel(osv.osv):
@@ -57,6 +57,26 @@
     _description = "Stage of case"
     _rec_name = 'name'
     _order = "sequence"
+    
+    def _get_tooltips(self, cr, uid, ids, field, args, context=None):
+        res = {}
+        for rec in self.read(cr, uid, ids, ['legend_star1','legend_star2','legend_star3','legend_star4','requirements'], context=context):
+            value = ""
+            img = "<img src='/web/static/src/img/icons/star-on.png'/>"
+            if rec['legend_star1']:
+                value += img +' '+ rec['legend_star1'] + "<br/>"
+            if rec['legend_star2']:
+                value += img + img +' '+ rec['legend_star2'] + "<br/>"
+            if rec['legend_star3']:
+                value += img + img + img +' '+ rec['legend_star3'] + "<br/>"
+            if rec['legend_star4']:
+                value += img + img + img + img +' '+ rec['legend_star4'] + "<br/>"
+            if rec['requirements']:
+                value += rec['requirements']
+            tooltip = {'tooltip': value}
+            tooltip.update(rec)
+            res[rec['id']] = tooltip
+        return res
 
     _columns = {
         'name': fields.char('Stage Name', size=64, required=True, translate=True),
@@ -64,6 +84,7 @@
         'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
         'on_change': fields.boolean('Change Probability Automatically', help="Setting this stage will change the probability automatically on the opportunity."),
         'requirements': fields.text('Requirements'),
+        'kanban_column_tooltip': fields.function(_get_tooltips, string='Tooltips', type="char", help="This tooltips will display on kanban stage header" ),
         'section_ids': fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
         'case_default': fields.boolean('Default to New Sales Team',
@@ -76,6 +97,10 @@
                                     ('both', 'Both')],
                                     string='Type', size=16, required=True,
                                     help="This field is used to distinguish stages related to Leads from stages related to Opportunities, or to specify stages available for both types."),
+        'legend_star1':fields.char('Legend Star', help='This tooltip will appear on kanban view column header.'),
+        'legend_star2':fields.char('Legend Star2', help='This tooltip will appear on kanban view column header.'),
+        'legend_star3':fields.char('Legend Star3', help='This tooltip will appear on kanban view column header.'),
+        'legend_star4':fields.char('Legend Star4', help='This tooltip will appear on kanban view column header.'),
     }
 
     _defaults = {

=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py	2014-05-02 13:07:53 +0000
+++ crm/crm_lead.py	2014-05-07 10:11:23 +0000
@@ -278,6 +278,7 @@
         'partner_address_name': fields.related('partner_id', 'name', type='char', string='Partner Contact Name', readonly=True),
         'partner_address_email': fields.related('partner_id', 'email', type='char', string='Partner Contact Email', readonly=True),
         'company_currency': fields.related('company_id', 'currency_id', type='many2one', string='Currency', readonly=True, relation="res.currency"),
+        'company_currency_symbol': fields.related('company_id', 'currency_id', 'symbol', type='char', string='Symbol', readonly=True, relation="res.currency"),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
         'user_login': fields.related('user_id', 'login', type='char', string='User Login', readonly=True),
 
@@ -458,21 +459,6 @@
             self.write(cr, uid, [case.id], data, context=context)
         return True
 
-    def set_priority(self, cr, uid, ids, priority, context=None):
-        """ Set lead priority
-        """
-        return self.write(cr, uid, ids, {'priority': priority}, context=context)
-
-    def set_high_priority(self, cr, uid, ids, context=None):
-        """ Set lead priority to high
-        """
-        return self.set_priority(cr, uid, ids, '1', context=context)
-
-    def set_normal_priority(self, cr, uid, ids, context=None):
-        """ Set lead priority to normal
-        """
-        return self.set_priority(cr, uid, ids, '3', context=context)
-
     def _merge_get_result_type(self, cr, uid, opps, context=None):
         """
         Define the type of the result of the merge.  If at least one of the

=== modified file 'crm/crm_lead_data.xml'
--- crm/crm_lead_data.xml	2014-02-21 11:29:15 +0000
+++ crm/crm_lead_data.xml	2014-05-07 10:11:23 +0000
@@ -10,6 +10,10 @@
             <field name="on_change">1</field>
             <field name="sequence">1</field>
             <field name="type">both</field>
+            <field name="legend_star1">Low priority</field>
+            <field name="legend_star2">Normal priority</field>
+            <field name="legend_star3">High priority</field>
+            <field name="legend_star4">Highest priority</field>
         </record>
         <record model="crm.case.stage" id="stage_lead2">
             <field name="name">Dead</field>
@@ -26,6 +30,10 @@
             <field name="on_change">1</field>
             <field name="sequence">40</field>
             <field name="type">opportunity</field>
+            <field name="legend_star1">Low priority</field>
+            <field name="legend_star2">Normal priority</field>
+            <field name="legend_star3">High priority</field>
+            <field name="legend_star4">Highest priority</field>
         </record>
         <record model="crm.case.stage" id="stage_lead4">
             <field name="name">Proposition</field>
@@ -33,6 +41,10 @@
             <field name="probability">40</field>
             <field name="sequence">50</field>
             <field name="type">opportunity</field>
+            <field name="legend_star1">Low priority</field>
+            <field name="legend_star2">Normal priority</field>
+            <field name="legend_star3">High priority</field>
+            <field name="legend_star4">Highest priority</field>
         </record>
         <record model="crm.case.stage" id="stage_lead5">
             <field name="name">Negotiation</field>
@@ -40,6 +52,10 @@
             <field name="probability">60</field>
             <field name="sequence">60</field>
             <field name="type">opportunity</field>
+            <field name="legend_star1">Low priority</field>
+            <field name="legend_star2">Normal priority</field>
+            <field name="legend_star3">High priority</field>
+            <field name="legend_star4">Highest priority</field>
         </record>
         <record model="crm.case.stage" id="stage_lead6">
             <field name="name">Won</field>
@@ -49,6 +65,10 @@
             <field name="on_change">1</field>
             <field name="sequence">70</field>
             <field name="type">opportunity</field>
+            <field name="legend_star1">Low priority</field>
+            <field name="legend_star2">Normal priority</field>
+            <field name="legend_star3">High priority</field>
+            <field name="legend_star4">Highest priority</field>
         </record>
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Lost</field>
@@ -58,6 +78,10 @@
             <field name="on_change">1</field>
             <field name="sequence">80</field>
             <field name="type">opportunity</field>
+            <field name="legend_star1">Low priority</field>
+            <field name="legend_star2">Normal priority</field>
+            <field name="legend_star3">High priority</field>
+            <field name="legend_star4">Highest priority</field>
         </record>
         
         <record model="crm.case.section" id="section_sales_department">

=== modified file 'crm/crm_lead_demo.xml'
--- crm/crm_lead_demo.xml	2013-10-27 12:31:04 +0000
+++ crm/crm_lead_demo.xml	2014-05-07 10:11:23 +0000
@@ -54,7 +54,7 @@
             <field name="type_id" ref="type_lead7"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">4</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -104,7 +104,7 @@
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor5])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="stage_lead6"/>
@@ -129,7 +129,7 @@
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor1])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -156,7 +156,7 @@
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -174,7 +174,7 @@
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">5</field>
+            <field name="priority">0</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -193,7 +193,7 @@
             <field name="type_id" ref="type_lead5"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor6,categ_oppor8])]"/>
             <field name="channel_id" ref=""/>
-            <field name="priority">4</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -253,7 +253,7 @@
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_1"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
@@ -331,7 +331,7 @@
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>
@@ -404,7 +404,7 @@
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3,categ_oppor4])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">4</field>
+            <field name="priority">1</field>
             <field eval="time.strftime('%Y-%m-8')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-3')" name="date_action"/>
             <field name="title_action">Send price list regarding our interventions</field>
@@ -431,7 +431,7 @@
             <field name="partner_id" ref="base.res_partner_4"/>
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor4,categ_oppor6])]"/>
-            <field name="priority">4</field>
+            <field name="priority">1</field>
             <field eval="time.strftime('%Y-%m-13')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
@@ -492,7 +492,7 @@
             <field name="type_id" ref="type_lead2"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_phone"/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
@@ -510,7 +510,7 @@
             <field name="type_id" ref="type_lead7"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_email"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
@@ -525,7 +525,7 @@
             <field name="type_id" ref="type_lead5"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor3])]"/>
             <field name="channel_id" ref="crm_case_channel_direct"/>
-            <field name="priority">5</field>
+            <field name="priority">0</field>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="stage_id" ref="crm.stage_lead5"/>
@@ -543,7 +543,7 @@
             <field name="type_id" ref="type_lead8"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor7])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">5</field>
+            <field name="priority">0</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
             <field name="section_id" ref="section_sales_department"/>
             <field name="user_id" ref="base.user_root"/>
@@ -588,7 +588,7 @@
             <field name="type_id" ref="type_lead3"/>
             <field name="categ_ids" eval="[(6, 0, [categ_oppor2])]"/>
             <field name="channel_id" ref="crm_case_channel_website"/>
-            <field name="priority">3</field>
+            <field name="priority">2</field>
             <field eval="time.strftime('%Y-%m-23')" name="date_deadline"/>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Send Catalogue by Email</field>

=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml	2014-05-02 13:22:58 +0000
+++ crm/crm_lead_view.xml	2014-05-07 10:11:23 +0000
@@ -158,7 +158,7 @@
                             <field name="type" invisible="1"/>
                         </group>
                         <group>
-                            <field name="priority"/>
+                            <field name="priority" widget="priority"/>
                             <field name="categ_ids"
                                 widget="many2many_tags"
                                 domain="[('object_id.model','=','crm.lead')]"
@@ -261,7 +261,7 @@
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
-                    <field name="stage_id"/>
+                    <field name="stage_id" options='{"tooltip_on_group_by": "kanban_column_tooltip"}'/>
                     <field name="color"/>
                     <field name="priority"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
@@ -290,7 +290,7 @@
                                         <b><field name="name"/></b>
                                         <t t-if="record.planned_revenue.raw_value">
                                             - <b><t t-esc="record.planned_revenue.value"/>
-                                            <field name="company_currency"/></b>
+                                            <field name="company_currency_symbol"/></b>
                                         </t>
                                     </div>
                                     <div>
@@ -303,9 +303,16 @@
                                         <field name="title_action"/>
                                     </div>
                                     <div class="oe_kanban_bottom_right">
-                                        <a t-if="record.priority.raw_value == 1" type="object" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                        <a t-if="record.priority.raw_value != 1" type="object" name="set_high_priority" class="oe_e oe_star_off">7</a>
-                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar" t-if="record.user_id.value"/>
+                                        <table>
+                                            <tr>
+                                                <td groups="base.group_user">
+                                                    <field name="priority" widget="priority"/>
+                                                </td>
+                                                <td>
+                                                    <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                                </td>
+                                            </tr>
+                                        </table>
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <t t-raw="record.message_summary.raw_value"/>
@@ -430,7 +437,7 @@
                                     <field name="title_action" class="oe_inline" nolabel="1" placeholder="e.g. Call for proposal"/>
                                 </div>
                                 <field name="date_deadline"/>
-                                <field name="priority"/>
+                                <field name="priority" widget="priority"/>
                             </group>
 
                             <group>

=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py	2014-03-24 13:56:21 +0000
+++ crm/crm_phonecall.py	2014-05-07 10:11:23 +0000
@@ -70,7 +70,7 @@
                         ('object_id.model', '=', 'crm.phonecall')]"),
         'partner_phone': fields.char('Phone', size=32),
         'partner_mobile': fields.char('Mobile', size=32),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Date'),
         'opportunity_id': fields.many2one ('crm.lead', 'Lead/Opportunity'),
@@ -85,7 +85,7 @@
 
     _defaults = {
         'date': fields.datetime.now,
-        'priority': crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': '1',
         'state':  _get_default_state,
         'user_id': lambda self, cr, uid, ctx: uid,
         'active': 1

=== modified file 'crm/crm_phonecall_demo.xml'
--- crm/crm_phonecall_demo.xml	2013-10-27 12:31:04 +0000
+++ crm/crm_phonecall_demo.xml	2014-05-07 10:11:23 +0000
@@ -6,7 +6,7 @@
         <record id="crm_phonecall_1" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Left the message</field>
             <field name="state">done</field>
@@ -19,7 +19,7 @@
         <record id="crm_phonecall_2" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
             <field name="partner_id" ref="base.res_partner_7"/>
-            <field eval="'4'" name="priority"/>
+            <field eval="'0'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Need more information on the proposed deal</field>
             <field name="state">done</field>
@@ -44,7 +44,7 @@
         </record>
         <record id="crm_phonecall_4" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Wanted information about pricing of laptops</field>
             <field name="state">done</field>
@@ -58,7 +58,7 @@
         <record id="crm_phonecall_5" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
             <field name="partner_id" ref="base.res_partner_5"/>
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">More information on the proposed deal</field>
             <field name="state">pending</field>
@@ -69,7 +69,7 @@
             <field eval="2.08" name="duration"/>
         </record>
         <record id="crm_phonecall_6" model="crm.phonecall">
-            <field eval="'3'" name="priority"/>
+            <field eval="'1'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="name">Proposal for discount offer</field>
             <field name="state">open</field>

=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml	2014-05-02 13:07:53 +0000
+++ crm/crm_phonecall_view.xml	2014-05-07 10:11:23 +0000
@@ -103,7 +103,7 @@
                         <field name="categ_id" widget="selection"
                             domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                         <field name="partner_mobile"/>
-                        <field name="priority"/>
+                        <field name="priority" widget="priority"/>
                         <field name="opportunity_id" on_change="on_change_opportunity(opportunity_id)"/>
                     </group>
                     <field name="description" placeholder="Description..."/>

=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml	2013-12-10 09:33:07 +0000
+++ crm/crm_view.xml	2014-05-07 10:11:23 +0000
@@ -107,9 +107,57 @@
                         </group>
 
                     </group>
+                    <div attrs="{'invisible':[('type','=', 'lead')]}">
+                        <separator string="Legend"/>
+                        <p>The legend will appear as tooltip of each column of the opportunities pipe.</p>
+                        <div>
+                            <group col="3">
+                                <div width="57">
+                                    <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">7</span>
+                                </div> 
+                                <div width="400">
+                                    <field name="legend_star1"/>
+                                </div>
+                                <div></div>
+                            </group>
+                        </div>
+                        <div>
+                            <group col="3">
+                                <div width="57">
+                                    <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">77</span>
+                                </div> 
+                                <div width="400">
+                                    <field name="legend_star2"/>
+                                </div>
+                                <div></div>
+                            </group>
+                        </div>
+                        <div>
+                            <group col="3">
+                                <div width="57">
+                                    <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">777</span>
+                                </div> 
+                                <div width="400">
+                                    <field name="legend_star3"/>
+                                </div>
+                                <div></div>
+                            </group>
+                        </div>
+                        <div>
+                            <group col="3">
+                                <div width="57">
+                                    <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">7777</span>
+                                </div> 
+                                <div width="400">
+                                    <field name="legend_star4"/>
+                                </div>
+                                <div></div>
+                            </group>
+                        </div>
+                    </div>
+                    <field name="section_ids" invisible="1"/>
                     <separator string="Requirements"/>
                     <field name="requirements" nolabel="1"/>
-                    <field name="section_ids" invisible="1"/>
                 </form>
             </field>
         </record>

=== modified file 'crm/report/crm_phonecall_report.py'
--- crm/report/crm_phonecall_report.py	2014-01-29 09:56:55 +0000
+++ crm/report/crm_phonecall_report.py	2014-05-07 10:11:23 +0000
@@ -42,7 +42,7 @@
     _columns = {
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'),
         'nbr': fields.integer('# of Cases', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True, select=True),

=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py	2014-03-24 05:09:21 +0000
+++ crm_claim/crm_claim.py	2014-05-07 10:11:23 +0000
@@ -88,7 +88,7 @@
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.claim')]"),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'),
         'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         'user_fault': fields.char('Trouble Responsible', size=64),
@@ -111,7 +111,7 @@
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'date': fields.datetime.now,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': '1',
         'active': lambda *a: 1,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
     }

=== modified file 'crm_claim/crm_claim_demo.xml'
--- crm_claim/crm_claim_demo.xml	2012-11-29 22:26:45 +0000
+++ crm_claim/crm_claim_demo.xml	2014-05-07 10:11:23 +0000
@@ -9,7 +9,7 @@
         <record id="crm_claim_1" model="crm.claim">
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of goods&quot;" name="name"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -21,7 +21,7 @@
         <record id="crm_claim_2" model="crm.claim">
             <field eval="time.strftime('%Y-%m-11 11:19:25')" name="date"/>
             <field name="partner_id" ref="base.res_partner_6"/>
-            <field eval="&quot;4&quot;" name="priority"/>
+            <field eval="&quot;0&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Damaged Products&quot;" name="name"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -46,7 +46,7 @@
         <record id="crm_claim_4" model="crm.claim">
             <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
             <field name="partner_id" ref="base.res_partner_18"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Product quality not maintained&quot;" name="name"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -58,7 +58,7 @@
         <record id="crm_claim_5" model="crm.claim">
             <field eval="time.strftime('%Y-%m-28 16:20:43')" name="date"/>
             <field name="partner_id" ref="base.res_partner_5"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Some products missing&quot;" name="name"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -69,7 +69,7 @@
         
         <record id="crm_claim_6" model="crm.claim">
             <field name="partner_id" ref="base.res_partner_9"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Problem with the delivery of assignments&quot;" name="name"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -82,7 +82,7 @@
         
         <record id="crm_claim_7" model="crm.claim">
             <field name="partner_id" ref="base.res_partner_19"/>
-            <field eval="&quot;3&quot;" name="priority"/>
+            <field eval="&quot;1&quot;" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
             <field eval="&quot;Documents unclear&quot;" name="name"/>
             <field name="section_id" ref="crm.section_sales_department"/>

=== modified file 'crm_claim/crm_claim_view.xml'
--- crm_claim/crm_claim_view.xml	2013-10-27 12:31:04 +0000
+++ crm_claim/crm_claim_view.xml	2014-05-07 10:11:23 +0000
@@ -107,7 +107,7 @@
                     </group>
                     <group colspan="4" col="4"  groups="base.group_user">
                         <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
-                        <field name="priority"/>
+                        <field name="priority" widget="priority"/>
                         <field name="section_id" groups="base.group_multi_salesteams"/>
                         <field name="date_deadline"/>
                     </group>

=== modified file 'crm_claim/report/crm_claim_report.py'
--- crm_claim/report/crm_claim_report.py	2013-10-27 12:31:04 +0000
+++ crm_claim/report/crm_claim_report.py	2014-05-07 10:11:23 +0000
@@ -23,11 +23,9 @@
 from openerp import tools
 
 AVAILABLE_PRIORITIES = [
-    ('5', 'Lowest'),
-    ('4', 'Low'),
-    ('3', 'Normal'),
-    ('2', 'High'),
-    ('1', 'Highest')
+   ('0', 'Low'),
+   ('1', 'Normal'),
+   ('2', 'High')
 ]
 
 

=== 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-05-07 10:11:23 +0000
@@ -59,7 +59,7 @@
             'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
             'planned_revenue': fields.float('Planned Revenue'),
             'planned_cost': fields.float('Planned Costs'),
-            'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+            'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'),
             'probability': fields.float('Probability (%)'),
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="['|',('section_id','=',False),('section_id','=',section_id),\
@@ -83,7 +83,7 @@
         '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),
-        'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': '1',
     }
 
     def on_change_partner_id(self, cr, uid, ids, partner_id, context=None):

=== modified file 'crm_helpdesk/crm_helpdesk_demo.xml'
--- crm_helpdesk/crm_helpdesk_demo.xml	2012-11-29 22:26:45 +0000
+++ crm_helpdesk/crm_helpdesk_demo.xml	2014-05-07 10:11:23 +0000
@@ -5,7 +5,7 @@
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="state">draft</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/>
@@ -17,7 +17,7 @@
             <field eval="1" name="active"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="state">draft</field>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/>
@@ -42,7 +42,7 @@
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="company_id" ref="base.main_company"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="state">draft</field>
             <field name="date" eval="time.strftime('%Y-%m-12 11:15:17')"/>
             <field name="name">How to create a new module</field>

=== modified file 'crm_helpdesk/crm_helpdesk_view.xml'
--- crm_helpdesk/crm_helpdesk_view.xml	2014-04-17 11:26:55 +0000
+++ crm_helpdesk/crm_helpdesk_view.xml	2014-05-07 10:11:23 +0000
@@ -51,7 +51,7 @@
                                     <field name="email_from"/>
                                 </group>
                                 <group string="Categorization">
-                                    <field name="priority"/>
+                                    <field name="priority" widget="priority"/>
                                     <field name="categ_id" domain="[('object_id.model', '=', 'crm.helpdesk')]" context="{'object_name': 'crm.helpdesk'}"/>
                                     <field name="channel_id"/>
                                 </group>

=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2014-04-17 06:53:56 +0000
+++ hr_recruitment/hr_recruitment.py	2014-05-07 10:11:23 +0000
@@ -25,12 +25,11 @@
 
 
 AVAILABLE_PRIORITIES = [
-    ('', ''),
-    ('5', 'Not Good'),
-    ('4', 'On Average'),
+    ('0', 'Bad'),
+    ('1', 'Below Average'),
+    ('2', 'Average'),
     ('3', 'Good'),
-    ('2', 'Very Good'),
-    ('1', 'Excellent')
+    ('4', 'Excellent')
 ]
 
 class hr_recruitment_source(osv.osv):
@@ -46,6 +45,27 @@
     _name = "hr.recruitment.stage"
     _description = "Stage of Recruitment"
     _order = 'sequence'
+
+    def _get_tooltips(self, cr, uid, ids, field, args, context=None):
+        res = {}
+        for rec in self.read(cr, uid, ids, ['legend_star1','legend_star2','legend_star3','legend_star4','requirements'], context=context):
+            value = ""
+            img = "<img src='/web/static/src/img/icons/star-on.png'/>"
+            if rec['legend_star1']:
+                value += img +' '+ rec['legend_star1'] + "<br/>"
+            if rec['legend_star2']:
+                value += img + img +' '+ rec['legend_star2'] + "<br/>"
+            if rec['legend_star3']:
+                value += img + img + img +' '+ rec['legend_star3'] + "<br/>"
+            if rec['legend_star4']:
+                value += img + img + img + img +' '+ rec['legend_star4'] + "<br/>"
+            if rec['requirements']:
+                value += rec['requirements']
+            tooltip = {'tooltip': value}
+            tooltip.update(rec)
+            res[rec['id']] = tooltip
+        return res
+
     _columns = {
         'name': fields.char('Name', size=64, required=True, translate=True),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of stages."),
@@ -55,6 +75,11 @@
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
+        'kanban_column_tooltip': fields.function(_get_tooltips, string='Tooltips', type="char", help="This tooltips will display on kanban stage header" ),
+        'legend_star1':fields.char('Legend Star', help='This tooltip will appear on kanban view column header.'),
+        'legend_star2':fields.char('Legend Star2', help='This tooltip will appear on kanban view column header.'),
+        'legend_star3':fields.char('Legend Star3', help='This tooltip will appear on kanban view column header.'),
+        'legend_star4':fields.char('Legend Star4', help='This tooltip will appear on kanban view column header.'),
     }
     _defaults = {
         'sequence': 1,
@@ -489,21 +514,6 @@
         dict_act_window['view_mode'] = 'form,tree'
         return dict_act_window
 
-    def set_priority(self, cr, uid, ids, priority, *args):
-        """Set applicant priority
-        """
-        return self.write(cr, uid, ids, {'priority': priority})
-
-    def set_high_priority(self, cr, uid, ids, *args):
-        """Set applicant priority to high
-        """
-        return self.set_priority(cr, uid, ids, '1')
-
-    def set_normal_priority(self, cr, uid, ids, *args):
-        """Set applicant priority to normal
-        """
-        return self.set_priority(cr, uid, ids, '3')
-
     def get_empty_list_help(self, cr, uid, help, context=None):
         context['empty_list_help_model'] = 'hr.job'
         context['empty_list_help_id'] = context.get('default_job_id', None)

=== modified file 'hr_recruitment/hr_recruitment_data.xml'
--- hr_recruitment/hr_recruitment_data.xml	2014-02-12 09:56:06 +0000
+++ hr_recruitment/hr_recruitment_data.xml	2014-05-07 10:11:23 +0000
@@ -92,30 +92,54 @@
     <record model="hr.recruitment.stage" id="stage_job1">
         <field name="name">Initial Qualification</field>
         <field name="sequence">1</field>
+        <field name="legend_star1">Average</field>
+        <field name="legend_star2">Correspond to the job requirements</field>
+        <field name="legend_star3">Nice to have skills</field>
+        <field name="legend_star4">Excellent</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
         <field name="template_id" ref="applicant_interest"/>
         <field name="sequence">2</field>
+        <field name="legend_star1">Average</field>
+        <field name="legend_star2">Good</field>
+        <field name="legend_star3">Very Good</field>
+        <field name="legend_star4">Excellent</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
         <field name="name">Second Interview</field>
         <field name="sequence">3</field>
+        <field name="legend_star1">Average</field>
+        <field name="legend_star2">Good at required skills</field>
+        <field name="legend_star3">Expert in required skills</field>
+        <field name="legend_star4">Excellent in all the skills</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job4">
         <field name="name">Contract Proposed</field>
         <field name="sequence">4</field>
+        <field name="legend_star1">Average</field>
+        <field name="legend_star2">Good</field>
+        <field name="legend_star3">Very Good</field>
+        <field name="legend_star4">Excellent</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job5">
         <field name="name">Contract Signed</field>
         <field name="sequence">5</field>
         <field name="fold" eval="True"/>
+        <field name="legend_star1">Average</field>
+        <field name="legend_star2">Good</field>
+        <field name="legend_star3">Very Good</field>
+        <field name="legend_star4">Excellent</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job6">
         <field name="name">Refused</field>
         <field name="sequence">6</field>
         <field name="template_id" ref="applicant_refuse"/>
         <field name="fold" eval="True"/>
+        <field name="legend_star1">Average</field>
+        <field name="legend_star2">Good</field>
+        <field name="legend_star3">Very Good</field>
+        <field name="legend_star4">Excellent</field>
     </record>
 
     <record id="mail_alias_jobs" model="mail.alias">

=== modified file 'hr_recruitment/hr_recruitment_demo.xml'
--- hr_recruitment/hr_recruitment_demo.xml	2014-02-12 09:56:06 +0000
+++ hr_recruitment/hr_recruitment_demo.xml	2014-05-07 10:11:23 +0000
@@ -75,7 +75,7 @@
         <field name="type_id" ref="degree_licenced"/>
         <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
         <field name="user_id" ref="base.user_root"/>
-        <field name="priority">4</field>
+        <field name="priority">2</field>
         <field name="partner_name">David Armstrong</field>
         <field name="stage_id" ref="stage_job2"/>
         <field name="partner_phone">33968745</field>

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2014-04-15 15:01:46 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2014-05-07 10:11:23 +0000
@@ -130,7 +130,7 @@
                             <field name="date_action"/>
                             <field name="title_action" class="oe_inline" placeholder="e.g. Call for interview"/>
                         </div>
-                        <field name="priority"/>
+                        <field name="priority" widget="priority"/>
                         <field name="source_id"/>
                         <field name="reference"/>
                     </group>
@@ -246,7 +246,7 @@
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
             <kanban default_group_by="stage_id">
-                <field name="stage_id"/>
+                <field name="stage_id" options='{"tooltip_on_group_by": "kanban_column_tooltip"}'/>
                 <field name="color"/>
                 <field name="priority"/>
                 <field name="survey"/>
@@ -294,21 +294,16 @@
                                 </div>
                                 <div style="width:240px"><field name="categ_ids"/></div>
                                 <div class="oe_kanban_right">
-                                    <t t-set="priority" t-value="record.priority.raw_value || 5"/>
-                                    <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
-                                        <img src="/web/static/src/img/icons/star-off.png" width="16" height="16" title="Good"/>
-                                    </a>
-                                    <a type="object" name="set_priority" args="['5']" t-if="priority lte 3">
-                                        <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16" title="Good"/>
-                                    </a>
-                                    <a type="object" name="set_priority" args="['2']">
-                                        <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16" title="Very Good"/>
-                                    </a>
-                                    <a type="object" name="set_priority" args="['1']">
-                                        <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16" title="Excellent"/>
-                                    </a>
-                                    <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-
+                                     <table>
+                                        <tr>
+                                            <td groups="base.group_user">
+                                                <field name="priority" widget="priority"/>
+                                            </td>
+                                            <td>
+                                                <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <t t-raw="record.message_summary.raw_value"/>
@@ -553,6 +548,52 @@
                         <field name="template_id" domain= "[('model_id.model', '=', 'hr.applicant')]"/>
                     </group>
                 </group>
+                <separator string="Legend"/>
+                    <p>The legend will appear as tooltip of each column of the opportunities pipe.</p>
+                    <div>
+                        <group col="3">
+                            <div width="57">
+                                <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">7</span>
+                            </div> 
+                            <div width="400">
+                                <field name="legend_star1"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                     <div>
+                        <group col="3">
+                            <div width="57">
+                                <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">77</span>
+                            </div> 
+                            <div width="400">
+                                <field name="legend_star2"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                     <div>
+                        <group col="3">
+                            <div width="57">
+                                <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">777</span>
+                            </div> 
+                            <div width="400">
+                                <field name="legend_star3"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                     <div>
+                        <group col="3">
+                            <div width="57">
+                                <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">7777</span>
+                            </div> 
+                            <div width="400">
+                                <field name="legend_star4"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
                 <separator string="Requirements"/>
                 <field name="requirements"/>
                 </sheet>

=== modified file 'project/project.py'
--- project/project.py	2014-04-10 14:51:31 +0000
+++ project/project.py	2014-05-07 10:11:23 +0000
@@ -34,6 +34,29 @@
     _name = 'project.task.type'
     _description = 'Task Stage'
     _order = 'sequence'
+    
+    def _get_tooltips(self, cr, uid, ids, field, args, context=None):
+        res = {}
+        for rec in self.read(cr, uid, ids, ['legend_blocked', 'legend_done', 'legend_star1','legend_star2','description'],context=context):
+            value = ""
+            star = "<img src='/web/static/src/img/icons/star-on.png'/>"
+            if rec['legend_blocked']:
+                img = "<img src='/web/static/src/img/icons/gtk-no.png'/>"
+                value += img +' '+ rec['legend_blocked'] + "<br/>"
+            if rec['legend_done']:
+                img = "<img src='/web/static/src/img/icons/gtk-yes.png'/> "
+                value += img +' '+ rec['legend_done'] + "<br/>"
+            if rec['legend_star1']:
+                value += star +' '+ rec['legend_star1'] + "<br/>"
+            if rec['legend_star2']:
+                value += star + star +' '+ rec['legend_star2'] + "<br/>"
+            if rec['description']:
+                value += rec['description']
+            tooltip = {'tooltip': value}
+            tooltip.update(rec)
+            res[rec['id']] = tooltip
+        return res
+    
     _columns = {
         'name': fields.char('Stage Name', required=True, size=64, translate=True),
         'description': fields.text('Description'),
@@ -41,6 +64,16 @@
         'case_default': fields.boolean('Default for New Projects',
                         help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
+        'kanban_column_tooltip': fields.function(_get_tooltips, string='Tooltips', type="char", help="This tooltips will display on kanban stage header"),
+        'legend_blocked': fields.char('Legend Red', help='This tooltip will appear on kanban view column header.'),
+        'legend_done':fields.char('Legend Green', help='This tooltip will appear on kanban view column header.'),
+        'legend_star1':fields.char('Legend Star', help='This tooltip will appear on kanban view column header.'),
+        'legend_star2':fields.char('Legend Star2', help='This tooltip will appear on kanban view column header.'),
+        'type': fields.selection([('task', 'Task'),
+                                  ('issue', 'Issue'),
+                                    ('both', 'Both')],
+                                    string='Type', size=16, required=True,
+                                    help="This field is used to distinguish stages related to Issues and Tasks, or to specify stages available for both types."),
         'fold': fields.boolean('Folded in Kanban View',
                                help='This stage is folded in the kanban view when'
                                'there are no records in that stage to display.'),
@@ -54,6 +87,9 @@
 
     _defaults = {
         'sequence': 1,
+        'fold': False,
+        'case_default': True,
+        'type': 'both',
         'project_ids': _get_default_project_ids,
     }
     _order = 'sequence'
@@ -543,9 +579,19 @@
         # if alias_model has been changed, update alias_model_id accordingly
         if vals.get('alias_model'):
             model_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', vals.get('alias_model', 'project.task'))])
-            vals.update(alias_model_id=model_ids[0])
+            if model_ids and len(model_ids):
+                vals.update(alias_model_id=model_ids[0])
         return super(project, self).write(cr, uid, ids, vals, context=context)
 
+    def project_tasks_action(self, cr, uid, ids, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        action_obj =self.pool.get('ir.actions.act_window')
+
+        action_id = data_obj.get_object_reference(cr, uid, 'project', 'act_project_project_2_project_task_all')[1]
+        action = action_obj.read(cr, uid, action_id, [], context)
+        res = self.read(cr, uid, ids, ['task_label'], context)[0]
+        action['name'] = res['task_label']
+        return action
 
 class task(osv.osv):
     _name = "project.task"
@@ -565,6 +611,7 @@
         },
         'kanban_state': {
             'project.mt_task_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
+            'project.mt_task_done': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done',
         },
     }
 
@@ -583,7 +630,7 @@
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('fold', '=', False)], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('sequence', '=', 1),('type', 'in',['task','both'])], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
@@ -611,7 +658,9 @@
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += [('id', 'in', ids)]
+            search_domain += [('id', 'in', ids),('type', 'in', ['task', 'both'])]
+        else:
+            search_domain += [('id', 'in', ids)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
@@ -740,18 +789,18 @@
         'active': fields.function(_is_template, store=True, string='Not a Template Task', type='boolean', help="This field is computed automatically and have the same behavior than the boolean 'active' field: if the task is linked to a template or unactivated project, it will be hidden unless specifically asked."),
         'name': fields.char('Task Summary', track_visibility='onchange', size=128, required=True, select=True),
         'description': fields.text('Description'),
-        'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage', track_visibility='onchange', select=True,
-                        domain="[('project_ids', '=', project_id)]"),
+                        domain="[('project_ids', '=', project_id), ('type', 'in', ['task','both'])]"),
         'categ_ids': fields.many2many('project.category', string='Tags'),
-        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
+        'kanban_state': fields.selection([('normal', 'In Progress'),('blocked', 'Blocked'),('done', 'Ready')], 'Kanban State',
                                          track_visibility='onchange',
                                          help="A task's kanban state indicates special situations affecting it:\n"
                                               " * Normal is the default situation\n"
                                               " * Blocked indicates something is preventing the progress of this task\n"
                                               " * Ready for next stage indicates the task is ready to be pulled to the next stage",
-                                         readonly=True, required=False),
+                                         required=False),
         'create_date': fields.datetime('Create Date', readonly=True, select=True),
         'write_date': fields.datetime('Last Modification Date', readonly=True, select=True), #not displayed in the view but it might be useful with base_action_rule module (and it needs to be defined first for that)
         'date_start': fields.datetime('Starting Date',select=True),
@@ -799,7 +848,7 @@
         'project_id': _get_default_project_id,
         'date_last_stage_update': fields.datetime.now,
         'kanban_state': 'normal',
-        'priority': '2',
+        'priority': '1',
         'progress': 0,
         'sequence': 10,
         'active': True,
@@ -808,17 +857,7 @@
         'partner_id': lambda self, cr, uid, ctx=None: self._get_default_partner(cr, uid, context=ctx),
     }
     _order = "priority, sequence, date_start, name, id"
-
-    def set_high_priority(self, cr, uid, ids, *args):
-        """Set task priority to high
-        """
-        return self.write(cr, uid, ids, {'priority' : '0'})
-
-    def set_normal_priority(self, cr, uid, ids, *args):
-        """Set task priority to normal
-        """
-        return self.write(cr, uid, ids, {'priority' : '2'})
-
+    
     def _check_recursion(self, cr, uid, ids, context=None):
         for id in ids:
             visited_branch = set()
@@ -1003,16 +1042,6 @@
     def set_remaining_time_10(self, cr, uid, ids, context=None):
         return self.set_remaining_time(cr, uid, ids, 10.0, context)
 
-    def set_kanban_state_blocked(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
-
-    def set_kanban_state_normal(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context)
-
-    def set_kanban_state_done(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context)
-        return False
-
     def _store_history(self, cr, uid, ids, context=None):
         for task in self.browse(cr, uid, ids, context=context):
             self.pool.get('project.task.history').create(cr, uid, {
@@ -1193,7 +1222,11 @@
     _columns = {
         'use_tasks': fields.boolean('Tasks',help="If checked, this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
+        'task_label': fields.char('Use Task as', size=128, help="Gives label to tasks on project's kanaban view.", required=True)
     }
+    _defaults = {
+        'task_label': 'Tasks'
+     }
 
     def on_change_template(self, cr, uid, ids, template_id, date_start=False, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, date_start=date_start, context=context)

=== modified file 'project/project_data.xml'
--- project/project_data.xml	2014-02-21 11:27:04 +0000
+++ project/project_data.xml	2014-05-07 10:11:23 +0000
@@ -31,32 +31,56 @@
             <field name="sequence">1</field>
             <field name="name">Analysis</field>
             <field name="case_default" eval="True"/>
+            <field name="legend_blocked">There is a problem in analysis.</field>
+            <field name="legend_done">Ready for the next stage.</field>
+            <field name="legend_star1">High priority for the analysis.</field>
+            <field name="legend_star2">Highest priority for the analysis.</field>
         </record>
         <record id="project_tt_specification" model="project.task.type">
             <field name="sequence">10</field>
             <field name="name">Specification</field>
             <field name="case_default" eval="True"/>
+            <field name="legend_blocked">Need more info about  customer’s needs.</field>
+            <field name="legend_done">Ready for the next stage.</field>
+            <field name="legend_star1">High priority for the specification.</field>
+            <field name="legend_star2">Highest priority for the specification.</field>
         </record>
         <record id="project_tt_design" model="project.task.type">
             <field name="sequence">11</field>
             <field name="name">Design</field>
             <field name="case_default" eval="True"/>
+            <field name="legend_blocked">Design is not valid.</field>
+            <field name="legend_done">Ready for the next stage.</field>
+            <field name="legend_star1">High priority for the design.</field>
+            <field name="legend_star2">Highest priority for the design.</field>
         </record>
         <record id="project_tt_development" model="project.task.type">
             <field name="sequence">12</field>
             <field name="name">Development</field>
             <field name="case_default" eval="True"/>
+            <field name="legend_blocked">Need help from the specification team.</field>
+            <field name="legend_done">Ready for the next stage.</field>
+            <field name="legend_star1">High priority for the development.</field>
+            <field name="legend_star2">Highest priority for the development.</field>
         </record>
         <record id="project_tt_testing" model="project.task.type">
             <field name="sequence">13</field>
             <field name="name">Testing</field>
             <field name="case_default" eval="True"/>
+            <field name="legend_blocked">Test is failed.</field>
+            <field name="legend_done">Test result is achieved.</field>
+            <field name="legend_star1">High priority for the testing.</field>
+            <field name="legend_star2">Highest priority for the testing.</field>
         </record>
         <record id="project_tt_merge" model="project.task.type">
             <field name="sequence">14</field>
             <field name="name">Merge</field>
             <field name="case_default" eval="False"/>
             <field name="fold" eval="True"/>
+            <field name="legend_blocked">TConflict in any file.</field>
+            <field name="legend_done">Ready for the next stage.</field>
+            <field name="legend_star1">High priority for the merging.</field>
+            <field name="legend_star2">Highest priority for the merging.</field>
         </record>
         <record id="project_tt_deployment" model="project.task.type">
             <field name="sequence">20</field>
@@ -69,6 +93,9 @@
             <field name="name">Cancelled</field>
             <field name="case_default" eval="True"/>
             <field name="fold" eval="True"/>
+            <field name="legend_done">Ready to reopen.</field>
+            <field name="legend_star1">High priority for the reopen.</field>
+            <field name="legend_star2">Highest priority for the reopen.</field>
         </record>
     </data>
 
@@ -93,6 +120,12 @@
             <field name="default" eval="False"/>
             <field name="description">Task blocked</field>
         </record>
+        <record id="mt_project_task_done" model="mail.message.subtype">
+            <field name="name">Task Done</field>
+            <field name="res_model">project.task</field>
+            <field name="default" eval="False"/>
+            <field name="description">Task Done</field>
+        </record>
         <record id="mt_task_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.task</field>

=== modified file 'project/project_demo.xml'
--- project/project_demo.xml	2013-11-27 15:32:57 +0000
+++ project/project_demo.xml	2014-05-07 10:11:23 +0000
@@ -67,6 +67,7 @@
             <field name="alias_model">project.task</field>
             <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4, ref('base.user_demo'))]"/>
+            <field name="task_label">Trainings</field>
         </record>
 
         <record id="project_project_3" model="project.project">
@@ -82,6 +83,7 @@
             <field name="alias_model">project.task</field>
             <field name="privacy_visibility">employees</field>
             <field name="members" eval="[(4, ref('base.user_root')), (4,ref('base.user_demo'))]"/>
+            <field name="task_label">Designs</field>
         </record>
 
         <record id="project_project_4" model="project.project">
@@ -98,6 +100,7 @@
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
                     ref('base.user_demo')])]"/>
+            <field name="task_label">Databases</field>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -110,7 +113,7 @@
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
             <field name="stage_id" ref="project_tt_analysis"/>
@@ -120,7 +123,7 @@
             <field name="planned_hours" eval="32.0"/>
             <field name="remaining_hours" eval="32.0"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Make SRS</field>
             <field name="stage_id" ref="project_tt_specification"/>
@@ -129,7 +132,7 @@
             <field name="planned_hours" eval="10.0"/>
             <field name="remaining_hours" eval="10.0"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
             <field name="date_deadline" eval="time.strftime('%Y-%m-24')"/>
@@ -140,7 +143,7 @@
             <field name="planned_hours" eval="60.0"/>
             <field name="remaining_hours" eval="60.0"/>
             <field name="user_id" ref="base.user_demo"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Sale Management</field>
             <field name="description">Use the account_budget module</field>

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2014-04-15 12:14:04 +0000
+++ project/project_view.xml	2014-05-07 10:11:23 +0000
@@ -87,14 +87,14 @@
                         <h1>
                             <field name="name" string="Project Name"/>
                         </h1>
-                        <div name="options_active">
-                            <field name="use_tasks" class="oe_inline"/>
-                            <label for="use_tasks"/>
+                        <div name="options_active" class="oe_inline oe_left">
+                            <field name="use_tasks" class="oe_from_boolean_align"/>
+                            <label for="task_label" class="oe_edit_only"/>
+                            <b><field name="task_label" class="oe_inline"/></b>
                         </div>
                     </div>
                     <div class="oe_right oe_button_box" name="buttons" groups="base.group_user">
-                         <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}" 
-                            name="%(act_project_project_2_project_task_all)d" icon="fa-tasks">
+                        <button class="oe_inline oe_stat_button" type="object" attrs="{'invisible':[('use_tasks','=', 0)]}" name="project_tasks_action" icon="fa-tasks">
                             <field string="Tasks" name="task_count" widget="statinfo"/>
                         </button>
                         <button  class="oe_inline oe_stat_button" name="attachment_tree_view"  type="object" icon="fa-files-o">
@@ -125,9 +125,8 @@
                             </div>
                             <label for="alias_model" string="Incoming Emails create"/>
                             <field name="alias_model" class="oe_inline" nolabel="1"/>
-                            <field name="alias_contact" class="oe_inline"
-                                    string="Accept Emails From"/>
-                        </group>
+                            <field name="alias_contact" class="oe_inline" string="Accept Emails From"/>
+                         </group>
                     </group>
                     <notebook>
                         <page string="Team" name="team">
@@ -170,7 +169,13 @@
                             </group>
                         </page>
                         <page string="Project Stages" attrs="{'invisible': [('use_tasks', '=', False)]}" name="project_stages">
-                             <field name="type_ids"/>
+                            <field name="type_ids">
+                                <tree>
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="name"/>
+                                    <field name="kanban_column_tooltip" widget="tooltiphtml"/>
+                                </tree>
+                            </field>
                         </page>
                     </notebook>
                 </sheet>
@@ -264,9 +269,9 @@
                                         <span class="oe_e oe_e_alias">%%</span><small><field name="alias_id"/></small>
                                     </div>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px">
-                                            <t t-raw="record.task_ids.raw_value.length"/> Tasks
-                                        </a>
+                                        <a t-if="record.use_tasks.raw_value" name="project_tasks_action" type="object" style="margin-right: 10px"> 
+                                            <span><field name="task_count"/> <field name="task_label"/></span>
+                                         </a>
                                     </div>
                                     <div class="oe_kanban_project_list">
                                         <a t-if="record.doc_count.raw_value" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="doc_count"/> Documents</a>
@@ -379,11 +384,10 @@
                     <sheet string="Task">
                     <h1>
                         <field name="name" placeholder="Task summary..." class="oe_inline"/>
-                        <field name="kanban_state" invisible='1'/>
-                        <button name="set_kanban_state_done" help="In Progress" attrs="{'invisible': [('kanban_state', 'in', ['done','blocked'])]}" type="object" icon="gtk-normal" class="oe_link oe_right"/>
-                        <button name="set_kanban_state_blocked" help="Ready for Next Stage" attrs="{'invisible': [('kanban_state', 'in', ['normal','blocked'])]}" type="object" icon="gtk-yes" class="oe_link oe_right"/>
-                        <button name="set_kanban_state_normal" help="Blocked" attrs="{'invisible': [('kanban_state', 'in', ['done','normal'])]}" type="object" icon="gtk-no" class="oe_link oe_right"/>
                     </h1>
+                    <div class="oe_right"> 
+                        <field name="kanban_state" class="oe_inline" widget="dropdown_selection"/>
+                    </div>
                     <group>
                         <group>
                             <field name="project_id" domain="[('state', '!=', 'close')]" on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
@@ -444,7 +448,7 @@
                         </page>
                         <page string="Extra Info">
                             <group col="4">
-                                <field name="priority" groups="base.group_user"/>
+                                 <field name="priority" groups="base.group_user" widget="priority"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
@@ -477,7 +481,7 @@
                 <kanban default_group_by="stage_id" >
                     <field name="color"/>
                     <field name="priority"/>
-                    <field name="stage_id"/>
+                    <field name="stage_id" options='{"tooltip_on_group_by": "kanban_column_tooltip"}'/>
                     <field name="user_id"/>
                     <field name="user_email"/>
                     <field name="description"/>
@@ -515,16 +519,6 @@
                                     <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
                                     <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
                                 </div>
-                                <div class="oe_kanban_bottom_right">
-                                    <t groups="base.group_user">
-                                        <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                        <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
-                                        <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                        <a t-if="record.priority.raw_value > 0" type="object" string="Normal" name="set_high_priority" class="oe_e oe_star_off">7</a>
-                                        <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                    </t>
-                                    <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
-                                </div>
                                 <div class="oe_kanban_footer_left">
                                     <span groups="project.group_time_work_estimation_tasks" title="Remaining hours">
                                         <span class="oe_e">N</span>
@@ -535,6 +529,21 @@
                                     <t t-raw="record.message_summary.raw_value"/>
                                     <field name="categ_ids"/>
                                 </div>
+                                <div class="oe_kanban_bottom_right">
+                                    <table>
+                                        <tr>
+                                            <td groups="base.group_user">
+                                                <field name="kanban_state" widget="dropdown_selection"/>
+                                            </td>
+                                            <td groups="base.group_user">
+                                                <field name="priority" widget="priority"/>
+                                            </td>
+                                            <td>
+                                                <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </div>
                             </div>
                             <div class="oe_clear"></div>
                         </div>
@@ -609,8 +618,11 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//div[@name="project"]' position='inside'>
-                    <field name="use_tasks"/>
-                    <label for="use_tasks"/>
+                    <div name="options_active" class="oe_inline oe_left">
+                        <field name="use_tasks" class="oe_from_boolean_align"/>
+                        <label for="task_label" class="oe_edit_only"/>
+                        <b><field name="task_label" class="oe_inline"/></b>
+                    </div>
                 </xpath>
             </field>
         </record>
@@ -688,6 +700,7 @@
                     <group>
                         <group>
                             <field name="name"/>
+                            <field name="type" invisible="1"/>
                             <field name="sequence"/>
                         </group>
                         <group>
@@ -695,6 +708,53 @@
                             <field name="fold"/>
                         </group>
                     </group>
+                    <separator string="Legends"/>
+                    <p>The legend will appear as tooltip of each column of the tasks/issues pipe.</p>
+                    <div>
+                        <group col="3">
+                            <div width="35">
+                                <span class='status error' title="This tooltip will appear on kanban view column header."/> 
+                            </div> 
+                            <div width="400">
+                                <field name="legend_blocked" title="This tooltip will appear on kanban view column header."/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                    <div>
+                        <group col="3">
+                            <div width="35">
+                                <span class='status ok'/>  
+                            </div> 
+                            <div width="400">
+                                <field name="legend_done"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                    <div>
+                        <group col="3">
+                            <div width="35">
+                                <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">7</span>
+                            </div> 
+                            <div width="400">
+                                <field name="legend_star1"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                    <div attrs="{'invisible':[('type','=', 'task')]}">
+                        <group col="3">
+                            <div width="35">
+                                <span class="oe_e oe_star_on" title="This tooltip will appear on kanban view column header.">77</span>
+                            </div> 
+                            <div width="400">
+                                <field name="legend_star2"/>
+                            </div>
+                            <div></div>
+                        </group>
+                    </div>
+                    <separator string="Description"/>
                     <field name="description" placeholder="Add a description..."/>
                 </form>
             </field>
@@ -733,7 +793,7 @@
 
         <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1" groups="base.group_no_one"/>
 
-        <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
+        <menuitem action="open_task_type_form" name="Project Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
 

=== modified file 'project/report/project_report.py'
--- project/report/project_report.py	2014-01-29 15:24:40 +0000
+++ project/report/project_report.py	2014-05-07 10:11:23 +0000
@@ -48,7 +48,7 @@
                                        help="Number of Days to Open the task"),
         'delay_endings_days': fields.float('Overpassed Deadline', digits=(16,2), readonly=True),
         'nbr': fields.integer('# of tasks', readonly=True),
-        'priority': fields.selection([('4', 'Very Low'), ('3', 'Low'), ('2', 'Medium'), ('1', 'Urgent'), ('0', 'Very urgent')],
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')],
             string='Priority', readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),

=== modified file 'project/static/src/css/project.css'
--- project/static/src/css/project.css	2013-10-27 12:31:04 +0000
+++ project/static/src/css/project.css	2014-05-07 10:11:23 +0000
@@ -62,4 +62,8 @@
     -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
 
+.openerp .oe_form .oe_from_boolean_align{
+    vertical-align: middle;
+    margin-top: 2px;
+}
 

=== modified file 'project/static/src/js/project.js'
--- project/static/src/js/project.js	2014-04-17 09:05:15 +0000
+++ project/static/src/js/project.js	2014-05-07 10:11:23 +0000
@@ -42,4 +42,14 @@
             }
         },
     });
+
+    openerp.web.list.TooltipHtml = openerp.web.list.Column.extend({
+        format: function (row_data, options) {
+            if (row_data.kanban_column_tooltip !== undefined){
+                return row_data.kanban_column_tooltip.value.tooltip
+            }
+        }
+    });
+
+    openerp.web.list.columns.add('field.tooltiphtml', 'openerp.web.list.TooltipHtml');
 };

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2014-04-10 14:51:31 +0000
+++ project_issue/project_issue.py	2014-05-07 10:11:23 +0000
@@ -57,6 +57,7 @@
         },
         'kanban_state': {
             'project_issue.mt_issue_blocked': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'blocked',
+            'project_issue.mt_issue_done': lambda self, cr, uid, obj, ctx=None: obj.kanban_state == 'done',
         },
     }
 
@@ -75,7 +76,7 @@
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         project_id = self._get_default_project_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], project_id, [('fold', '=', False)], context=context)
+        return self.stage_find(cr, uid, [], project_id, [('sequence','=',1),('type','in',['issue','both'])], context=context)
 
     def _resolve_project_id_from_context(self, cr, uid, context=None):
         """ Returns ID of project based on the value of 'default_project_id'
@@ -108,7 +109,9 @@
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
             search_domain += ['|', ('project_ids', '=', project_id)]
-        search_domain += [('id', 'in', ids)]
+            search_domain += [('id', 'in', ids),('type', 'in', ['issue','both'])]
+        else:
+            search_domain += [('id', 'in', ids)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
@@ -250,7 +253,7 @@
                                               " * Normal is the default situation\n"
                                               " * Blocked indicates something is preventing the progress of this issue\n"
                                               " * Ready for next stage indicates the issue is ready to be pulled to the next stage",
-                                         readonly=True, required=False),
+                                         required=False),
         'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1),
         'email_cc': fields.char('Watchers Emails', size=256, 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"),
         'date_open': fields.datetime('Opened', readonly=True,select=True),
@@ -260,11 +263,11 @@
         'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
         'categ_ids': fields.many2many('project.category', string='Tags'),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
                         track_visibility='onchange', select=True,
-                        domain="[('project_ids', '=', project_id)]"),
+                        domain="[('project_ids', '=', project_id),('type','in',['issue','both'])]"),
         'project_id': fields.many2one('project.project', 'Project', track_visibility='onchange', select=True),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -295,7 +298,7 @@
         'active': 1,
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
-        'priority': crm.AVAILABLE_PRIORITIES[2][0],
+        'priority': '1',
         'kanban_state': 'normal',
         'date_last_stage_update': fields.datetime.now,
         'user_id': lambda obj, cr, uid, context: uid,
@@ -306,17 +309,9 @@
     }
 
     def set_priority(self, cr, uid, ids, priority, *args):
-        return self.write(cr, uid, ids, {'priority' : priority})
-
-    def set_high_priority(self, cr, uid, ids, *args):
-        """Set lead priority to high
-        """
-        return self.set_priority(cr, uid, ids, '1')
-
-    def set_normal_priority(self, cr, uid, ids, *args):
-        """Set lead priority to normal
-        """
-        return self.set_priority(cr, uid, ids, '3')
+        """Set lead priority
+        """
+        return self.write(cr, uid, ids, {'priority' : str(priority)})
 
     def copy(self, cr, uid, id, default=None, context=None):
         issue = self.read(cr, uid, id, ['name'], context=context)
@@ -375,15 +370,6 @@
     # Stage management
     # -------------------------------------------------------
 
-    def set_kanban_state_blocked(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context)
-
-    def set_kanban_state_normal(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context)
-
-    def set_kanban_state_done(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context)
-
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the issue:
@@ -403,7 +389,7 @@
         # OR all section_ids and OR with case_default
         search_domain = []
         if section_ids:
-            search_domain += [('|')] * (len(section_ids)-1)
+            search_domain = [('|')] * (len(section_ids)-1)
             for section_id in section_ids:
                 search_domain.append(('project_ids', '=', section_id))
         search_domain += list(domain)
@@ -514,6 +500,15 @@
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
 
+    def project_issues_action(self, cr, uid, ids, context=None):
+        data_obj = self.pool.get('ir.model.data')
+        action_obj =self.pool.get('ir.actions.act_window')
+
+        action_id = data_obj.get_object_reference(cr, uid, 'project_issue', 'act_project_project_2_project_issue_all')[1]
+        action = action_obj.read(cr, uid, action_id, [], context)
+        res = self.read(cr, uid, ids, ['issue_label'], context)[0]
+        action['name'] = res['issue_label']
+        return action
 
 class account_analytic_account(osv.Model):
     _inherit = 'account.analytic.account'
@@ -521,6 +516,10 @@
 
     _columns = {
         'use_issues': fields.boolean('Issues', help="Check this field if this project manages issues"),
+        'issue_label': fields.char('Use Issues as', size=128, help="Gives label to issues on project's kanaban view.", required=True),
+    }
+    _defaults = {
+        'issue_label': 'Issues',
     }
 
     def on_change_template(self, cr, uid, ids, template_id, date_start=False, context=None):

=== modified file 'project_issue/project_issue_data.xml'
--- project_issue/project_issue_data.xml	2014-02-21 11:27:04 +0000
+++ project_issue/project_issue_data.xml	2014-05-07 10:11:23 +0000
@@ -48,6 +48,12 @@
             <field name="default" eval="False"/>
             <field name="description">Issue blocked</field>
         </record>
+        <record id="mt_issue_done" model="mail.message.subtype">
+            <field name="name">Issue Done</field>
+            <field name="res_model">project.issue</field>
+            <field name="default" eval="False"/>
+            <field name="description">Issue Done</field>
+        </record>
         <record id="mt_issue_stage" model="mail.message.subtype">
             <field name="name">Stage Changed</field>
             <field name="res_model">project.issue</field>

=== modified file 'project_issue/project_issue_demo.xml'
--- project_issue/project_issue_demo.xml	2012-11-29 22:26:45 +0000
+++ project_issue/project_issue_demo.xml	2014-05-07 10:11:23 +0000
@@ -6,12 +6,15 @@
             <field name="use_issues" eval="True"/>
         </record>
         <record id="project.project_project_2" model="project.project">
+            <field name="issue_label">Bugs</field>
             <field name="use_issues" eval="True"/>
         </record>
         <record id="project.project_project_3" model="project.project">
+            <field name="issue_label">Feedbacks</field>
             <field name="use_issues" eval="True"/>
         </record>
         <record id="project.project_project_4" model="project.project">
+            <field name="issue_label">Bugs</field>
             <field name="use_issues" eval="True"/>
         </record>
         <record id="project.project_project_5" model="project.project">
@@ -35,7 +38,7 @@
         <!-- Issues -->
         <record id="crm_case_buginaccountsmodule0" model="project.issue">
             <field eval="time.strftime('%Y-%m-08 10:15:00')" name="date"/>
-            <field name="priority">5</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_2"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -51,7 +54,7 @@
 
         <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
             <field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -64,7 +67,7 @@
 
         <record id="crm_case_outputincorrect0" model="project.issue">
             <field eval="time.strftime('%Y-%m-18 14:30:00')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="section_id" ref="crm.section_sales_department"/>
             <field eval="1" name="active"/>
@@ -79,7 +82,7 @@
 
         <record id="crm_case_problemloadingpage0" model="project.issue">
             <field eval="time.strftime('%Y-%m-20  15:25:05')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_14"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -92,7 +95,7 @@
 
         <record id="crm_case_pagenotfound0" model="project.issue">
             <field eval="time.strftime('%Y-%m-22  18:15:00')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_13"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -105,7 +108,7 @@
 
         <record id="crm_case_programmingerror0" model="project.issue">
             <field eval="time.strftime('%Y-%m-24  09:45:00')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_5"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -172,7 +175,7 @@
 
         <record id="crm_case_newfeaturestobeadded0" model="project.issue">
             <field eval="time.strftime('%Y-%m-01 12:15:10')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_8"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -199,7 +202,7 @@
 
         <record id="crm_case_includeattendancesheetinproject0" model="project.issue">
             <field eval="time.strftime('%Y-%m-10 17:05:30')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -213,7 +216,7 @@
 
         <record id="crm_case_createnewobject0" model="project.issue">
             <field eval="time.strftime('%Y-%m-15 10:35:15')" name="date"/>
-            <field name="priority">3</field>
+            <field name="priority">1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_6"/>
             <field name="section_id" ref="crm.section_sales_department"/>
@@ -226,7 +229,7 @@
 
         <record id="crm_case_improvereportsinhrms0" model="project.issue">
             <field eval="time.strftime('%Y-%m-19 12:15:00')" name="date"/>
-            <field name="priority">4</field>
+            <field name="priority">0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_11"/>
             <field name="section_id" ref="crm.section_sales_department"/>

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2014-05-02 13:07:53 +0000
+++ project_issue/project_issue_view.xml	2014-05-07 10:11:23 +0000
@@ -55,11 +55,10 @@
                     <label for="name" class="oe_edit_only"/>
                     <h1>
                         <field name="name" class="oe_inline"/>
-                        <field name="kanban_state" invisible='1'/>
-                        <button name="set_kanban_state_done" help="In Progress" attrs="{'invisible': [('kanban_state', 'in', ['done','blocked'])]}" type="object" icon="gtk-normal" class="oe_link oe_right"/>
-                        <button name="set_kanban_state_blocked" help="Ready for Next Stage" attrs="{'invisible': [('kanban_state', 'in', ['normal','blocked'])]}" type="object" icon="gtk-yes" class="oe_link oe_right"/>
-                        <button name="set_kanban_state_normal" help="Blocked" attrs="{'invisible': [('kanban_state', 'in', ['done','normal'])]}" type="object" icon="gtk-no" class="oe_link oe_right"/>
                     </h1>
+                    <div class="oe_right"> 
+                        <field name="kanban_state" class="oe_inline" widget="dropdown_selection"/>
+                    </div>
                     <label for="categ_ids" class="oe_edit_only"/>
                     <field name="categ_ids" widget="many2many_tags"/>
                     <group>
@@ -78,7 +77,7 @@
                         <group>
                             <field name="id"/>
                             <field name="version_id" groups="base.group_user"/>
-                            <field name="priority" groups="base.group_user"/>
+                            <field name="priority" groups="base.group_user" widget="priority"/>
                             <label for="task_id" groups="base.group_user"/>
                             <div groups="base.group_user">
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
@@ -186,7 +185,7 @@
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="stage_id">
-                    <field name="stage_id"/>
+                    <field name="stage_id" options='{"tooltip_on_group_by": "kanban_column_tooltip"}'/>
                     <field name="color"/>
                     <field name="priority"/>
                     <field name="user_email"/>
@@ -220,28 +219,19 @@
                                     <div class="oe_kanban_footer_left">
                                         <field name="categ_ids"/>
                                         <div class="oe_right">
-                                            <span class="oe_kanban_highlight" groups="base.group_user">
-                                                <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                                <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
-                                                <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                                <t t-set="priority" t-value="record.priority.raw_value || 5"/>
-                                                <a type="object" name="set_priority" args="['3']" t-if="priority gt 3" title="Normal Priority">
-                                                   <img src="/web/static/src/img/icons/star-off.png" width="16" height="16"/>
-                                                </a>
-                                                <a type="object" name="set_priority" args="['5']" t-if="priority lte 3" title="Normal Priority">
-                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 3 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                                </a>
-                                                <a type="object" name="set_priority" args="['2']" title="High Priority">
-                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority lte 2 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                                </a>
-                                                <a type="object" name="set_priority" args="['1']" title="Highest Priority">
-                                                   <img t-attf-src="/web/static/src/img/icons/star-#{priority == 1 ? 'on' : 'off'}.png" width="16" height="16"/>
-                                                </a>
-                                            </span>
-                                            <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())">
-                                                <span t-attf-class="oe_kanban_status oe_kaban_status_red"> </span>
-                                            </t>
-                                            <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                            <table>
+                                                <tr>
+                                                    <td groups="base.group_user">
+                                                        <field name="kanban_state" widget="dropdown_selection"/>
+                                                    </td>
+                                                    <td groups="base.group_user">
+                                                        <field name="priority" widget="priority"/>
+                                                    </td>
+                                                    <td>
+                                                        <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
+                                                    </td>
+                                                </tr>
+                                            </table>
                                         </div>
                                     </div>
                                     <div class="oe_kanban_footer_left">
@@ -301,13 +291,16 @@
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
                 <xpath expr='//div[@name="options_active"]' position='inside'>
-                    <field name="use_issues" class="oe_inline"
+                    <div>
+                        <field name="use_issues" class="oe_inline oe_from_boolean_align"
                             on_change="on_change_use_tasks_or_issues(use_tasks, use_issues)"/>
-                    <label for="use_issues"/>
+                        <label for="issue_label" class="oe_edit_only"/>
+                       <b><field name="issue_label" class="oe_inline"/></b>
+                    </div>
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
-                    <button class="oe_inline oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', 0)]}" 
-                        name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
+                    <button class="oe_inline oe_stat_button" type="object" attrs="{'invisible':[('use_issues','=', 0)]}" 
+                        name="project_issues_action" icon="fa-bug">
                         <field string="Issues" name="issue_count" widget="statinfo"/>
                     </button>
                 </xpath>
@@ -320,6 +313,9 @@
                 <field name="sequence" position="before">
                     <field name="project_escalation_id"/>
                 </field>
+                <xpath expr='//page[@name="project_stages"]' position="attributes">
+                    <attribute name="attrs">{'invisible': [('use_issues', '=', False), ('use_tasks', '=', False)]}</attribute>
+                </xpath>
             </field>
        </record>
 
@@ -334,10 +330,8 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
-                        name="%(act_project_project_2_project_issue_all)d" type="action">
-                        <t t-raw="record.issue_ids.raw_value.length"/>
-                        <span t-if="record.issue_ids.raw_value.length == 1">Issue</span>
-                        <span t-if="record.issue_ids.raw_value.length > 1">Issues</span>
+                        name="project_issues_action" type="object">
+                        <span><field name="issue_count"/> <field name="issue_label"/></span>
                     </a>
                 </xpath>
             </field>
@@ -350,8 +344,11 @@
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
                 <xpath expr='//div[@name="project"]' position='inside'>
-                    <field name="use_issues"/>
-                    <label for="use_issues"/>
+                    <div class="oe_left">
+                        <field name="use_issues" class="oe_from_boolean_align"/>
+                        <label for="issue_label" class="oe_edit_only"/>
+                        <b><field name="issue_label" class="oe_inline"/></b>
+                    </div>
                 </xpath>
             </field>
         </record>
@@ -370,6 +367,17 @@
             </field>
         </record>
 
+        <record id="view_project_task_type_form_inherited" model="ir.ui.view">
+            <field name="name">project.task.type.form.inherited</field>
+            <field name="model">project.task.type</field>
+            <field name="inherit_id" ref="project.task_type_edit"/>
+            <field name="arch" type="xml">
+                <xpath expr='//field[@name="type"]' position="attributes">
+                    <attribute name="invisible">0</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <!-- res.partner -->
         <record model="ir.ui.view" id="res_partner_issues_button_view">
             <field name="name">res.partner.issues.button.view</field>

=== modified file 'project_issue/report/project_issue_report.py'
--- project_issue/report/project_issue_report.py	2013-10-27 12:31:04 +0000
+++ project_issue/report/project_issue_report.py	2014-05-07 10:11:23 +0000
@@ -47,7 +47,7 @@
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
         'company_id' : fields.many2one('res.company', 'Company'),
-        'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
+        'priority': fields.selection([('0','Low'), ('1','Normal'), ('2','High')], 'Priority'),
         'project_id':fields.many2one('project.project', 'Project',readonly=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'user_id' : fields.many2one('res.users', 'Assigned to',readonly=True),

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2014-04-15 12:57:15 +0000
+++ project_timesheet/project_timesheet_view.xml	2014-05-07 10:11:23 +0000
@@ -25,7 +25,7 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//div[@name="options_active"]' position='inside'>
+                <xpath expr='//div[@name="options_active"]' position='before'>
                     <field name="use_timesheets" class="oe_inline"/>
                     <label for="use_timesheets"/>
                 </xpath>