From 1230d84a51162ce87ae5553ad86a0b33cde00b76 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 22 Oct 2011 17:55:30 +0200
Subject: [FIX] project kanban view

bzr revid: al@openerp.com-20111022155530-riqenl9r1hqwijss
---
 addons/project/project_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f8eec371d48..b2c0b3e86e5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -321,6 +321,8 @@
             <field name="type">kanban</field>
             <field name="arch" type="xml">
                 <kanban default_group_by="type_id" >
+                    <field name="color"/>
+                    <field name="priority"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type_id.raw_value)"/>
-- 
cgit v1.2.3


From 07470bbe388a0066f8db7a7a728397b475905a7c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Sat, 22 Oct 2011 21:20:44 +0200
Subject: [FIX] project kanban view

bzr revid: al@openerp.com-20111022192044-8d3pdajgw0e8upc5
---
 addons/project/project_view.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b2c0b3e86e5..94724993a9d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -323,6 +323,8 @@
                 <kanban default_group_by="type_id" >
                     <field name="color"/>
                     <field name="priority"/>
+                    <field name="state"/>
+                    <field name="type_id"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type_id.raw_value)"/>
-- 
cgit v1.2.3


From 17dfb2256d1b8ae477c8d9b63a72d90c6b92dbba Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 25 Oct 2011 18:58:10 +0200
Subject: [IMP] Improved project.task kanban view

[ADD] Added static folder structure for the pad image

[FIX] Added relation for field user_email. Using user_id for gravatar won't work.

bzr revid: fme@openerp.com-20111025165810-eu5718pd0p2dagib
---
 addons/project/project_view.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 94724993a9d..3f638000b40 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -325,8 +325,10 @@
                     <field name="priority"/>
                     <field name="state"/>
                     <field name="type_id"/>
+                    <field name="user_email"/>
                     <templates>
                         <t t-name="kanban-box">
+                            <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t>
                             <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type_id.raw_value)"/>
                             <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_kanban_box oe_kanban_color_border">
@@ -338,7 +340,7 @@
                                                 <field name="name"/>
                                             </td>
                                             <td valign="top" width="22">
-                                                <img t-att-src="kanban_gravatar(record.user_id.value, 22)" class="oe_kanban_gravatar"/>
+                                                <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar"/>
                                             </td>
                                         </tr>
                                     </table>
@@ -350,9 +352,7 @@
                                             <field name="project_id"/>
                                         </div>
                                         <div class="oe_kanban_small">
-                                            <a target="_blank" t-att-href="'http://pad.openerp.com/'+record.name.raw_value.toLowerCase().replace(' ','-')">
-                                                http://pad.openerp.com/<t t-esc="record.name.raw_value.toLowerCase().replace(' ','-')"/>
-                                            </a>
+                                            <a target="_blank" t-att-href="pad_url"><t t-esc="pad_url"/></a>
                                         </div>
                                         <div class="oe_kanban_small">
                                             <i><field name="date_deadline"/></i>
@@ -360,17 +360,17 @@
                                     </div>
                                     <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                         <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>                                               
+                                            <a string="Edit" icon="gtk-edit" type="edit"/>
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                             <a string="" />
-                                            <a title="OpenERP Pad" icon="pad-openerp" target="_blank" t-att-href="'http://pad.openerp.com/'+record.name.value" style="text-decoration: none;" >
-                                                <img src="/web/static/src/img/icons/pad-openerp.png" border="0" width="16" height="16"/>
-                                            </a>                                                
+                                            <a title="OpenERP Pad" icon="pad-openerp" target="_blank" t-att-href="pad_url" style="text-decoration: none;" >
+                                                <img src="/project/static/src/img/kanban-pad-openerp.png" border="0" width="16" height="16"/>
+                                            </a>
                                             <a name="%(action_project_task_delegate)d" string="Delegate" states="pending,open,draft" type="action" icon="gtk-sort-descending" />
                                         </div>
                                         <div class="oe_kanban_right">
                                             <a name="do_cancel" string="Mark Lost" states="draft,open,pending" type="object" icon="lead-stage-lost"/>
-                                            <a name="do_pending" string="Pending"  states="open" type="object" icon="gtk-media-pause"/>        
+                                            <a name="do_pending" string="Pending"  states="open" type="object" icon="gtk-media-pause"/>
                                             <a name="action_close" string="Mark Won"  states="pending,open" type="object" icon="lead-stage-won"/>
                                         </div>
                                         <br class="oe_kanban_clear"/>
-- 
cgit v1.2.3


From d8e511a2c449e31f55a58f1cb0b4eb84c4488d0b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 26 Oct 2011 02:04:29 +0200
Subject: [IMP] Useability porject mgt

bzr revid: fp@tinyerp.com-20111026000429-sa5nc3x1thcz3qe2
---
 addons/project/project_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3f638000b40..02a8212838c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -175,7 +175,7 @@
             <field name="context">{'search_default_Current':1}</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>
         </record>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_definitions" sequence="1"/>
 
         <record id="open_view_template_project" model="ir.actions.act_window">
             <field name="name">Templates of Projects</field>
-- 
cgit v1.2.3


From 5ef63c30a68abd6df8a3e691bb493fad199ff907 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 26 Oct 2011 15:51:02 +0200
Subject: [IMP] project.task kanban view (with al !)

bzr revid: fme@openerp.com-20111026135102-ozm4g0l8l3snoki1
---
 addons/project/project_view.xml | 43 +++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 25 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 02a8212838c..18ff634f796 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -323,14 +323,14 @@
                 <kanban default_group_by="type_id" >
                     <field name="color"/>
                     <field name="priority"/>
-                    <field name="state"/>
                     <field name="type_id"/>
+                    <field name="user_id"/>
                     <field name="user_email"/>
+                    <field name="description"/>
                     <templates>
                         <t t-name="kanban-box">
                             <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t>
-                            <t t-set="color" t-value="kanban_color(record.color.raw_value || record.type_id.raw_value)"/>
-                            <div t-att-class="color + (record.priority.raw_value == 1 ? ' oe_kanban_color_alert' : '')">
+                            <div t-att-class="kanban_color(record.color.raw_value) + (record.state.raw_value === 'pending' ? ' oe_kanban_color_alert' : '')">
                                 <div class="oe_kanban_box oe_kanban_color_border">
                                     <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle">
                                         <tr>
@@ -340,38 +340,31 @@
                                                 <field name="name"/>
                                             </td>
                                             <td valign="top" width="22">
-                                                <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar"/>
+                                                <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>
                                             </td>
                                         </tr>
                                     </table>
                                     <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <div class="oe_kanban_right oe_kanban_small">
-                                            <field name="user_id"/>
-                                        </div>
-                                        <div class="oe_kanban_title2">
-                                            <field name="project_id"/>
-                                        </div>
-                                        <div class="oe_kanban_small">
-                                            <a target="_blank" t-att-href="pad_url"><t t-esc="pad_url"/></a>
+                                        <div class="oe_kanban_right">
+                                            <b>
+                                                <field name="project_id"/><br/>
+                                                <field name="state"/><t t-if="record.date_deadline.value"> - </t>
+                                                <i><field name="date_deadline"/></i>
+                                            </b>
                                         </div>
-                                        <div class="oe_kanban_small">
-                                            <i><field name="date_deadline"/></i>
+                                        <div>
+                                            <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/>
                                         </div>
+                                        <br class="oe_kanban_clear"/>
                                     </div>
                                     <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
                                         <div class="oe_kanban_left">
                                             <a string="Edit" icon="gtk-edit" type="edit"/>
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                            <a string="" />
-                                            <a title="OpenERP Pad" icon="pad-openerp" target="_blank" t-att-href="pad_url" style="text-decoration: none;" >
-                                                <img src="/project/static/src/img/kanban-pad-openerp.png" border="0" width="16" height="16"/>
-                                            </a>
-                                            <a name="%(action_project_task_delegate)d" string="Delegate" states="pending,open,draft" type="action" icon="gtk-sort-descending" />
                                         </div>
                                         <div class="oe_kanban_right">
-                                            <a name="do_cancel" string="Mark Lost" states="draft,open,pending" type="object" icon="lead-stage-lost"/>
-                                            <a name="do_pending" string="Pending"  states="open" type="object" icon="gtk-media-pause"/>
-                                            <a name="action_close" string="Mark Won"  states="pending,open" type="object" icon="lead-stage-won"/>
+                                            <a name="do_pending" string="Set Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                                            <a name="do_open" string="Open" states="pending" type="object" icon="gtk-media-play"/>
                                         </div>
                                         <br class="oe_kanban_clear"/>
                                     </div>
@@ -467,8 +460,8 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group>
-                        <filter string="New" domain="[('state','=','draft')]"  name="current" help="New Tasks" icon="terp-check"/>
-                        <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
+                        <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
+                        <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
                         <filter name="edit"
@@ -511,7 +504,7 @@
             <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
-            <field name="context">{"search_default_user_id":uid, "search_default_current": 1}</field>
+            <field name="context">{"search_default_user_id":uid, "search_default_draft": 1, "search_default_open":1 }</field>
             <field name="search_view_id" ref="view_task_search_form"/>
             <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field>
         </record>
-- 
cgit v1.2.3


From b415b7266f62e5adf0dffccd0b9a15c71a447f64 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Thu, 27 Oct 2011 02:13:13 +0200
Subject: [FIX] project kaban open pending button states

bzr revid: al@openerp.com-20111027001313-ralqmm5c7b807lt2
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/project/project_view.xml')

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 18ff634f796..5f5a36157ef 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -363,8 +363,8 @@
                                             <a string="Change Color" icon="color-picker" type="color" name="color"/>
                                         </div>
                                         <div class="oe_kanban_right">
-                                            <a name="do_pending" string="Set Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                                            <a name="do_open" string="Open" states="pending" type="object" icon="gtk-media-play"/>
+                                            <a name="do_pending" string="Set Pending" states="open" type="object" icon="gtk-media-pause"/>
+                                            <a name="do_open" string="Open" states="draft,pending" type="object" icon="gtk-media-play"/>
                                         </div>
                                         <br class="oe_kanban_clear"/>
                                     </div>
-- 
cgit v1.2.3