Merge lp:~openerp-dev/openobject-addons/trunk-form-v2-project-chs into lp:~openerp-dev/openobject-addons/trunk-form-v2-fme

[Christophe Simonis (OpenERP)]

mergeable ?

[lp:~openerp-dev/openobject-addons/trunk-form-v2-project-chs]

6722. By Christophe Simonis (OpenERP) on 2012-04-10

[~IMP] project_*: simplify open_* actions for project kanban view

[Antony Lesuisse (OpenERP) (al-openerp)]

Nope need cleanups [rco].

review: Needs Fixing

[Antony Lesuisse (OpenERP) (al-openerp)]

The merge should now target trunk.

Unmerged revisions

6722. By Christophe Simonis (OpenERP) on 2012-04-10

[~IMP] project_*: simplify open_* actions for project kanban view

6721. By Christophe Simonis (OpenERP) on 2012-04-10

[~FIX] project: correct kanban css

6720. By Christophe Simonis (OpenERP) on 2012-04-10

[MERGE] lp:~openerp-dev/openobject-addons/trunk-project-gallery-apa

6719. By Christophe Simonis (OpenERP) on 2012-04-10

[FIX] project: remove dependence to wiki module

6718. By Christophe Simonis (OpenERP) on 2012-04-10

[FIX] project: correct dependencies

6717. By Christophe Simonis (OpenERP) on 2012-04-10

[FIX] remove Antony's shit

6716. By Quentin (OpenERP) <email address hidden> on 2012-04-10

[IMP] sale: applied changes in sale order form view as per last trunk

6715. By Quentin (OpenERP) <email address hidden> on 2012-04-10

[FIX] base_setup: resolved tag mismatch

6714. By Antony Lesuisse (OpenERP) on 2012-04-10

crm.lead

6713. By Antony Lesuisse (OpenERP) on 2012-04-10

sale html to form

=== modified file 'project/__openerp__.py'
--- project/__openerp__.py	2012-04-10 12:09:38 +0000
+++ project/__openerp__.py	2012-04-10 16:40:13 +0000
@@ -29,7 +29,7 @@
     "sequence": 8,
     'complexity': "easy",
     "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
-    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource"],
+    "depends": ["base_setup", "product", "analytic", "board",  "mail", "resource","web_kanban"],
     "description": """
 Project management module tracks multi-level projects, tasks, work done on tasks, eso.
 ======================================================================================
@@ -70,6 +70,8 @@
     'installable': True,
     'auto_install': False,
     'application': True,
+    'css': ['static/src/css/project.css'],
+    'js': ['static/src/js/dropdown.js','static/src/js/project.js'],
     'certificate': '0075116868317',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'project/project.py'
--- project/project.py	2012-04-03 17:21:08 +0000
+++ project/project.py	2012-04-10 16:40:13 +0000
@@ -154,6 +154,14 @@
             if proj.tasks:
                 raise osv.except_osv(_('Operation Not Permitted !'), _('You cannot delete a project containing tasks. I suggest you to desactivate it.'))
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
+    
+    def _open_task(self, cr, uid, ids, field_name, arg, context=None):
+        open_task={}
+        task_pool=self.pool.get('project.task')
+        for id in ids:
+            task_ids = task_pool.search(cr, uid, [('project_id', '=', id)])
+            open_task[id] = len(task_ids)
+        return open_task
 
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
@@ -191,7 +199,35 @@
         'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
+        'task': fields.boolean('Task',help = "If you check this field tasks appears in kanban view"),
+        'open_task': fields.function(_open_task , type='integer',string="Open Tasks"),
+        'color': fields.integer('Color Index'),
      }
+    def dummy(self, cr, uid, ids, context=None):
+            return False
+         
+    def open_tasks(self, cr, uid, ids, context=None):
+        #Open the View for the Tasks for the project
+        """
+        This opens Tasks views
+        @return :Dictionary value for task view
+        """
+        if context is None:
+            context = {}
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
+            'name': _('Task'),
+            'context': context,
+            'view_type': 'form',
+            'view_mode': 'kanban,tree,calendar,form',
+            'res_model': 'project.task',
+            'view_id': False,
+            'domain':[('project_id','in',ids)],
+            'type': 'ir.actions.act_window',
+            'nodestroy': True
+        }
+    
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('project_default','=',1)], context=context)
         return ids
@@ -201,7 +237,8 @@
         'active': True,
         'priority': 1,
         'sequence': 10,
-        'type_ids': _get_type_common
+        'type_ids': _get_type_common,
+        'task' : True,
     }
 
     # TODO: Why not using a SQL contraints ?
@@ -720,6 +757,7 @@
         'sequence': 10,
         'active': True,
         'user_id': lambda obj, cr, uid, context: uid,
+        'project_id':lambda self, cr, uid, context: context.get('active_id',False),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
     }
 

=== modified file 'project/project_view.xml'
--- project/project_view.xml	2012-04-10 12:09:38 +0000
+++ project/project_view.xml	2012-04-10 16:40:13 +0000
@@ -19,7 +19,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project">
-                    <group colspan="6" col="6">
+                    <group colspan="4" col="6">
                         <field name="name" string="Project Name" select="1"/>
                         <field name="analytic_account_id" invisible="1" required="0"/>
                         <field name="parent_id" string="Parent" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
@@ -30,12 +30,17 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Administration">
+                            <group col="2" colspan="2" name="kanban">
+                                <separator colspan="2" string="Project Management"/>
+                                    <field name="task"/>
+                            </group>
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Performance"/>
+                                <separator colspan="4" string="Performance"/>
                                 <field name="planned_hours" widget="float_time"/>
                                 <field name="effective_hours" widget="float_time" />
                                 <field name="resource_calendar_id"/>
                             </group>
+                            <newline/>
                             <group col="2" colspan="2" name="misc">
                                 <separator colspan="4" string="Miscelleanous"/>
                                 <field name="company_id" select="1" groups="base.group_multi_company" widget="selection" required="1"/>
@@ -154,6 +159,86 @@
                 </tree>
             </field>
         </record>
+        
+        <record model="ir.ui.view" id="view_project_kanban">
+            <field name="name">project.project.kanban</field>
+            <field name="model">project.project</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="effective_hours"/>
+                    <field name="total_hours"/>
+                    <field name="date"/>
+                    <field name="name"/>
+                    <field name="members"/>
+                    <field name="task"/>
+                    <field name="user_id"/>
+                    <field name="date"/>
+                    <field name="color"/>
+                    <field name="open_task"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="project_vignettes">
+                                <li t-attf-class="oe_project_kanban_vignette #{kanban_color(record.color.raw_value)}">
+                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="oe_i">B</span></a>
+                                    <ul class="dropdown-menu">
+                                      <li ><a type="edit" >Edit...</a></li>
+                                      <li ><a type="delete">Delete</a></li>
+                                      <!--li>
+                                        <ul class="color-chooser">
+                                            <li><a t-att-id="record.id.value" class="bgcolor_steelblue"><span class="steelblue square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor_firebrick"><span class="firebrick square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor_khaki"><span class="khaki square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor_thistle"><span class="thistle square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor_orange"><span class="orange square"></span></a></li>
+                                        </ul>
+                                      </li-->
+                                    </ul>
+                                    <h4><t t-esc="record.name.value.substr(0,32)"/><t t-if="record.name.value.length > 32">...</t></h4>
+                                    <h4 id="list" height="10px">
+                                        <a id="1">
+                                            <t t-if="record.task.raw_value">
+                                                <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><t t-if="record.open_task.value &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</button>
+                                            </t>
+                                        </a>
+                                    </h4>
+                                    <br />
+                                    <button class="click_button" type="object">
+                                        <table class="project_fields">
+                                            <tr id="deadline" t-if="record.date.raw_value">
+                                                <th align="left">Deadline</th>
+                                                <td align="left">
+                                                    <t t-esc="record.date.raw_value.toString('MMMM')"/> 
+                                                    <t t-esc="record.date.raw_value.getDate()"/>,
+                                                    <t t-esc="record.date.raw_value.getFullYear()"/>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th align="left" width="70px">Progress</th>
+                                                <td align="left">
+                                                    <t t-esc="Math.round(record.effective_hours.raw_value/24)"/>/<t t-esc="Math.round(record.total_hours.raw_value/24)"/> days
+                                                </td>
+                                            </tr>
+                                        </table>
+                                        <t t-if="record.members.raw_value.length > 7">
+                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
+                                            </t>
+                                        </t>
+                                        <t t-if="record.members.raw_value.length &lt;= 7">
+                                            <br/><br/>
+                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
+                                            </t>
+                                        </t>
+                                    </button>
+                                </li>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
 
        <record id="view_project_project_gantt" model="ir.ui.view">
             <field name="name">project.project.gantt</field>
@@ -170,8 +255,8 @@
             <field name="res_model">project.project</field>
             <field name="view_type">form</field>
             <field name="domain">[]</field>
-            <field name="view_mode">tree,form,gantt</field>
-            <field name="view_id" ref="view_project"/>
+            <field name="view_mode">kanban,tree,form,gantt</field>
+            <field name="view_id" ref="view_project_kanban"/>
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
             <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field>
@@ -621,10 +706,10 @@
 
         <menuitem id="menu_tasks_config" name="GTD" parent="project.menu_definitions" sequence="1"/>
 
-        <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
+        <menuitem id="menu_project_config_project" name="Stages" parent="menu_definitions" sequence="1"/>
 
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2" groups="base.group_no_one"/>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1" groups="base.group_no_one"/>
+        <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 

=== added directory 'project/static/src/css'
=== added file 'project/static/src/css/project.css'
--- project/static/src/css/project.css	1970-01-01 00:00:00 +0000
+++ project/static/src/css/project.css	2012-04-10 16:40:13 +0000
@@ -0,0 +1,231 @@
+.project_fields {
+  margin-top: 1px;
+  margin-bottom: 1px;
+  font-size: 11px;
+  }
+.project_fields td {
+    border: none;
+    padding: 2px 0 2px 8px; }
+.project_fields th {
+    padding: 0;
+    border-right: 1px solid #dddddd;
+    vertical-align: top;
+    margin-right: 8px; }
+    
+  .project_vignettes li {
+    float: left; }
+  .project_vignettes .project_avatar {
+    width: 28px;
+    height: 28px; }
+  .project_vignettes .project_fields {
+    width: 100%; }
+    .project_vignettes .project_fields th {
+      font-weight: normal; }
+    .project_vignettes .project_fields td {
+      color: #888888; }
+  .project_vignettes h4 a {
+    color: #4c4c4c; }
+
+
+  .project_vignettes > li h4 {
+    margin-bottom: 2px; }
+    
+.oe_project_buttons {
+    padding: 0px 0px !important;
+    background: none !important;
+    background-color: transparent !important;
+    border: hidden !important;
+    color: #8A89BA !important;
+
+}
+
+.oe_project_buttons:hover {
+   cursor: pointer;
+   color: #0000FF;
+}
+
+.project_avatar {
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); }
+
+  
+.click_button {
+    background: none !important;
+    background-color: transparent !important;
+    border: hidden !important;
+    min-height: 155px;
+    min-width: 265px;
+    border: hidden;
+    margin-left: 6px !important;
+    margin-top: 3px !important;
+    text-align:  left;
+    vertical-align:  super;
+    font-size: 11px;
+}
+
+.dropdown-menu {
+  display: none;
+  position: absolute; }
+
+.dropdown {
+  position: relative; }
+
+.dropdown-toggle:after {
+  width: 0;
+  height: 0;
+  display: inline-block;
+  content: "&darr";
+  text-indent: -99999px;
+  vertical-align: top;
+  margin-top: 8px;
+  margin-left: 4px;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid white;
+  filter: alpha(opacity=50);
+  -khtml-opacity: 0.5;
+  -moz-opacity: 0.5;
+  opacity: 0.5; }
+
+
+ .oe_project_kanban_vignette .dropdown-menu .color-chooser {
+  padding: 0 3px; }
+  .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
+    float: left; }
+    .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
+      padding: 2px; }
+a.oe_project_kanban_action {
+  position: absolute;
+  right: 0;
+  display: none;
+   }
+  a.oe_project_kanban_action:hover {
+    text-decoration: none; }
+  a.oe_project_kanban_action .oe_i {
+    color: #4c4c4c; }
+.square {
+  display: inline-block;
+  width: 18px;
+  height: 18px; }
+
+.oe_kanban_color_1 {
+    background: steelblue;
+}
+.oe_kanban_color_2 {
+    background: firebrick;
+}
+.oe_kanban_color_3 {
+    background: khaki;
+}
+.oe_kanban_color_4 {
+    background: thistle;
+}
+.oe_kanban_color_5 {
+    background: orange;
+}
+
+
+.steelblue {
+  background: steelblue; }
+
+.firebrick {
+  background: firebrick; }
+
+.khaki {
+  background: khaki; }
+
+.thistle {
+  background: thistle; }
+
+.orange {
+  background: orange; }
+.open {
+  display: block;
+  }
+  .open .dropdown-menu {
+    display: block; }
+
+
+a.oe_project_kanban_action {
+  position: absolute;
+  right: 0;
+ }
+  a.oe_project_kanban_action:hover {
+    text-decoration: none;
+    }
+  a.oe_project_kanban_action .eo_i {
+    color: #4c4c4c; }
+
+
+.oe_project_kanban_vignette {
+  position: relative;
+  min-height: 50px;
+  background: white;
+  border: 1px solid #d8d8d8;
+  border-bottom-color: #b9b9b9;
+  padding: 6px;
+  margin: 6px 0;
+  display: inline-block;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px; 
+
+}
+  .oe_project_kanban_vignette:last-child {
+    margin-bottom: 0; }
+  .oe_project_kanban_vignette:hover {
+    -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+    -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);
+    -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); }
+  .oe_project_kanban_vignette h4 {
+    margin: 0 0 2px; }
+
+
+.oe_project_kanban_vignette .dropdown-menu {
+  top: 30px;
+  right: -140px;
+  padding: 4px;
+  border: 1px solid #afafb6;
+  width: 160px;
+  overflow-x: hidden;
+  z-index: 900;
+  background: white;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); }
+  .oe_project_kanban_vignette .dropdown-menu p {
+    margin-left: 12px; }
+  .oe_project_kanban_vignette .dropdown-menu li {
+    float: none;
+    display: block;
+    background-color: none; }
+    .oe_project_kanban_vignette .dropdown-menu li a {
+      display: block;
+      padding: 3px 6px;
+      clear: both;
+      font-weight: normal;
+      line-height: 14px;
+      color: #4c4c4c;
+      text-decoration: none; }
+      .oe_project_kanban_vignette .dropdown-menu li a:hover {
+        background: #f0f0fa;
+        background: -moz-linear-gradient(#f0f0fa, #eeeef6);
+        background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6));
+        background: -webkit-linear-gradient(#f0f0fa, #eeeef6);
+        -moz-box-shadow: none;
+        -webkit-box-shadow: none;
+        -box-shadow: none; }
+
+.oe_project_kanban_vignette .dropdown-menu .color-chooser {
+  padding: 0 3px; }
+  .oe_project_kanban_vignette .dropdown-menu .color-chooser li {
+    float: left; }
+    .oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
+      padding: 2px; }

=== added file 'project/static/src/img/tasks_icon.png'
Binary files project/static/src/img/tasks_icon.png	1970-01-01 00:00:00 +0000 and project/static/src/img/tasks_icon.png	2012-04-10 16:40:13 +0000 differ
=== added directory 'project/static/src/js'
=== added file 'project/static/src/js/dropdown.js'
--- project/static/src/js/dropdown.js	1970-01-01 00:00:00 +0000
+++ project/static/src/js/dropdown.js	2012-04-10 16:40:13 +0000
@@ -0,0 +1,92 @@
+/* ============================================================
+ * bootstrap-dropdown.js v2.0.2
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle="dropdown"]'
+    , Dropdown = function ( element ) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function ( e ) {
+      var $this = $(this)
+        , selector = $this.attr('data-target')
+        , $parent
+        , isActive
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.length || ($parent = $this.parent())
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+      !isActive && $parent.toggleClass('open')
+
+      return false
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).parent().removeClass('open')
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  $.fn.dropdown = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(function () {
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+  })
+
+}( window.jQuery );
\ No newline at end of file

=== added file 'project/static/src/js/project.js'
--- project/static/src/js/project.js	1970-01-01 00:00:00 +0000
+++ project/static/src/js/project.js	2012-04-10 16:40:13 +0000
@@ -0,0 +1,71 @@
+openerp.project = function(openerp) {
+    openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({
+        
+        bind_events: function() {
+            self = this;
+            if(this.view.dataset.model == 'project.project') {
+                //open dropdwon when click on the icon.
+                $('.dropdown-toggle').dropdown();
+                
+                //show and hide the dropdown icon when mouseover and mouseour.
+                $('.oe_project_kanban_vignette').mouseover(function() {
+                    return $(this).find('.oe_project_kanban_action').show();
+                    }).mouseout(function() {
+                    return $(this).find('.oe_project_kanban_action').hide();
+                });
+                
+                //set avatar title for members.
+                _.each($(this.$element).find('.project_avatar'),function(avatar){
+                    var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id','=',avatar.id]]);
+                    dataset.read_slice(['name']).then(function(result){
+                    avatar.setAttribute("title",result[0].name)
+                    });
+                 });
+                
+                //if task is true , then open the task when click on the anywhere in the box.
+                if(this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks');
+                if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy');
+                
+                // set sequence like Tasks,Issues,Timesheets and Phases
+                my_list = $("#list a")
+                my_list.sort(function (a, b) {
+                    var aValue = parseInt(a.id);
+                    var bValue = parseInt(b.id);
+                    // ASC
+                    //return aValue == bValue ? 0 : aValue < bValue ? -1 : 1;
+                    // DESC
+                    return aValue == bValue ? 0 : aValue < bValue ? -1 : 1;
+                  });
+                $('#list').replaceWith(my_list);
+                
+                // set background color
+                this.$element.find('.bgcolor_steelblue').click(function(){
+                    $(this).closest('li.oe_project_kanban_vignette').removeClass().addClass('oe_project_kanban_vignette ' + self.kanban_color(1));
+                    self.view.dataset.write(parseInt(this.id), {color:1});
+                });
+                
+                this.$element.find('.bgcolor_firebrick').click(function(){
+                    $(this).closest('li.oe_project_kanban_vignette').removeClass().addClass('oe_project_kanban_vignette ' + self.kanban_color(2));
+                    self.view.dataset.write(parseInt(this.id), {color:2});
+                });
+                
+                this.$element.find('.bgcolor_khaki').click(function(){
+                    $(this).closest('li.oe_project_kanban_vignette').removeClass().addClass('oe_project_kanban_vignette ' + self.kanban_color(3));
+                    self.view.dataset.write(parseInt(this.id), {color:3});
+                });
+                
+                this.$element.find('.bgcolor_thistle').click(function(){
+                    $(this).closest('li.oe_project_kanban_vignette').removeClass().addClass('oe_project_kanban_vignette ' + self.kanban_color(4));
+                    self.view.dataset.write(parseInt(this.id), {color:4});
+                });
+                
+                this.$element.find('.bgcolor_orange').click(function(){
+                    $(this).closest('li.oe_project_kanban_vignette').removeClass().addClass('oe_project_kanban_vignette ' + self.kanban_color(5));
+                    self.view.dataset.write(parseInt(this.id), {color:5});
+                });
+                
+            };
+            self._super();
+        }
+    });
+}

=== modified file 'project_issue/__openerp__.py'
--- project_issue/__openerp__.py	2012-03-14 12:32:06 +0000
+++ project_issue/__openerp__.py	2012-04-10 16:40:13 +0000
@@ -64,6 +64,7 @@
     'installable': True,
     'auto_install': False,
     'application': True,
+    'js': ['static/src/js/project_issue.js'],
     'certificate' : '001236490750848623845',
 }
 

=== modified file 'project_issue/project_issue.py'
--- project_issue/project_issue.py	2012-04-03 17:21:08 +0000
+++ project_issue/project_issue.py	2012-04-10 16:40:13 +0000
@@ -222,6 +222,16 @@
             }),
     }
 
+    def _get_project(self, cr, uid, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if user.context_project_id:
+            return user.context_project_id.id
+        else:
+            project_id = context.get('active_id',False)
+            return project_id
+
+    def on_change_project(self, cr, uid, ids, project_id, context=None):
+        return {}
 
     _defaults = {
         'active': 1,
@@ -506,10 +516,47 @@
 
 class project(osv.osv):
     _inherit = "project.project"
+
+    def _compute_issue(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        issue_pool=self.pool.get('project.issue')
+        for project in self.browse(cr, uid, ids, context=context):
+            issues = issue_pool.search(cr, uid, [('project_id','=',project.id)])
+            res[project.id] = len(issues)
+        return res
+
     _columns = {
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'reply_to' : fields.char('Reply-To Email Address', size=256)
-    }
+        'reply_to' : fields.char('Reply-To Email Address', size=256),
+        'issues' : fields.boolean('Issues',help = "If you check this field issues are appears in kanban view"),
+        'total_issues': fields.function(_compute_issue , type='integer',string="Issue"),
+    }
+    
+    _defaults = {
+        'issues' : True,
+    }
+
+    def open_issues(self, cr, uid, ids, context=None):
+        #Open the View for the Tasks for the project
+        """
+        This opens Issues views
+        @return :Dictionary value for issue view
+        """
+        if context is None:
+            context = {}
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
+            'name': _('Issue'),
+            'view_type': 'form',
+            'view_mode': 'kanban,tree,calendar,form',
+            'res_model': 'project.issue',
+            'view_id': False,
+            'domain':[('project_id','in',ids)],
+            'context': context,
+            'type': 'ir.actions.act_window',
+            'nodestroy': True
+        }
 
     def _check_escalation(self, cr, uid, ids, context=None):
         project_obj = self.browse(cr, uid, ids[0], context=context)

=== modified file 'project_issue/project_issue_menu.xml'
--- project_issue/project_issue_menu.xml	2012-04-05 16:55:29 +0000
+++ project_issue/project_issue_menu.xml	2012-04-10 16:40:13 +0000
@@ -54,6 +54,7 @@
             view_mode="tree,form,calendar,graph"
             view_type="form"/>
 
+
     <menuitem name="Issues" id="menu_project_issue_track"  parent="project.menu_project_management"
             action="project_issue_categ_act0" sequence="15"/>
 </data>

=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml	2012-04-03 10:24:08 +0000
+++ project_issue/project_issue_view.xml	2012-04-10 16:40:13 +0000
@@ -343,12 +343,37 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+            	<xpath expr="//field[@name='task']" position="after">
+                    <field name="issues"/>
+                </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
                     <field name="reply_to"/>
                 </field>
             </field>
        </record>
+        
+        <record id="view_project_kanban_inherited" model="ir.ui.view">
+            <field name="name">project.project.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="arch" type="xml">
+                <field name="task" position="after">
+                    <field name="issues"/>
+                    <field name="total_issues" invisible="1"/>
+                </field>
+                <xpath expr="//h4[@id='list']" position="inside">
+                    <a id="2">
+                        <t t-if="record.issues.raw_value">
+                            <button name="open_issues" class="oe_project_buttons" type="object"><t t-if="record.total_issues.value &lt;= 1"> Issue</t><t t-if="record.total_issues.value > 1"> Issues</t>(<t t-esc="record.total_issues.value"/>)</button>
+                        </t>
+                    </a>
+                </xpath>
+            </field>
+        </record>
+        
+        
 
     </data>
 </openerp>

=== added file 'project_issue/static/src/img/issue_icon.png'
Binary files project_issue/static/src/img/issue_icon.png	1970-01-01 00:00:00 +0000 and project_issue/static/src/img/issue_icon.png	2012-04-10 16:40:13 +0000 differ
=== added directory 'project_issue/static/src/js'
=== added file 'project_issue/static/src/js/project_issue.js'
--- project_issue/static/src/js/project_issue.js	1970-01-01 00:00:00 +0000
+++ project_issue/static/src/js/project_issue.js	2012-04-10 16:40:13 +0000
@@ -0,0 +1,14 @@
+openerp.project_issue = function(openerp) {
+    openerp.web_kanban.ProjectIssueKanban = openerp.web_kanban.KanbanRecord.include({
+        bind_events: function() {
+            self = this;
+            self._super();
+            if(this.view.dataset.model == 'project.project') {
+	            if(this.record.task.raw_value && this.record.issues.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks');
+	            if(!this.record.task.raw_value && this.record.issues.raw_value)$(this.$element).find('.click_button').attr('data-name','open_issues');
+	            //if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy');
+            };
+            	
+        }
+    });
+}

=== modified file 'project_long_term/project_long_term.py'
--- project_long_term/project_long_term.py	2012-01-31 13:36:57 +0000
+++ project_long_term/project_long_term.py	2012-04-10 16:40:13 +0000
@@ -123,6 +123,7 @@
     _defaults = {
         'state': 'draft',
         'sequence': 10,
+        'project_id':lambda self, cr, uid, context: context.get('active_id',False),
         'product_uom': lambda self,cr,uid,c: self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Day'))], context=c)[0]
     }
     _order = "project_id, date_start, sequence"
@@ -215,9 +216,46 @@
 
 class project(osv.osv):
     _inherit = "project.project"
+    
+    def _open_phase(self, cr, uid, ids, field_name, arg, context=None):
+        open_phase={}
+        phase_pool=self.pool.get('project.phase')
+        for id in ids:
+            phase_ids = phase_pool.search(cr, uid, [('project_id', '=', id)])
+            open_phase[id] = len(phase_ids)
+        return open_phase
+     
     _columns = {
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
-    }
+        'phases' : fields.boolean('Phase',help = "If you check this field Phases are appears in kanban view"),
+        'open_phases' : fields.function(_open_phase , type='integer',string="Open Phases"),
+        
+    }
+    _defaults = {
+        'phases' : True,
+    }
+    def open_phase(self, cr, uid, ids, context=None):
+        #Open the View for the Tasks for the project
+        """
+        This opens Tasks views
+        @return :Dictionary value for task view
+        """
+        if context is None:
+            context = {}
+        if ids:
+            context = dict(context, search_default_project_id=ids[0])
+        return {
+                'name': _('Phase'),
+                'view_type': 'form',
+                'view_mode': 'tree,calendar,form',
+                'res_model': 'project.phase',
+                'view_id': False,
+                'domain':[('project_id','in',ids)],
+                'context': context,
+                'type': 'ir.actions.act_window',
+                'nodestroy': True
+            }
+    
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):

=== modified file 'project_long_term/project_long_term_view.xml'
--- project_long_term/project_long_term_view.xml	2012-03-05 09:57:29 +0000
+++ project_long_term/project_long_term_view.xml	2012-04-10 16:40:13 +0000
@@ -98,6 +98,38 @@
     # Project Phase
     # ------------------------------------------------------
 
+        <record id="project_phase_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Phase</field>
+            <field name="model">project.project</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="project.edit_project"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='task']" position="after">
+                    <field name="phases"/>
+                </xpath>
+            </field>
+        </record>
+        
+        <record id="view_project_kanban_phase" model="ir.ui.view">
+            <field name="name">project.project.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="arch" type="xml">
+                <field name="task" position="after">
+                    <field name="phases"/>
+                    <field name="open_phases"/>
+                </field>
+                <xpath expr="//h4[@id='list']" position="inside">
+                    <a id="4">
+                        <t t-if="record.phases.raw_value">
+                            <button name="open_phase" class="oe_project_buttons" type="object"><t t-if="record.open_phases.value &lt;= 1"> Phase</t><t t-if="record.open_phases.value > 1"> Phases</t>(<t t-esc="record.open_phases.value"/>)</button>
+                        </t>
+                    </a>
+                </xpath>
+            </field>
+        </record>
+        
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
             <field name="model">project.phase</field>

=== added directory 'project_long_term/static'
=== added directory 'project_long_term/static/src'
=== added directory 'project_long_term/static/src/img'
=== added file 'project_long_term/static/src/img/phases_icon.jpg'
Binary files project_long_term/static/src/img/phases_icon.jpg	1970-01-01 00:00:00 +0000 and project_long_term/static/src/img/phases_icon.jpg	2012-04-10 16:40:13 +0000 differ
=== modified file 'project_timesheet/__openerp__.py'
--- project_timesheet/__openerp__.py	2012-01-31 13:36:57 +0000
+++ project_timesheet/__openerp__.py	2012-04-10 16:40:13 +0000
@@ -44,6 +44,7 @@
     ],
     'installable': True,
     'auto_install': False,
+    'js': ['static/src/js/project_timesheet.js'],
     'certificate': '0075123647453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'project_timesheet/project_timesheet.py'
--- project_timesheet/project_timesheet.py	2012-01-31 13:36:57 +0000
+++ project_timesheet/project_timesheet.py	2012-04-10 16:40:13 +0000
@@ -29,6 +29,43 @@
 class project_project(osv.osv):
     _inherit = 'project.project'
 
+    def _to_invoice(self, cr, uid, ids,field_name, arg, context=None):
+        res = {}
+        aal_pool = self.pool.get("account.analytic.line")
+        for project in self.browse(cr,uid,ids,context=context):
+            line_ids = aal_pool.search(cr, uid, [('account_id','=',project.analytic_account_id.id),('to_invoice','=',1),('invoice_id','=',False)])
+            res[project.id] = {
+                    'amt_to_invoice': 0.0,
+                    'hrs_to_invoice': 0.0,
+                }
+            if line_ids:
+                amt_to_invoice,hrs_to_invoice = 0.0,0.0
+                for line in aal_pool.browse(cr,uid,line_ids,context=context):
+                    amt_to_invoice += line.amount
+                    hrs_to_invoice += line.unit_amount
+                res[project.id]['amt_to_invoice'] = (amt_to_invoice)*-1
+                res[project.id]['hrs_to_invoice'] = hrs_to_invoice
+            
+        return res
+    
+    def _compute_timesheet(self, cr, uid, ids, field_name, arg, context=None):
+        res={}
+        aal_pool=self.pool.get('account.analytic.line')
+        for project in self.browse(cr, uid, ids, context=context):
+            timesheet = aal_pool.search(cr, uid, [("account_id","=", project.analytic_account_id.id)])
+            res[project.id] = len(timesheet)
+        return res
+
+    _columns = {
+        'timesheets' : fields.boolean('Timesheets',help = "If you check this field timesheets appears in kanban view"),
+        'amt_to_invoice': fields.function(_to_invoice,string="Amount to Invoice",multi="sums"),
+        'hrs_to_invoice': fields.function(_to_invoice,string="Hours to Invoice",multi="sums"),
+        'total_timesheet': fields.function(_compute_timesheet , type='integer',string="Issue"),
+    }
+    _defaults = {
+        'timesheets' : True,
+    }
+
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
         if part and res and ('value' in res):
@@ -40,6 +77,29 @@
                 res['value'].update({'to_invoice': factor_id})
         return res
 
+    def open_timesheets(self, cr, uid, ids, context=None):
+        #Open the View for the Timesheet of the project
+        """
+        This opens Timesheets views
+        @return :Dictionary value for timesheet view
+        """
+        if context is None:
+            context = {}
+        if ids:
+            project = self.browse(cr, uid, ids[0], context=context)
+            context = dict(context, search_default_account_id=project.analytic_account_id.id)
+
+        return {
+                'name': _('Bill Tasks Works'),
+                'context': context,
+                'view_type': 'form',
+                'view_mode': 'tree,form',
+                'res_model': 'account.analytic.line',
+                'view_id': False,
+                'type': 'ir.actions.act_window',
+                'nodestroy': True
+            }
+
 project_project()
 
 class project_work(osv.osv):

=== modified file 'project_timesheet/project_timesheet_view.xml'
--- project_timesheet/project_timesheet_view.xml	2012-04-03 08:27:56 +0000
+++ project_timesheet/project_timesheet_view.xml	2012-04-10 16:40:13 +0000
@@ -7,6 +7,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
+            	<xpath expr="//field[@name='task']" position='after'>
+		    		<field name="timesheets"/>
+		    		<field name="amt_to_invoice" invisible="True"/>
+		    		<field name="hrs_to_invoice" invisible="True"/>
+                </xpath>
+            
                 <field name="warn_customer" position="after">
                     <group colspan="4" col="4">
                         <separator colspan="4" string="Invoicing Data"/>
@@ -19,6 +25,42 @@
             </field>
         </record>
 
+        <record id="view_project_kanban_inherited" model="ir.ui.view">
+            <field name="name">project.project.kanban.inherited</field>
+            <field name="model">project.project</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="arch" type="xml">
+                  <field name="task" position="after">
+                    <field name="timesheets"/>
+                    <field name="total_timesheet"/>
+		    <field name="currency_id"/>
+                </field>
+		<xpath expr="//h4[@id='list']" position="inside">
+		    <a id="3">
+			<t t-if="record.timesheets.raw_value">
+			    <button name="open_timesheets" class="oe_project_buttons" type="object"><t t-if="record.total_timesheet.value &lt;= 1"> Timesheet</t><t t-if="record.total_timesheet.value &gt; 1"> Timesheets</t>(<t t-esc="record.total_timesheet.value"/>)</button>
+			</t>
+		    </a>
+		</xpath>
+
+		<xpath expr="//tr[@id='deadline']" position="before">
+		    <tr >
+			<th align="left">To invoice</th>
+			<td align="left">
+			    <field name="amt_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/>
+			</td>
+		    </tr>
+		    <tr>
+			<th align="left">To hours</th>
+			<td align="left">
+			    <field name="hrs_to_invoice"/> h
+			</td>
+		    </tr>
+		</xpath>
+            </field>
+        </record>
+
         <record id="project_invoice_form_cutomer" model="ir.ui.view">
             <field name="name">Inherit project form : Customer</field>
             <field name="model">project.project</field>

=== added directory 'project_timesheet/static'
=== added directory 'project_timesheet/static/src'
=== added directory 'project_timesheet/static/src/img'
=== added file 'project_timesheet/static/src/img/timesheet_icon.png'
Binary files project_timesheet/static/src/img/timesheet_icon.png	1970-01-01 00:00:00 +0000 and project_timesheet/static/src/img/timesheet_icon.png	2012-04-10 16:40:13 +0000 differ
=== added directory 'project_timesheet/static/src/js'
=== added file 'project_timesheet/static/src/js/project_timesheet.js'
--- project_timesheet/static/src/js/project_timesheet.js	1970-01-01 00:00:00 +0000
+++ project_timesheet/static/src/js/project_timesheet.js	2012-04-10 16:40:13 +0000
@@ -0,0 +1,21 @@
+openerp.project_timesheet = function(openerp) {
+    openerp.web_kanban.ProjectTimeSheetKanban = openerp.web_kanban.KanbanRecord.include({
+        bind_events: function() {
+            self = this;
+            self._super();
+            if(this.view.dataset.model == 'project.project') {
+            	function include(arr, obj) {
+				    for(var i=0; i<arr.length; i++) {
+				        if (arr[i] == obj) return true;
+				    }
+				}
+            	if(include(this.view.fields_keys,"issues"))
+            	{
+            		if(!this.record.task.raw_value && !this.record.issues.raw_value && this.record.timesheets.raw_value)$(this.$element).find('.click_button').attr('data-name','open_timesheets');
+	            //if(!this.record.task.raw_value)$(this.$element).find('.click_button').attr('data-name','dummy');
+            	};
+            	if(this.record.task.raw_value && this.record.timesheets.raw_value)$(this.$element).find('.click_button').attr('data-name','open_tasks');
+            };
+        }
+    });
+}