From 51647e7515fee1b6e2131cf082ed91bae6c1fd3c Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 27 Mar 2012 12:39:40 +0530
Subject: [IMP] add bollean field in project.project for some module

bzr revid: sgo@tinyerp.com-20120327070940-238ejuwcrmcz6ax3
---
 addons/project/project_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 249bb388117..2a6a7e0bfbc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -19,11 +19,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Project">
-                    <group colspan="6" col="6">
+                    <group colspan="4" col="8">
                         <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'}"/>
                         <field name="user_id" string="Project Manager" select="1" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
+                        <field name="task"/>
                         <field name="date_start" string="Start Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="date" string="End Date" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         <field name="progress_rate" widget="progressbar"/>
-- 
cgit v1.2.3


From 92be2313a8f9218bf5971335fa0734e4bffb88b8 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Tue, 27 Mar 2012 17:47:34 +0530
Subject: [IMP]project menu changed,improved form view.

bzr revid: kbh@tinyerp.com-20120327121734-92s8h2m1983u5a3t
---
 addons/project/project_view.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e937b9225a7..9de8757b4fd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -31,11 +31,20 @@
                     <notebook colspan="4">
                         <page string="Administration">
                             <group col="2" colspan="2">
-                                <separator colspan="2" string="Performance"/>
+                                <separator colspan="2" string="Project Management"/>
+                                <group col="2" colspan="2" name="kanban">
+                                    <!--<separator colspan="2" string="Kanban Configuration"/>-->
+                                    <field name="task"/>
+                                </group>
+                                </group>
+                                <group col="2" colspan="2">
+                                <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>
+                                </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"/>
@@ -43,12 +52,6 @@
                                 <field name="priority"/>
                                 <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
                             </group>
-                            <separator colspan="2" string="Kanban Configuration"/>
-                            <newline/>
-                            <group col="4" colspan="2" name="kanban">
-                                <!--<separator colspan="2" string="Kanban Configuration"/>-->
-                                <field name="task"/>
-                            </group>
                             <newline/>
                             <separator colspan="4"/>
                             <group col="9" colspan="8">
@@ -630,10 +633,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"/>
 
-- 
cgit v1.2.3


From 284b6dc267c7081003121d7c6e8a949b6dc6dd65 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 10:25:31 +0530
Subject: [IMP]:improved kanban view

bzr revid: apa@tinyerp.com-20120328045531-1cykq8x0gryefuv2
---
 addons/project/project_view.xml | 55 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 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 8450dafa5f1..a48b394b1de 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -161,6 +161,57 @@
                 </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"/>
+                    <templates>
+			<t t-name="kanban-box">
+			    <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
+                                <div class="oe_module_icon oe_project oe_project_border">
+                                    <div class="sequence">
+                                        <a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
+                                        <!--<field name="priority"/>-->
+                                    </div>
+                                    <kbd class="user">Manager</kbd><br/>
+                                    <div class="manager"><field name="user_id"/></div>
+                                    <t t-if="record.date.raw_value">
+                                        <kbd class="user">Deadline</kbd><br/>
+                                        <div class="manager"><field name="date"/></div>
+                                    </t>
+                                </div>
+                                <div class="oe_module_desc">
+                                    <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
+                                    <!--<p class="tasks">-->
+                                    <!--    <button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks (<field name="tasks"/>)</i></button>-->
+                                    <!--</p>-->
+                                    <div class="progress invoiced">
+                                    <br/>
+                                        <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
+                                       <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
+                                       <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
+                                    </div>
+                                </div>
+                                <table border="0" width="350px">
+                                    <tr>
+                                        <td align="right" valign="bottom">
+                                            <button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks ()</i></button>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </t>
+                    </templates>
+
+                </kanban>
+            </field>
+        </record>
 
        <record id="view_project_project_gantt" model="ir.ui.view">
             <field name="name">project.project.gantt</field>
@@ -177,8 +228,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>
-- 
cgit v1.2.3


From 5347fb2f2e3f140dcd9b8b26f7bd519119b8ca78 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 11:34:24 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328060424-layr7zdvr7lr04k3
---
 addons/project/project_view.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a48b394b1de..8302c8a8f1f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,9 +188,6 @@
                                 </div>
                                 <div class="oe_module_desc">
                                     <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
-                                    <!--<p class="tasks">-->
-                                    <!--    <button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks (<field name="tasks"/>)</i></button>-->
-                                    <!--</p>-->
                                     <div class="progress invoiced">
                                     <br/>
                                         <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
@@ -201,7 +198,7 @@
                                 <table border="0" width="350px">
                                     <tr>
                                         <td align="right" valign="bottom">
-                                            <button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks ()</i></button>
+                                            <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>()
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From bc1c67526b52a52e7d4d2863c34076d683632706 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 28 Mar 2012 11:35:42 +0530
Subject: [IMP]improve kanban view

bzr revid: sgo@tinyerp.com-20120328060542-v1yizvsrujt0ane7
---
 addons/project/project_view.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a48b394b1de..f234f3cb072 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -171,6 +171,8 @@
                     <field name="effective_hours"/>
                     <field name="total_hours"/>
                     <field name="date"/>
+                    <field name="members"/>
+                    <field name="task"/>
                     <templates>
 			<t t-name="kanban-box">
 			    <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
@@ -200,8 +202,17 @@
                                 </div>
                                 <table border="0" width="350px">
                                     <tr>
+                                    	<td align="left">
+                                    		<t t-foreach="record.members.raw_value" t-as="members">
+                                       			<a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
+                                    		</t>
+                                    	</td>
                                         <td align="right" valign="bottom">
-                                            <button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks ()</i></button>
+                                         <t t-if="record.task.raw_value">
+                                            <button name="open_tasks" class="oe_project_buttons" type="object">
+                                            	<i>Tasks(<field name="open_task"/>)</i>
+                                            </button>
+                                         </t>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From c2e0268fad10175e9d0459a5ee189815c77a4e03 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 28 Mar 2012 11:38:12 +0530
Subject: [IMP]improved kanban view for project_issue.

bzr revid: kbh@tinyerp.com-20120328060812-narvwer99g5ywqsa
---
 addons/project/project_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a48b394b1de..ad18981fd3b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -171,6 +171,7 @@
                     <field name="effective_hours"/>
                     <field name="total_hours"/>
                     <field name="date"/>
+                    <field name="issues"/>
                     <templates>
 			<t t-name="kanban-box">
 			    <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
@@ -200,7 +201,7 @@
                                 </div>
                                 <table border="0" width="350px">
                                     <tr>
-                                        <td align="right" valign="bottom">
+                                        <td align="right" valign="bottom" class="tasks">
                                             <button name="open_tasks" class="oe_project_buttons" type="object"><i>Tasks ()</i></button>
                                         </td>
                                     </tr>
-- 
cgit v1.2.3


From 86c640bd3bcdef3665ae57fba02e9b8c8b98329a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 12:09:18 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328063918-3g46mk5bz8kmhxw3
---
 addons/project/project_view.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a2067d54b60..b8e4bc7f910 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -173,13 +173,15 @@
                     <field name="date"/>
                     <field name="members"/>
                     <field name="task"/>
+                    <field name="user_id"/>
                     <templates>
 			<t t-name="kanban-box">
 			    <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
                                 <div class="oe_module_icon oe_project oe_project_border">
                                     <div class="sequence">
-                                        <a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
-                                        <!--<field name="priority"/>-->
+                                        <a type="edit">
+                                            <img t-att-src="kanban_gravatar(record.user_id.value, 22)" data-default-src="/web/static/src/img/topbar-avatar.png" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>
+                                        </a>
                                     </div>
                                     <kbd class="user">Manager</kbd><br/>
                                     <div class="manager"><field name="user_id"/></div>
@@ -200,14 +202,14 @@
                                 <table border="0" width="350px">
                                     <tr>
                                     	<td align="left">
-                                    		<t t-foreach="record.members.raw_value" t-as="members">
-                                       			<a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
-                                    		</t>
+                                    	    <t t-foreach="record.members.raw_value" t-as="members">
+                                       		<a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
+                                    	    </t>
                                     	</td>
                                         <td align="right" valign="bottom">
-											<t t-if="record.task.raw_value">
-                                            <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>(<field name="open_task"/>)
- 											</t>
+					    <t t-if="record.task.raw_value">
+                                                <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>(<field name="open_task"/>)
+ 					    </t>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From 0b24e4c532ee3af80491cae4ed0f487c92ec8e70 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 12:21:36 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328065136-lf3eczvgtiyr0hb7
---
 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 b8e4bc7f910..5b6e5a2c302 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -206,9 +206,9 @@
                                        		<a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
                                     	    </t>
                                     	</td>
-                                        <td align="right" valign="bottom">
+                                        <td align="right" valign="bottom" class="tasks">
 					    <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>(<field name="open_task"/>)
+                                                <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>
  					    </t>
                                         </td>
                                     </tr>
-- 
cgit v1.2.3


From 9eefd74b7b5e316de9fc92f5d54de58cb3418510 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 12:37:17 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328070717-z4hkm3ip526h73oj
---
 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 5b6e5a2c302..0b2a01e76a8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -206,7 +206,7 @@
                                        		<a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
                                     	    </t>
                                     	</td>
-                                        <td align="right" valign="bottom" class="tasks">
+                                        <td align="right" valign="bottom" class="buttons">
 					    <t t-if="record.task.raw_value">
                                                 <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>
  					    </t>
-- 
cgit v1.2.3


From df11d7174a58c9a8bc343dc3fba8d19cefcb767c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 14:29:27 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328085927-hzcw0p32tr94i07i
---
 addons/project/project_view.xml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 571f378b755..060a1777491 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -193,12 +193,15 @@
                                 </div>
                                 <div class="oe_module_desc">
                                     <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
-                                    <div class="progress invoiced">
-                                    <br/>
-                                        <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
-                                       <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
-                                       <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
-                                    </div>
+                                    <table border="0" width="350px">
+                                        <tr>
+                                            <td align="left" valign="bottom" class="buttons">
+                                                <t t-if="record.task.raw_value">
+                                                    <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="50" height="50" align="center"/></button>
+                                                </t>
+                                            </td>
+                                        </tr>
+                                    </table>
                                 </div>
                                 <table border="0" width="350px">
                                     <tr>
@@ -207,13 +210,13 @@
                                        		<a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
                                     	    </t>
                                     	</td>
-                                        <td align="right" valign="bottom" class="buttons">
-
-					    <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="20" height="20" align="top"/></button>
-
- 					    </t>
-
+                                        <td align="right" valign="bottom">
+					   <div class="progress invoiced">
+                                            <br/>
+                                                <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
+                                               <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
+                                               <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
+                                            </div>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From a48a27a3bb0a1a212c868a175ea831368f02316f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 15:08:19 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328093819-r7xnzw9o13uuvn58
---
 addons/project/project_view.xml | 17 ++++++++---------
 1 file changed, 8 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 060a1777491..324ac086227 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -191,19 +191,19 @@
                                         <div class="manager"><field name="date"/></div>
                                     </t>
                                 </div>
-                                <div class="oe_module_desc">
+                                <div class="oe_module_desc oe_project_desc">
                                     <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
-                                    <table border="0" width="350px">
+                                    <table class="oe_project_desc">
                                         <tr>
-                                            <td align="left" valign="bottom" class="buttons">
+                                            <td align="left" valign="top" class="buttons">
                                                 <t t-if="record.task.raw_value">
-                                                    <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="50" height="50" align="center"/></button>
+                                                    <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks.png" width="50" height="45" align="center"/></button>
                                                 </t>
                                             </td>
                                         </tr>
                                     </table>
                                 </div>
-                                <table border="0" width="350px">
+                                <table border="0" width="360px">
                                     <tr>
                                     	<td align="left">
                                     	    <t t-foreach="record.members.raw_value" t-as="members">
@@ -211,11 +211,10 @@
                                     	    </t>
                                     	</td>
                                         <td align="right" valign="bottom">
-					   <div class="progress invoiced">
-                                            <br/>
+                                            <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
-                                               <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
-                                               <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
+                                                <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
+                                                <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
                                         </td>
                                     </tr>
-- 
cgit v1.2.3


From 25776d016280b54e2f2c247299c3090d346a5eae Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 28 Mar 2012 15:16:54 +0530
Subject: [IMP]add image and sequence

bzr revid: sgo@tinyerp.com-20120328094654-d02ntcsu6ghbonva
---
 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 44c902ff20c..2b18064d57f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -197,7 +197,7 @@
                                         <tr>
                                             <td align="left" valign="bottom" class="buttons">
                                                 <t t-if="record.task.raw_value">
-                                                    <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks_icon.png" width="50" height="50" align="center"/></button>
+                                                    <button name="open_tasks" class="oe_project_buttons" type="object"><img src="/project/static/src/img/tasks_icon.png" width="50" height="50" align="center" sequence = "1"/></button>
                                                 </t>
                                             </td>
                                         </tr>
-- 
cgit v1.2.3


From 089b6fd455269eb3d19b03a8cb03661ef579856a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 17:26:08 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328115608-3js1g89dz510qqqr
---
 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 9e56a7fd7da..267a316ea22 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -178,7 +178,7 @@
                     <templates>
                         <!--<t t-name="ToolTips">-->
                             <t t-name="tasks">
-                                <ul class="oe_kanban_tooltip" t-if="record.open_task.raw_value">
+                                <ul class="oe_kanban_tooltip">
                                     <li><b>Total tasks:</b> <field name="open_task"/></li>
                                 </ul>
                             </t>
-- 
cgit v1.2.3


From 97ea27f53c1b542ad932849e62682f16eb4302ee Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 17:27:09 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328115709-z6fg5y02yvxh9f1g
---
 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 267a316ea22..0afbb369c65 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -179,7 +179,7 @@
                         <!--<t t-name="ToolTips">-->
                             <t t-name="tasks">
                                 <ul class="oe_kanban_tooltip">
-                                    <li><b>Total tasks:</b> <field name="open_task"/></li>
+                                    <li><b>Tasks:</b> <field name="open_task"/></li>
                                 </ul>
                             </t>
                         <!--</t>-->
-- 
cgit v1.2.3


From b77d3e06bbe945fb17d2c1ba2adebbf81babd54d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 17:39:14 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328120914-ukfrhnw03o0o659x
---
 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 0afbb369c65..22fac65c6f7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -213,8 +213,8 @@
                                 <table border="0" width="360px">
                                     <tr>
                                         <td align="left">
-                                            <t t-foreach="record.members.raw_value" t-as="members">
-                                            <a type="edit"><img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/></a>
+                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                <img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/>
                                             </t>
                                         </td>
                                         <td align="right" valign="bottom">
-- 
cgit v1.2.3


From 10d29e2eaa469c79a917fe9f7ea3ab1cf24ec11c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 28 Mar 2012 19:05:08 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120328133508-7y2y7vvhwjrdah00
---
 addons/project/project_view.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 22fac65c6f7..2a131408b9e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -187,9 +187,10 @@
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
                                 <div class="oe_module_icon oe_project oe_project_border">
                                     <div class="sequence">
-                                        <a type="edit">
-                                            <img t-att-src="kanban_gravatar(record.user_id.value, 22)" data-default-src="/web/static/src/img/topbar-avatar.png" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>
-                                        </a>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.id.raw_value)" height="40px" width="70px"/>
+                                        <!--<a type="edit">-->
+                                        <!--    <img t-att-src="kanban_gravatar(record.user_id.value, 22)" data-default-src="/web/static/src/img/topbar-avatar.png" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>-->
+                                        <!--</a>-->
                                     </div>
                                     <kbd class="user">Manager</kbd><br/>
                                     <div class="manager"><field name="user_id"/></div>
@@ -214,7 +215,8 @@
                                     <tr>
                                         <td align="left">
                                             <t t-foreach="record.members.raw_value" t-as="member">
-                                                <img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/>
+                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" height="22px" width=" 22px"/>
+                                                <!--<img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/>-->
                                             </t>
                                         </td>
                                         <td align="right" valign="bottom">
-- 
cgit v1.2.3


From 10247a1af2e6ec35bc109b8e9338abd36ca91d53 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 09:41:16 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329041116-5gg4g6ckexwea575
---
 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 2a131408b9e..c030921cdcf 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -205,7 +205,7 @@
                                         <tr>
                                             <td align="left" valign="top" class="buttons">
                                                 <t t-if="record.task.raw_value">
-                                                    <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks.png" class="project_icon"/></button>
+                                                    <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
                                                 </t>
                                             </td>
                                         </tr>
-- 
cgit v1.2.3


From 1ac567d6b040ca551973d3e7e76469a1801ba64e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 10:02:17 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329043217-2i8vxflhy6a0drix
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c030921cdcf..fa2e311e835 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -187,17 +187,17 @@
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
                                 <div class="oe_module_icon oe_project oe_project_border">
                                     <div class="sequence">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.id.raw_value)" height="40px" width="70px"/>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="50px" width="50px"/>
                                         <!--<a type="edit">-->
                                         <!--    <img t-att-src="kanban_gravatar(record.user_id.value, 22)" data-default-src="/web/static/src/img/topbar-avatar.png" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>-->
                                         <!--</a>-->
                                     </div>
                                     <kbd class="user">Manager</kbd><br/>
                                     <div class="manager"><field name="user_id"/></div>
-                                    <t t-if="record.date.raw_value">
+<!--                                    <t t-if="record.date.raw_value">
                                         <kbd class="user">Deadline</kbd><br/>
                                         <div class="manager"><field name="date"/></div>
-                                    </t>
+                                    </t>-->
                                 </div>
                                 <div class="oe_module_desc oe_project_desc">
                                     <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
-- 
cgit v1.2.3


From fbb16d2a1642750cccd687d5c88ed4e122869414 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 29 Mar 2012 11:49:55 +0530
Subject: [IMP]if click on manager avatar it opens form view

bzr revid: sgo@tinyerp.com-20120329061955-fu3bhrj8cu137kvs
---
 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 fa2e311e835..ca7fba44713 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -187,7 +187,7 @@
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
                                 <div class="oe_module_icon oe_project oe_project_border">
                                     <div class="sequence">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="50px" width="50px"/>
+                                        <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="35px" width="40px" /></button>
                                         <!--<a type="edit">-->
                                         <!--    <img t-att-src="kanban_gravatar(record.user_id.value, 22)" data-default-src="/web/static/src/img/topbar-avatar.png" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>-->
                                         <!--</a>-->
-- 
cgit v1.2.3


From 80d32699f406e99a3e6a3cf564d889e413d46e56 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 11:58:07 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329062807-qprri6v7otjufmy3
---
 addons/project/project_view.xml | 71 +++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 38 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index fa2e311e835..62347b81f76 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -176,50 +176,46 @@
                     <field name="task"/>
                     <field name="user_id"/>
                     <templates>
-                        <!--<t t-name="ToolTips">-->
-                            <t t-name="tasks">
-                                <ul class="oe_kanban_tooltip">
-                                    <li><b>Tasks:</b> <field name="open_task"/></li>
-                                </ul>
-                            </t>
-                        <!--</t>-->
+                        <t t-name="tasks">
+                            <ul class="oe_kanban_tooltip">
+                                <li><b>Tasks:</b> <field name="open_task"/></li>
+                            </ul>
+                        </t>
                         <t t-name="kanban-box">
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                                <div class="oe_module_icon oe_project oe_project_border">
-                                    <div class="sequence">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="50px" width="50px"/>
-                                        <!--<a type="edit">-->
-                                        <!--    <img t-att-src="kanban_gravatar(record.user_id.value, 22)" data-default-src="/web/static/src/img/topbar-avatar.png" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/>-->
-                                        <!--</a>-->
-                                    </div>
-                                    <kbd class="user">Manager</kbd><br/>
-                                    <div class="manager"><field name="user_id"/></div>
-<!--                                    <t t-if="record.date.raw_value">
-                                        <kbd class="user">Deadline</kbd><br/>
-                                        <div class="manager"><field name="date"/></div>
-                                    </t>-->
-                                </div>
-                                <div class="oe_module_desc oe_project_desc">
-                                    <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
-                                    <table class="oe_project_desc">
-                                        <tr>
-                                            <td align="left" valign="top" class="buttons">
-                                                <t t-if="record.task.raw_value">
-                                                    <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
-                                                </t>
-                                            </td>
-                                        </tr>
-                                    </table>
-                                </div>
-                                <table border="0" width="360px">
+                                <table border="0" width="350px">
+                                    <tr>
+                                        <td width="40px">
+                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px"/>
+                                        </td>
+                                        <td align="left" valign="middle">
+                                            <div class="oe_module_desc">
+                                                <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
+                                                <table >
+                                                    <tr>
+                                                        <td align="left" valign="middle" class="buttons">
+                                                            <t t-if="record.task.raw_value">
+                                                                <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
+                                                            </t>
+                                                        </td>
+                                                    </tr>
+                                                </table>
+                                            </div>
+                                        </td>
+                                        <td width="60px" valign="top" align="right">
+                                            <kbd class="user">Manager</kbd><br/>
+                                            <div class="manager"><field name="user_id"/></div>
+                                        </td>
+                                    </tr>
+                                </table>
+                                <table border="0" width="350px">
                                     <tr>
-                                        <td align="left">
+                                        <td align="left" width="140px" valign="middle">
                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" height="22px" width=" 22px"/>
-                                                <!--<img class="oe_topbar_avatar" data-default-src="/web/static/src/img/topbar-avatar.png" src="/web/static/src/img/topbar-avatar.png"/>-->
                                             </t>
                                         </td>
-                                        <td align="right" valign="bottom">
+                                        <td align="right" valign="middle" width="110px">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
@@ -231,7 +227,6 @@
                             </div>
                         </t>
                     </templates>
-
                 </kanban>
             </field>
         </record>
-- 
cgit v1.2.3


From ec7413d1a544f4a24296e0df47afce5680af3f59 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 12:05:29 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329063529-a931d8yq6b0mjv6w
---
 addons/project/project_view.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 62347b81f76..2173ae620a6 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,7 +186,8 @@
                                 <table border="0" width="350px">
                                     <tr>
                                         <td width="40px">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="55px" width="55px"/><br/>
+                                            <div class="manager" align="center"><field name="user_id"/></div>
                                         </td>
                                         <td align="left" valign="middle">
                                             <div class="oe_module_desc">
@@ -203,8 +204,10 @@
                                             </div>
                                         </td>
                                         <td width="60px" valign="top" align="right">
-                                            <kbd class="user">Manager</kbd><br/>
-                                            <div class="manager"><field name="user_id"/></div>
+                                            <t t-if="record.date.raw_value">
+                                                <kbd class="user">Deadline</kbd>
+                                                <div class="manager"><field name="date"/></div>
+                                            </t>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From b49496e2312afb20b8366d90aa1d8864121e84ec Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 12:50:29 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329072029-r1rpuaomkoba3z5v
---
 addons/project/project_view.xml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 44535435d30..643b9212358 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -183,14 +183,14 @@
                         </t>
                         <t t-name="kanban-box">
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                                <table border="0" width="350px">
+                                <table border="1" width="350px">
                                     <tr>
-                                        <td width="40px">
-                                            <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="55px" width="55px" /></button><br/>
-                                            <div class="manager" align="center"><field name="user_id"/></div>
+                                        <td width="60px">
+                                            <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
+                                            <div class="manager" align="left"><field name="user_id"/></div>
                                         </td>
                                         <td align="left" valign="middle">
-                                            <div class="oe_module_desc">
+                                            <div class="oe_module_desc oe_project_border">
                                                 <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
                                                 <table >
                                                     <tr>
@@ -205,25 +205,28 @@
                                         </td>
                                         <td width="60px" valign="top" align="right">
                                             <t t-if="record.date.raw_value">
-                                                <kbd class="user">Deadline</kbd>
-                                                <div class="manager"><field name="date"/></div>
+                                                <div class="sequence">
+                                                    <kbd class="user">Deadline</kbd>
+                                                    <div class="manager"><field name="date"/></div>
+                                                </div>
                                             </t>
                                         </td>
                                     </tr>
                                 </table>
                                 <table border="0" width="350px">
                                     <tr>
-                                        <td align="left" width="140px" valign="middle">
-                                            <t t-foreach="record.members.raw_value" t-as="member">
-                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" height="22px" width=" 22px"/>
-                                            </t>
-                                        </td>
-                                        <td align="right" valign="middle" width="110px">
+                                        <td align="left" width="120px" valign="middle">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
+                                            
+                                        </td>
+                                        <td align="right" valign="middle" width="130px">
+                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
+                                            </t>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From 76a8424ceee9b3a43ae48d529a2394de0d67c28b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 12:52:48 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329072248-dpars22nfcp401ci
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 643b9212358..a45eed3f33c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -183,11 +183,11 @@
                         </t>
                         <t t-name="kanban-box">
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                                <table border="1" width="350px">
+                                <table border="0" width="350px">
                                     <tr>
-                                        <td width="60px">
+                                        <td width="60px" align="center" valign="top">
                                             <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
-                                            <div class="manager" align="left"><field name="user_id"/></div>
+                                            <div class="manager"><field name="user_id"/></div>
                                         </td>
                                         <td align="left" valign="middle">
                                             <div class="oe_module_desc oe_project_border">
-- 
cgit v1.2.3


From 5ebf8f6da9424584667a83fe6b558828369649c3 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 14:26:45 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329085645-5104gkrxgu13ohhj
---
 addons/project/project_view.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a45eed3f33c..02e2f1ab291 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -32,9 +32,7 @@
                         <page string="Administration">
                             <group col="2" colspan="2" name="kanban">
                                 <separator colspan="2" string="Project Management"/>
-                                <!--<group col="2" colspan="2" name="kanban">-->
                                     <field name="task"/>
-                                <!--</group>-->
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
@@ -171,7 +169,7 @@
                     <field name="effective_hours"/>
                     <field name="total_hours"/>
                     <field name="date"/>
-
+                    <field name="name"/>
                     <field name="members"/>
                     <field name="task"/>
                     <field name="user_id"/>
@@ -191,7 +189,10 @@
                                         </td>
                                         <td align="left" valign="middle">
                                             <div class="oe_module_desc oe_project_border">
-                                                <h4 class="oe_project_font1"><a type="edit"><div class="oe_project_font"><field name="name"/></div></a></h4>
+                                                <h4 class="oe_project_font1">
+                                                    <div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t><a string="Edit" icon="gtk-edit" type="edit"/></div>
+                                                    
+                                                </h4>
                                                 <table >
                                                     <tr>
                                                         <td align="left" valign="middle" class="buttons">
-- 
cgit v1.2.3


From 7c072af98f74530d0bdb047646127fc713022dde Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 16:12:58 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329104258-hrc0jn0ysuafzigl
---
 addons/project/project_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 2ee0bac76ab..535766fade0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -215,15 +215,14 @@
                                 </table>
                                 <table border="0" width="350px">
                                     <tr>
-                                        <td align="left" width="120px" valign="middle">
+                                        <td align="left" width="120px" valign="bottom">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
-                                            
                                         </td>
-                                        <td align="right" valign="middle" width="130px">
+                                        <td align="right" valign="bottom" width="130px" height="20px">
                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
                                             </t>
-- 
cgit v1.2.3


From 9aa3b59b2f1d0f471cfd27b6ca6e91c77b4e1881 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 17:49:31 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329121931-w3e4bclwmuhhzsg2
---
 addons/project/project_view.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 535766fade0..b27e9dcbd1d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,6 +186,10 @@
                                         <td width="60px" align="center" valign="top">
                                             <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
                                             <div class="manager"><field name="user_id"/></div>
+                                            <t t-if="record.date.raw_value">
+                                                <kbd class="user">Deadline</kbd>
+                                                <div class="manager"><field name="date"/></div>
+                                            </t>
                                         </td>
                                         <td align="left" valign="middle" width="220px">
                                             <div class="oe_project_border">
@@ -204,12 +208,10 @@
                                             </div>
                                         </td>
                                         <td width="70px" valign="top" align="right">
-                                            <t t-if="record.date.raw_value">
-                                                <div class="sequence">
-                                                    <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><field name="date"/></div>
+                                                <div id="sequence">
+                                                    <!--<kbd class="user">Deadline</kbd>-->
+                                                    <!--<div class="manager"><field name="date"/></div>-->
                                                 </div>
-                                            </t>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From 2c152b00813557aaa10d2a1f98548f350f3b99c0 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 29 Mar 2012 18:16:11 +0530
Subject: [IMP]css changed

bzr revid: kbh@tinyerp.com-20120329124611-l3j2zw8i3j9f1tcd
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b27e9dcbd1d..cb90abb5c5c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -215,16 +215,16 @@
                                         </td>
                                     </tr>
                                 </table>
-                                <table border="0" width="350px">
+                                <table class="project_table">
                                     <tr>
-                                        <td align="left" width="120px" valign="bottom">
+                                        <td class="td_hours">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
                                         </td>
-                                        <td align="right" valign="bottom" width="130px" height="20px">
+                                        <td class="td_member">
                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
                                             </t>
-- 
cgit v1.2.3


From adbc6474a4a83c1193e41c52fb8bd8edae94c619 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 29 Mar 2012 18:25:27 +0530
Subject: [IMP]css

bzr revid: kbh@tinyerp.com-20120329125527-8ljx3njrkjvdes8c
---
 addons/project/project_view.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cb90abb5c5c..0b3c04f1cd4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -181,24 +181,24 @@
                         </t>
                         <t t-name="kanban-box">
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                                <table border="0" width="350px">
+                                <table class="project_table">
                                     <tr>
-                                        <td width="60px" align="center" valign="top">
-                                            <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/>
+                                        <td class="td_image">
+                                            <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
                                             <div class="manager"><field name="user_id"/></div>
                                             <t t-if="record.date.raw_value">
                                                 <kbd class="user">Deadline</kbd>
                                                 <div class="manager"><field name="date"/></div>
                                             </t>
                                         </td>
-                                        <td align="left" valign="middle" width="220px">
+                                        <td class="td_name">
                                             <div class="oe_project_border">
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,26)"/><t t-if="record.name.value.length > 26">...</t></div></a>
                                                 </h4>
                                                 <table >
-                                                    <tr>
-                                                        <td align="left" valign="middle" class="buttons">
+                                                    <tr class ="task">
+                                                        <td class="buttons">
                                                             <t t-if="record.task.raw_value">
                                                                 <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
                                                             </t>
@@ -207,7 +207,7 @@
                                                 </table>
                                             </div>
                                         </td>
-                                        <td width="70px" valign="top" align="right">
+                                        <td class="td_deadline">
                                                 <div id="sequence">
                                                     <!--<kbd class="user">Deadline</kbd>-->
                                                     <!--<div class="manager"><field name="date"/></div>-->
-- 
cgit v1.2.3


From 6439f4cba7a101a4bcb70014bd492719681c5937 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 29 Mar 2012 18:30:38 +0530
Subject: [IMP]css

bzr revid: kbh@tinyerp.com-20120329130038-2phw98jzf4arxxsk
---
 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 0b3c04f1cd4..53ccca7f0aa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -226,7 +226,7 @@
                                         </td>
                                         <td class="td_member">
                                             <t t-foreach="record.members.raw_value" t-as="member">
-                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" height="20px" width=" 20px"/>
+                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
                                             </t>
                                         </td>
                                     </tr>
-- 
cgit v1.2.3


From 60db095a88197692bd07c8ea797eefc5346feb97 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 18:40:30 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329131030-vjfix4ygwcyrs90w
---
 addons/project/project_view.xml | 16 +++++++---------
 1 file changed, 7 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 53ccca7f0aa..1e3796d5e04 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,11 +186,7 @@
                                         <td class="td_image">
                                             <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
                                             <div class="manager"><field name="user_id"/></div>
-                                            <t t-if="record.date.raw_value">
-                                                <kbd class="user">Deadline</kbd>
-                                                <div class="manager"><field name="date"/></div>
-                                            </t>
-                                        </td>
+                                          </td>
                                         <td class="td_name">
                                             <div class="oe_project_border">
                                                 <h4 class="oe_project_font1">
@@ -207,11 +203,13 @@
                                                 </table>
                                             </div>
                                         </td>
-                                        <td class="td_deadline">
-                                                <div id="sequence">
-                                                    <!--<kbd class="user">Deadline</kbd>-->
-                                                    <!--<div class="manager"><field name="date"/></div>-->
+                                        <td class="td_deadline" id="sequence">
+                                            <t t-if="record.date.raw_value">
+                                                <div class="sequence">
+                                                    <kbd class="user">Deadline</kbd>
+                                                    <div class="manager"><field name="date"/></div>
                                                 </div>
+                                            </t>
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From 299d0463e958ba35d9b11a59df42cf3d88b2126b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 29 Mar 2012 19:03:04 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120329133304-v225x3lbowhqyoad
---
 addons/project/project_view.xml | 27 ++++++++++++++++++---------
 1 file changed, 18 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 1e3796d5e04..9b3b3106fc5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -184,8 +184,10 @@
                                 <table class="project_table">
                                     <tr>
                                         <td class="td_image">
-                                            <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
-                                            <div class="manager"><field name="user_id"/></div>
+                                            <div class="sequence">
+                                                <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
+                                                <div class="manager"><field name="user_id"/></div>
+                                            </div>
                                           </td>
                                         <td class="td_name">
                                             <div class="oe_project_border">
@@ -200,10 +202,17 @@
                                                             </t>
                                                         </td>
                                                     </tr>
+                                                    <tr>
+                                                        <td height="45px">
+                                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
+                                                            </t>
+                                                        </td>
+                                                    </tr>
                                                 </table>
                                             </div>
                                         </td>
-                                        <td class="td_deadline" id="sequence">
+                                        <td class="td_deadline">
                                             <t t-if="record.date.raw_value">
                                                 <div class="sequence">
                                                     <kbd class="user">Deadline</kbd>
@@ -215,18 +224,18 @@
                                 </table>
                                 <table class="project_table">
                                     <tr>
-                                        <td class="td_hours">
+                                        <td class="td_hours" align="right">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
                                         </td>
-                                        <td class="td_member">
-                                            <t t-foreach="record.members.raw_value" t-as="member">
-                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
-                                            </t>
-                                        </td>
+                                        <!--<td class="td_member">-->
+                                        <!--    <t t-foreach="record.members.raw_value" t-as="member">-->
+                                        <!--        <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>-->
+                                        <!--    </t>-->
+                                        <!--</td>-->
                                     </tr>
                                 </table>
                             </div>
-- 
cgit v1.2.3


From 90065c1a88acab2ca031bae80dd0b5404612bb85 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 11:23:12 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330055312-b48taam1vr3l0d6s
---
 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 9b3b3106fc5..368e360021a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -192,7 +192,7 @@
                                         <td class="td_name">
                                             <div class="oe_project_border">
                                                 <h4 class="oe_project_font1">
-                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,26)"/><t t-if="record.name.value.length > 26">...</t></div></a>
+                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,29)"/><t t-if="record.name.value.length > 29">...</t></div></a>
                                                 </h4>
                                                 <table >
                                                     <tr class ="task">
@@ -224,7 +224,7 @@
                                 </table>
                                 <table class="project_table">
                                     <tr>
-                                        <td class="td_hours" align="right">
+                                        <td class="td_hours">
                                             <div class="progress invoiced">
                                                 <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
                                                 <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
-- 
cgit v1.2.3


From f499855684def050a720649617739184ab2b456b Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 11:25:11 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330055511-q20cwqvs6w4owroy
---
 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 368e360021a..869e169a9cd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -190,7 +190,7 @@
                                             </div>
                                           </td>
                                         <td class="td_name">
-                                            <div class="oe_project_border">
+                                            <div class="oe_module_desc oe_project_border">
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,29)"/><t t-if="record.name.value.length > 29">...</t></div></a>
                                                 </h4>
-- 
cgit v1.2.3


From 2ba790b37ebcd1a202d1cc729fb9bbee3cb829af Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 11:30:38 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330060038-701xyjxjaqmg1v6t
---
 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 869e169a9cd..368e360021a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -190,7 +190,7 @@
                                             </div>
                                           </td>
                                         <td class="td_name">
-                                            <div class="oe_module_desc oe_project_border">
+                                            <div class="oe_project_border">
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,29)"/><t t-if="record.name.value.length > 29">...</t></div></a>
                                                 </h4>
-- 
cgit v1.2.3


From 7b2b46b741a5fc1d4f34d4e1c428f8dc9018a103 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 11:54:13 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330062413-9i7xyo9yh63zrdst
---
 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 368e360021a..7ac3d1769d2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -192,7 +192,7 @@
                                         <td class="td_name">
                                             <div class="oe_project_border">
                                                 <h4 class="oe_project_font1">
-                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,29)"/><t t-if="record.name.value.length > 29">...</t></div></a>
+                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
                                                 </h4>
                                                 <table >
                                                     <tr class ="task">
-- 
cgit v1.2.3


From 47ab29c93ca87183a770cdac0e126bac231b71c1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 12:54:25 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330072425-7tf4uffzmxak8k19
---
 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 7ac3d1769d2..bdd593f424b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -216,7 +216,7 @@
                                             <t t-if="record.date.raw_value">
                                                 <div class="sequence">
                                                     <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><field name="date"/></div>
+                                                    <div class="manager"><b><field name="date"/></b></div>
                                                 </div>
                                             </t>
                                         </td>
-- 
cgit v1.2.3


From da2e47979e0b477285603798c5b9a40ce8e42699 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 16:32:14 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330110214-gy1g9fwt03dydcoh
---
 addons/project/project_view.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bdd593f424b..84045b2992b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -188,9 +188,15 @@
                                                 <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
                                                 <div class="manager"><field name="user_id"/></div>
                                             </div>
+                                            <t t-if="record.date.raw_value">
+                                                <div class="sequence">
+                                                    <kbd class="user">Deadline</kbd>
+                                                    <div class="manager"><b><field name="date"/></b></div>
+                                                </div>
+                                            </t>
                                           </td>
                                         <td class="td_name">
-                                            <div class="oe_project_border">
+                                            <div>
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
                                                 </h4>
@@ -213,12 +219,12 @@
                                             </div>
                                         </td>
                                         <td class="td_deadline">
-                                            <t t-if="record.date.raw_value">
-                                                <div class="sequence">
-                                                    <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><b><field name="date"/></b></div>
-                                                </div>
-                                            </t>
+                                            <!--<t t-if="record.date.raw_value">-->
+                                            <!--    <div class="sequence">-->
+                                            <!--        <kbd class="user">Deadline</kbd>-->
+                                            <!--        <div class="manager"><b><field name="date"/></b></div>-->
+                                            <!--    </div>-->
+                                            <!--</t>-->
                                         </td>
                                     </tr>
                                 </table>
-- 
cgit v1.2.3


From 45a71c9c35f0a93876215bff7e678652f483c32a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 16:44:40 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330111440-fcrsgemdp53e8ocs
---
 addons/project/project_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 84045b2992b..0e01df8848d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -198,7 +198,7 @@
                                         <td class="td_name">
                                             <div>
                                                 <h4 class="oe_project_font1">
-                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,28)"/><t t-if="record.name.value.length > 28">...</t></div></a>
+                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,35)"/><t t-if="record.name.value.length > 35">...</t></div></a>
                                                 </h4>
                                                 <table >
                                                     <tr class ="task">
@@ -218,14 +218,14 @@
                                                 </table>
                                             </div>
                                         </td>
-                                        <td class="td_deadline">
+                                        <!--<td class="td_deadline">-->
                                             <!--<t t-if="record.date.raw_value">-->
                                             <!--    <div class="sequence">-->
                                             <!--        <kbd class="user">Deadline</kbd>-->
                                             <!--        <div class="manager"><b><field name="date"/></b></div>-->
                                             <!--    </div>-->
                                             <!--</t>-->
-                                        </td>
+                                        <!--</td>-->
                                     </tr>
                                 </table>
                                 <table class="project_table">
-- 
cgit v1.2.3


From 590e529d655dfa6662eb01e5923dec373d3433ed Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 30 Mar 2012 17:39:41 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120330120941-e7emkrpt6mzxyxu3
---
 addons/project/project_view.xml | 13 -------------
 1 file changed, 13 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0e01df8848d..7fe0ee5f6dc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -218,14 +218,6 @@
                                                 </table>
                                             </div>
                                         </td>
-                                        <!--<td class="td_deadline">-->
-                                            <!--<t t-if="record.date.raw_value">-->
-                                            <!--    <div class="sequence">-->
-                                            <!--        <kbd class="user">Deadline</kbd>-->
-                                            <!--        <div class="manager"><b><field name="date"/></b></div>-->
-                                            <!--    </div>-->
-                                            <!--</t>-->
-                                        <!--</td>-->
                                     </tr>
                                 </table>
                                 <table class="project_table">
@@ -237,11 +229,6 @@
                                                 <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
                                             </div>
                                         </td>
-                                        <!--<td class="td_member">-->
-                                        <!--    <t t-foreach="record.members.raw_value" t-as="member">-->
-                                        <!--        <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>-->
-                                        <!--    </t>-->
-                                        <!--</td>-->
                                     </tr>
                                 </table>
                             </div>
-- 
cgit v1.2.3


From 918dca99dcd7d136cf42fb45eac0b5f763dc7629 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Apr 2012 11:19:51 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120402054951-kih10xe9hxrp1c5g
---
 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 d210c590198..48055c625a2 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -208,7 +208,7 @@
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td height="45px">
+                                                        <td height="45px" class="oe_project_font">
                                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
                                                             </t>
-- 
cgit v1.2.3


From d35d6def03a1a50dea6972971798a6f1723a6b62 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 2 Apr 2012 12:00:45 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120402063045-gwpkxsd1tyuj5skh
---
 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 48055c625a2..21d3e3b6295 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -208,7 +208,7 @@
                                                         </td>
                                                     </tr>
                                                     <tr>
-                                                        <td height="45px" class="oe_project_font">
+                                                        <td height="45px" class="oe_project_members">
                                                             <t t-foreach="record.members.raw_value" t-as="member">
                                                                 <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
                                                             </t>
-- 
cgit v1.2.3


From 67ae1b0b83762804c9222039e61c55786eed1fee Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 2 Apr 2012 19:00:48 +0530
Subject: [IMP]improve view

bzr revid: sgo@tinyerp.com-20120402133048-6s9gseld1v7u0dq0
---
 addons/project/project_view.xml | 69 +++++++++++++++++++++++++++++++----------
 1 file changed, 53 insertions(+), 16 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 21d3e3b6295..f8a7ec9001e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -172,6 +172,7 @@
                     <field name="members"/>
                     <field name="task"/>
                     <field name="user_id"/>
+                    <field name="date"/>
                     <templates>
                         <t t-name="tasks">
                             <ul class="oe_kanban_tooltip">
@@ -180,10 +181,28 @@
                         </t>
                         <t t-name="kanban-box">
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                                <table class="project_table">
+                            <script type="text/javascript">
+                                    function showElement(layer){
+                                        var myLayer = document.getElementById(layer);
+                                        if(myLayer.style.display=="none"){
+                                        myLayer.style.display="block";
+                                        myLayer.backgroundPosition="top";
+                                        } else { 
+                                        myLayer.style.display="none";
+                                        }
+                                    }
+                                </script>
+                                <a href="#" class="button" onclick="javascript:showElement('v-menu')">
+                                    <span>Click Here</span>
+                                </a>
+                                <ul id="v-menu" class="v-menu" style="display:none;">
+                                    <li><a type="edit">Edit</a></li>
+                                    <li><a type="delete">Delete</a></li>
+                                </ul>
+                                <table class="project_table" >
                                     <tr>
-                                        <td class="td_image">
-                                            <div class="sequence">
+                                       <!--<td class="td_image" >
+                                              <div class="sequence">
                                                 <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
                                                 <div class="manager"><field name="user_id"/></div>
                                             </div>
@@ -193,33 +212,51 @@
                                                     <div class="manager"><b><field name="date"/></b></div>
                                                 </div>
                                             </t>
-                                          </td>
-                                        <td class="td_name">
+                                          </td>-->
+                                        <td class="td_name" align="left">
                                             <div>
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,35)"/><t t-if="record.name.value.length > 35">...</t></div></a>
                                                 </h4>
-                                                <table >
-                                                    <tr class ="task">
+                                                <table class ="task">
+                                                    <tr>
                                                         <td class="buttons">
                                                             <t t-if="record.task.raw_value">
                                                                 <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
                                                             </t>
                                                         </td>
                                                     </tr>
-                                                    <tr>
-                                                        <td height="45px" class="oe_project_members">
-                                                            <t t-foreach="record.members.raw_value" t-as="member">
-                                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
-                                                            </t>
-                                                        </td>
-                                                    </tr>
                                                 </table>
+                                                <table id = "deadline">
+                                                 	<t t-if="record.date.raw_value">
+														<tr ><td width="100px"><strong >Deadline</strong></td><td class="sequence" ></td>
+														<td>
+														<t t-esc="record.date.raw_value.toString('MMMM')"/> 
+													    <t t-esc="record.date.raw_value.getMonth()"/>,
+                             							<t t-esc="record.date.raw_value.getFullYear()"/>
+													    </td>
+													    </tr>
+													    </t>
+													    <t t-if= "Math.round(record.effective_hours.raw_value) !== 0">
+													    <tr ><td width="100px"><strong >Progress</strong></td><td class="sequence"></td>
+															<td>
+														    <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days
+														    </td>
+													    </tr>
+													    </t>
+												</table>
+                                                <table >
+    		                                            <td height="55px" class="oe_project_members">
+	                                                          <t t-foreach="record.members.raw_value" t-as="member">
+                                                              <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
+                                                          </t>
+                                                         </td>
+                                                    </table>
                                             </div>
                                         </td>
                                     </tr>
                                 </table>
-                                <table class="project_table">
+                              <!--<table class="project_table">
                                     <tr>
                                         <td class="td_hours">
                                             <div class="progress invoiced">
@@ -229,7 +266,7 @@
                                             </div>
                                         </td>
                                     </tr>
-                                </table>
+                                </table>  -->  
                             </div>
                         </t>
                     </templates>
-- 
cgit v1.2.3


From abf8934ff922e9d9b65567cf7469c14caf3b63f3 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 3 Apr 2012 14:29:56 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120403085956-00lj6epnjz3j5z7n
---
 addons/project/project_view.xml | 39 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 37 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 21d3e3b6295..b635b4cc805 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -173,7 +173,42 @@
                     <field name="task"/>
                     <field name="user_id"/>
                     <templates>
-                        <t t-name="tasks">
+                        <t t-name="kanban-box">
+                            <script type="text/javascript">
+                                function showElement(){
+                                    $('.dropdown-toggle').dropdown();
+                                    
+                                    }
+                            </script>
+                            <!--<div class="content">-->
+                            <div class="vignettes">
+                            <li class="oe_kanban_vignette">
+                                <a href="#" class="oe_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
+                                <ul class="dropdown-menu">
+                                  <li><a href="#">Edit...</a></li>
+                                  <li><a href="#">Delete</a></li>
+                                  <li>
+                                    <ul class="color-chooser">
+                                      <li><a><span class="steelblue square"></span></a></li>
+                                      <li><a><span class="firebrick square"></span></a></li>
+                                      <li><a><span class="khaki square"></span></a></li>
+                                      <li><a><span class="thistle square"></span></a></li>
+                                      <li><a><span class="orange square"></span></a></li>
+                                    </ul>
+                                  </li>
+                                </ul>
+                                <h4><a href="project.html">Groupe S HRWeb</a></h4>
+                                <p><a href="tasks.html">2 Tasks</a>, <a href="issues.html">3 Issues</a>, <a href="timesheets.html">1 Timesheet</a></p>
+                            </li>
+                            </div>
+                            <!--</div>-->
+                        </t>
+                        
+                        
+                        
+                        
+                        
+                        <!--<t t-name="tasks">
                             <ul class="oe_kanban_tooltip">
                                 <li><b>Tasks:</b> <field name="open_task"/></li>
                             </ul>
@@ -231,7 +266,7 @@
                                     </tr>
                                 </table>
                             </div>
-                        </t>
+                        </t>-->
                     </templates>
                 </kanban>
             </field>
-- 
cgit v1.2.3


From 777909e030b6bc43fb8d5df114e01a31885ec4a4 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 16:06:58 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120403103658-mdkum0flrg2a40qf
---
 addons/project/project_view.xml | 87 +++++++++++++----------------------------
 1 file changed, 28 insertions(+), 59 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8723392331a..584a20925f0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -198,17 +198,22 @@
                                     </ul>
                                   </li>
                                 </ul>
-                                <h4><a href="project.html">Groupe S HRWeb</a></h4>
-                                <p><a href="tasks.html">2 Tasks</a>, <a href="issues.html">3 Issues</a>, <a href="timesheets.html">1 Timesheet</a></p>
+                                <h4><a><t t-esc="record.name.value"/></a></h4>
+                                <p id="list"><a><t t-if="record.task.raw_value">
+                                 <field name="open_task"/> <button name="open_tasks" class="oe_project_buttons" type="object">Tasks</button>
+                                 </t></a></p>
+                                 <table class="fields">
+						              <tr t-if="record.date.raw_value"> <th>Deadline</th><td><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>Progress</th><td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
+            					</table>
+					              	<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="avatar"/></t>					            
                             </li>
                             </div>
                             <!--</div>-->
                         </t>
-                        
-                        
-                        
-                        
-                        
+                       
                         <!--<t t-name="tasks">
                             <ul class="oe_kanban_tooltip">
                                 <li><b>Tasks:</b> <field name="open_task"/></li>
@@ -216,28 +221,10 @@
                         </t>
                         <t t-name="kanban-box">
                             <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                            <script type="text/javascript">
-                                    function showElement(layer){
-                                        var myLayer = document.getElementById(layer);
-                                        if(myLayer.style.display=="none"){
-                                        myLayer.style.display="block";
-                                        myLayer.backgroundPosition="top";
-                                        } else { 
-                                        myLayer.style.display="none";
-                                        }
-                                    }
-                                </script>
-                                <a href="#" class="button" onclick="javascript:showElement('v-menu')">
-                                    <span>Click Here</span>
-                                </a>
-                                <ul id="v-menu" class="v-menu" style="display:none;">
-                                    <li><a type="edit">Edit</a></li>
-                                    <li><a type="delete">Delete</a></li>
-                                </ul>
-                                <table class="project_table" >
+                                <table class="project_table">
                                     <tr>
-                                       <!--<td class="td_image" >
-                                              <div class="sequence">
+                                        <td class="td_image">
+                                            <div class="sequence">
                                                 <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
                                                 <div class="manager"><field name="user_id"/></div>
                                             </div>
@@ -247,51 +234,33 @@
                                                     <div class="manager"><b><field name="date"/></b></div>
                                                 </div>
                                             </t>
-                                          </td>-->
-                                        <td class="td_name" align="left">
+                                          </td>
+                                        <td class="td_name">
                                             <div>
                                                 <h4 class="oe_project_font1">
                                                     <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,35)"/><t t-if="record.name.value.length > 35">...</t></div></a>
                                                 </h4>
-                                                <table class ="task">
-                                                    <tr>
+                                                <table >
+                                                    <tr class ="task">
                                                         <td class="buttons">
                                                             <t t-if="record.task.raw_value">
                                                                 <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
                                                             </t>
                                                         </td>
                                                     </tr>
+                                                    <tr>
+                                                        <td height="45px" class="oe_project_members">
+                                                            <t t-foreach="record.members.raw_value" t-as="member">
+                                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
+                                                            </t>
+                                                        </td>
+                                                    </tr>
                                                 </table>
-                                                <table id = "deadline">
-                                                 	<t t-if="record.date.raw_value">
-														<tr ><td width="100px"><strong >Deadline</strong></td><td class="sequence" ></td>
-														<td>
-														<t t-esc="record.date.raw_value.toString('MMMM')"/> 
-													    <t t-esc="record.date.raw_value.getMonth()"/>,
-                             							<t t-esc="record.date.raw_value.getFullYear()"/>
-													    </td>
-													    </tr>
-													    </t>
-													    <t t-if= "Math.round(record.effective_hours.raw_value) !== 0">
-													    <tr ><td width="100px"><strong >Progress</strong></td><td class="sequence"></td>
-															<td>
-														    <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days
-														    </td>
-													    </tr>
-													    </t>
-												</table>
-                                                <table >
-    		                                            <td height="55px" class="oe_project_members">
-	                                                          <t t-foreach="record.members.raw_value" t-as="member">
-                                                              <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
-                                                          </t>
-                                                         </td>
-                                                    </table>
                                             </div>
                                         </td>
                                     </tr>
                                 </table>
-                              <!--<table class="project_table">
+                                <table class="project_table">
                                     <tr>
                                         <td class="td_hours">
                                             <div class="progress invoiced">
@@ -301,7 +270,7 @@
                                             </div>
                                         </td>
                                     </tr>
-                                </table>  -->  
+                                </table>
                             </div>
                         </t>-->
                     </templates>
-- 
cgit v1.2.3


From 8e782f55842b453c665164d2294c4cad7f98d3e6 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 16:33:46 +0530
Subject: [IMP]change kanban view

bzr revid: sgo@tinyerp.com-20120403110346-cy9ogts14lmxwa7t
---
 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 584a20925f0..378ca69ab3a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -200,7 +200,7 @@
                                 </ul>
                                 <h4><a><t t-esc="record.name.value"/></a></h4>
                                 <p id="list"><a><t t-if="record.task.raw_value">
-                                 <field name="open_task"/> <button name="open_tasks" class="oe_project_buttons" type="object">Tasks</button>
+                                 <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
                                  </t></a></p>
                                  <table class="fields">
 						              <tr t-if="record.date.raw_value"> <th>Deadline</th><td><t t-esc="record.date.raw_value.toString('MMMM')"/> 
-- 
cgit v1.2.3


From f4bfc542029c46939a1501ce18664d1abdfef142 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 18:38:52 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120403130852-w7809ri5tq805vay
---
 addons/project/project_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 378ca69ab3a..02dcd360b27 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -184,10 +184,10 @@
                             <!--<div class="content">-->
                             <div class="vignettes">
                             <li class="oe_kanban_vignette">
-                                <a href="#" class="oe_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
+                                <a href="#" class="dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
                                 <ul class="dropdown-menu">
-                                  <li><a href="#">Edit...</a></li>
-                                  <li><a href="#">Delete</a></li>
+                                  <li ><a type="edit" >Edit...</a></li>
+                                  <li ><a type="delete">Delete</a></li>
                                   <li>
                                     <ul class="color-chooser">
                                       <li><a><span class="steelblue square"></span></a></li>
@@ -199,14 +199,14 @@
                                   </li>
                                 </ul>
                                 <h4><a><t t-esc="record.name.value"/></a></h4>
-                                <p id="list"><a><t t-if="record.task.raw_value">
+                                <p id="list" height="10px"><a><t t-if="record.task.raw_value">
                                  <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
                                  </t></a></p>
                                  <table class="fields">
-						              <tr t-if="record.date.raw_value"> <th>Deadline</th><td><t t-esc="record.date.raw_value.toString('MMMM')"/> 
+						              <tr 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>Progress</th><td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
+						              <tr> <th align="left">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
             					</table>
 					              	<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="avatar"/></t>					            
                             </li>
-- 
cgit v1.2.3


From a71f2b9f1425452b3abd161a34fb8551f2f43085 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 18:51:18 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120403132118-9w2mjhq3fr5qdmp7
---
 addons/project/project_view.xml | 5 +++--
 1 file changed, 3 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 02dcd360b27..26732d59642 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -184,14 +184,15 @@
                             <!--<div class="content">-->
                             <div class="vignettes">
                             <li class="oe_kanban_vignette">
-                                <a href="#" class="dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
+                                <a href="#" class="oe_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
                                 <ul class="dropdown-menu">
+                                <table>
                                   <li ><a type="edit" >Edit...</a></li>
                                   <li ><a type="delete">Delete</a></li>
                                   <li>
                                     <ul class="color-chooser">
                                       <li><a><span class="steelblue square"></span></a></li>
-                                      <li><a><span class="firebrick square"></span></a></li>
+                                       <li><a><span class="firebrick square"></span></a></li>
                                       <li><a><span class="khaki square"></span></a></li>
                                       <li><a><span class="thistle square"></span></a></li>
                                       <li><a><span class="orange square"></span></a></li>
-- 
cgit v1.2.3


From 96c334b5acd8ef17d9458bea9f20c93097fb4c71 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Tue, 3 Apr 2012 18:57:53 +0530
Subject: [IMP]remove extra spaces from kanban view

bzr revid: sgo@tinyerp.com-20120403132753-jv1n4kyaxwh0yxtm
---
 addons/project/project_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 26732d59642..d1bdf281cc5 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,7 +186,6 @@
                             <li class="oe_kanban_vignette">
                                 <a href="#" class="oe_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
                                 <ul class="dropdown-menu">
-                                <table>
                                   <li ><a type="edit" >Edit...</a></li>
                                   <li ><a type="delete">Delete</a></li>
                                   <li>
@@ -200,9 +199,9 @@
                                   </li>
                                 </ul>
                                 <h4><a><t t-esc="record.name.value"/></a></h4>
-                                <p id="list" height="10px"><a><t t-if="record.task.raw_value">
+                                <h4 id="list" height="10px"><a><t t-if="record.task.raw_value">
                                  <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
-                                 </t></a></p>
+                                 </t></a></h4>
                                  <table class="fields">
 						              <tr 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()"/>,
-- 
cgit v1.2.3


From fddbe738810ed4b80f2423f33c8d2e8a918e16c1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 11:12:04 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120404054204-vlkhhvrxp0ka15d7
---
 addons/project/project_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d1bdf281cc5..8ef5306fb79 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -182,9 +182,9 @@
                                     }
                             </script>
                             <!--<div class="content">-->
-                            <div class="vignettes">
-                            <li class="oe_kanban_vignette">
-                                <a href="#" class="oe_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
+                            <div class="project_vignettes">
+                            <li class="oe_project_kanban_vignette">
+                                <a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
                                 <ul class="dropdown-menu">
                                   <li ><a type="edit" >Edit...</a></li>
                                   <li ><a type="delete">Delete</a></li>
@@ -202,13 +202,13 @@
                                 <h4 id="list" height="10px"><a><t t-if="record.task.raw_value">
                                  <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
                                  </t></a></h4>
-                                 <table class="fields">
+                                 <table class="project_fields">
 						              <tr 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">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
             					</table>
-					              	<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="avatar"/></t>					            
+					              	<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/></t>					            
                             </li>
                             </div>
                             <!--</div>-->
-- 
cgit v1.2.3


From e21bf1fd8633a6baff08d87a5d048f3c494dd890 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 11:26:18 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120404055618-lbd3oh70smsrcr47
---
 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 8ef5306fb79..de52d171473 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -206,7 +206,7 @@
 						              <tr 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">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
+						              <tr> <th align="left">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-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/></t>					            
                             </li>
-- 
cgit v1.2.3


From 43b46a1623afa8d17601e0bd7965048e16db1f0f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 11:39:33 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404060933-ejaapcvswhrisoou
---
 addons/project/project_view.xml | 70 ++++++++++++++++++++++++-----------------
 1 file changed, 42 insertions(+), 28 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8ef5306fb79..227eb754e2f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -181,37 +181,51 @@
                                     
                                     }
                             </script>
-                            <!--<div class="content">-->
                             <div class="project_vignettes">
-                            <li class="oe_project_kanban_vignette">
-                                <a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="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><span class="steelblue square"></span></a></li>
-                                       <li><a><span class="firebrick square"></span></a></li>
-                                      <li><a><span class="khaki square"></span></a></li>
-                                      <li><a><span class="thistle square"></span></a></li>
-                                      <li><a><span class="orange square"></span></a></li>
+                                <li class="oe_project_kanban_vignette">
+                                    <a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="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><span class="steelblue square"></span></a></li>
+                                           <li><a><span class="firebrick square"></span></a></li>
+                                          <li><a><span class="khaki square"></span></a></li>
+                                          <li><a><span class="thistle square"></span></a></li>
+                                          <li><a><span class="orange square"></span></a></li>
+                                        </ul>
+                                      </li>
                                     </ul>
-                                  </li>
-                                </ul>
-                                <h4><a><t t-esc="record.name.value"/></a></h4>
-                                <h4 id="list" height="10px"><a><t t-if="record.task.raw_value">
-                                 <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
-                                 </t></a></h4>
-                                 <table class="project_fields">
-						              <tr 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">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
-            					</table>
-					              	<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/></t>					            
-                            </li>
+                                    <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>
+                                            <t t-if="record.task.raw_value">
+                                                <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
+                                            </t>
+                                        </a>
+                                    </h4>
+                                    <table class="project_fields">
+                                        <tr 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">Progress</th>
+                                            <td align="left">
+                                                <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days
+                                            </td>
+                                        </tr>
+                                    </table>
+                                    <t t-foreach="record.members.raw_value" t-as="member">
+                                        <img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/>
+                                    </t>					            
+                                </li>
                             </div>
-                            <!--</div>-->
                         </t>
                        
                         <!--<t t-name="tasks">
-- 
cgit v1.2.3


From 0d201ad04be4e54e3bd3e037281cae5d63ee33f6 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 12:00:11 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404063011-0dduyosdzckpzt39
---
 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 e9a825b94b8..0778c0f9571 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -222,7 +222,7 @@
                                         </tr>
                                     </table>
                                     <t t-foreach="record.members.raw_value" t-as="member">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
                                     </t>					            
                                 </li>
                             </div>
-- 
cgit v1.2.3


From 5e8bf6b506a807356a6bbd17ccc6a14c02297dc6 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 12:22:08 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404065208-iab1fi19ceo0l4mc
---
 addons/project/project_view.xml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0778c0f9571..4a6b8a43145 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -221,9 +221,17 @@
                                             </td>
                                         </tr>
                                     </table>
-                                    <t t-foreach="record.members.raw_value" t-as="member">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
-                                    </t>					            
+                                    <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-title="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-title="member" class="project_avatar1"/>
+                                        </t>
+                                    </t>
                                 </li>
                             </div>
                         </t>
-- 
cgit v1.2.3


From a26daf0d129855bdf332c3602afc5b4afa21020f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 12:37:21 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404070721-vwv7bn696x73s3ci
---
 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 4a6b8a43145..f85b0faa594 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -229,7 +229,7 @@
                                     <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-title="member" class="project_avatar1"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
                                         </t>
                                     </t>
                                 </li>
-- 
cgit v1.2.3


From 196564ffa2c87c7125301c5617355b483a3da5bf Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 12:38:09 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120404070809-lntog45xrxy8g3xs
---
 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 4a6b8a43145..967c094edc3 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -206,7 +206,7 @@
                                         </a>
                                     </h4>
                                     <table class="project_fields">
-                                        <tr t-if="record.date.raw_value">
+                                        <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')"/> 
@@ -215,7 +215,7 @@
                                             </td>
                                         </tr>
                                         <tr>
-                                            <th align="left">Progress</th>
+                                            <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>
-- 
cgit v1.2.3


From 7a42d939a34a5252cbe0e94ecc82ba03524ad111 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 4 Apr 2012 14:25:52 +0530
Subject: [IMP]dropdown menu

bzr revid: kbh@tinyerp.com-20120404085552-5ykkcivzdpowarnn
---
 addons/project/project_view.xml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f070082378c..db4f2a78c7e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -175,15 +175,9 @@
                     <field name="date"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <script type="text/javascript">
-                                function showElement(){
-                                    $('.dropdown-toggle').dropdown();
-                                    
-                                    }
-                            </script>
                             <div class="project_vignettes">
                                 <li class="oe_project_kanban_vignette">
-                                    <a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
+                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
                                     <ul class="dropdown-menu">
                                       <li ><a type="edit" >Edit...</a></li>
                                       <li ><a type="delete">Delete</a></li>
-- 
cgit v1.2.3


From ec5524fb8c4cf735fb0240c0ba0fc9f18090e643 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 14:26:22 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404085622-ryzy25okk8x2ravu
---
 addons/project/project_view.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f070082378c..932a9991956 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -221,13 +221,16 @@
                                             </td>
                                         </tr>
                                     </table>
+
                                     <t t-if="record.members.raw_value.length > 7">
+                                                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="project_avatar"/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
                                         </t>
                                     </t>
                                     <t t-if="record.members.raw_value.length &lt;= 7">
                                         <br/><br/>
+                                                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="project_avatar"/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
                                         </t>
-- 
cgit v1.2.3


From 27dd8054fad88f64112478fc118b2dbe35534de6 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 14:31:14 +0530
Subject: [IMP]improve

bzr revid: sgo@tinyerp.com-20120404090114-qhq64kye343ahw7r
---
 addons/project/project_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f070082378c..6cbbe39c3c1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -173,6 +173,7 @@
                     <field name="task"/>
                     <field name="user_id"/>
                     <field name="date"/>
+                    <field name="open_task"/>
                     <templates>
                         <t t-name="kanban-box">
                             <script type="text/javascript">
@@ -201,7 +202,7 @@
                                     <h4 id="list" height="10px">
                                         <a>
                                             <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
+                                                <button name="open_tasks" class="oe_project_buttons" type="object"><t t-esc="record.open_task.value" t-if="record.open_task.value &lt;= 1"> Task,</t><t t-esc="record.open_task.value" t-if="record.open_task.value > 1"> Tasks,</t></button>
                                             </t>
                                         </a>
                                     </h4>
-- 
cgit v1.2.3


From b997ac075841f647f42175abea52b5acca777d1d Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 4 Apr 2012 15:03:46 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120404093346-l5rcgpbf7u9evq3z
---
 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 6cbbe39c3c1..c6b7bcc9260 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -202,7 +202,7 @@
                                     <h4 id="list" height="10px">
                                         <a>
                                             <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" class="oe_project_buttons" type="object"><t t-esc="record.open_task.value" t-if="record.open_task.value &lt;= 1"> Task,</t><t t-esc="record.open_task.value" t-if="record.open_task.value > 1"> Tasks,</t></button>
+                                                <button name="open_tasks" class="oe_project_buttons" type="object"><t t-esc="record.open_task.value" t-if="record.open_task.value &lt;= 1"> Task</t><t t-esc="record.open_task.value" t-if="record.open_task.value > 1"> Tasks</t></button>
                                             </t>
                                         </a>
                                     </h4>
-- 
cgit v1.2.3


From 1f520a1c6f5041a365977f936184b6908dc3f9a5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 15:11:51 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404094151-9tsdlsylu33l8941
---
 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 27a79c242aa..c19624173e0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -218,14 +218,14 @@
                                     </table>
 
                                     <t t-if="record.members.raw_value.length > 7">
-                                                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="project_avatar"/>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value" class="project_avatar"/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
                                         </t>
                                     </t>
                                     <t t-if="record.members.raw_value.length &lt;= 7">
                                         <br/><br/>
-                                                                            <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="project_avatar"/>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value" class="project_avatar"/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
                                             <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
                                         </t>
-- 
cgit v1.2.3


From ba0d6ac4c5486892058a503f701ebf84b24d7a30 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 17:01:46 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120404113146-ls123w7pp1uvokzs
---
 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 2d08757a167..728aea70456 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -196,7 +196,7 @@
                                     <h4 id="list" height="10px">
                                         <a>
                                             <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" class="oe_project_buttons" type="object"><t t-esc="record.open_task.value" t-if="record.open_task.value &lt;= 1"> Task</t><t t-esc="record.open_task.value" t-if="record.open_task.value > 1"> Tasks</t></button>
+                                                <button name="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>
-- 
cgit v1.2.3


From 161633386248bfeab3c09dd97061564fc9f22688 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Apr 2012 13:01:08 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120405073108-yhlqao1nrm3casck
---
 addons/project/project_view.xml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 728aea70456..456c9c33c42 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -216,18 +216,17 @@
                                             </td>
                                         </tr>
                                     </table>
-
                                     <t t-if="record.members.raw_value.length > 7">
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value" class="project_avatar"/>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" t-att-id="member" class="project_avatar"/>
                                         </t>
                                     </t>
                                     <t t-if="record.members.raw_value.length &lt;= 7">
                                         <br/><br/>
-                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value" class="project_avatar"/>
+                                        <img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])"  t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
                                         <t t-foreach="record.members.raw_value" t-as="member">
-                                            <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" class="project_avatar"/>
+                                            <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" t-att-id="member" class="project_avatar"/>
                                         </t>
                                     </t>
                                 </li>
-- 
cgit v1.2.3


From d3c4b80fb86b43c8e9aed022548e6241a092204f Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 5 Apr 2012 15:12:53 +0530
Subject: [IMP]click on kanban opens tasks

bzr revid: sgo@tinyerp.com-20120405094253-f0fzyua28m5opuoy
---
 addons/project/project_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 456c9c33c42..1bacb491634 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -196,10 +196,11 @@
                                     <h4 id="list" height="10px">
                                         <a>
                                             <t t-if="record.task.raw_value">
-                                                <button name="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>
+                                                <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>
+                                    <button class="test" >
                                     <table class="project_fields">
                                         <tr id="deadline" t-if="record.date.raw_value">
                                             <th align="left">Deadline</th>
@@ -229,6 +230,7 @@
                                             <img t-att-src="kanban_image('res.users', 'avatar', member)"  t-att-title="member" t-att-id="member" class="project_avatar"/>
                                         </t>
                                     </t>
+                                    </button>
                                 </li>
                             </div>
                         </t>
-- 
cgit v1.2.3


From fb994730974ca1e0ac17864387ed9bad52281f51 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 6 Apr 2012 12:50:40 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120406072040-kzcd9fql1if5vyz9
---
 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 246154673c5..bc799906836 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -219,13 +219,13 @@
                                         </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-title="member" t-att-id="member" class="project_avatar"/>
+                                                <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-title="member" t-att-id="member" class="project_avatar"/>
+                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-id="member" class="project_avatar"/>
                                             </t>
                                         </t>
                                     </button>
-- 
cgit v1.2.3


From e6f47e03ea42df2d636cb52459cb8f0bd9318b21 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 6 Apr 2012 13:54:58 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120406082458-zd2qrvy3i9yd071o
---
 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 246154673c5..5c8614246cb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -200,7 +200,7 @@
                                             </t>
                                         </a>
                                     </h4>
-                                    <button class="click_button" type="object">
+                                    <button class="click_button" type="object" t-att-id="record.id.value">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
                                                 <th align="left">Deadline</th>
-- 
cgit v1.2.3


From bc6111db349fffbc654f3180fe5b43dcd6a1ecec Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 6 Apr 2012 13:59:37 +0530
Subject: [IMP/ADD]

bzr revid: apa@tinyerp.com-20120406082937-0q9f1jnbpanabmrg
---
 addons/project/project_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index bc799906836..7e12623783c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -184,11 +184,11 @@
                                       <li ><a type="delete">Delete</a></li>
                                       <li>
                                         <ul class="color-chooser">
-                                          <li><a><span class="steelblue square"></span></a></li>
-                                           <li><a><span class="firebrick square"></span></a></li>
-                                          <li><a><span class="khaki square"></span></a></li>
-                                          <li><a><span class="thistle square"></span></a></li>
-                                          <li><a><span class="orange square"></span></a></li>
+                                            <li><a id="steelblue"><span class="steelblue square"></span></a></li>
+                                            <li><a id="firebrick"><span class="firebrick square"></span></a></li>
+                                            <li><a id="khaki"><span class="khaki square"></span></a></li>
+                                            <li><a id="thistle"><span class="thistle square"></span></a></li>
+                                            <li><a id="orange"><span class="orange square"></span></a></li>
                                         </ul>
                                       </li>
                                     </ul>
-- 
cgit v1.2.3


From 715dcf10b7d6902d5c8da3e549b1c2a34d909678 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 6 Apr 2012 16:35:47 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120406110547-8y1s1vx1v7j04p78
---
 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 dd1f595b13d..7e12623783c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -200,7 +200,7 @@
                                             </t>
                                         </a>
                                     </h4>
-                                    <button class="click_button" type="object" t-att-id="record.id.value">
+                                    <button class="click_button" type="object">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
                                                 <th align="left">Deadline</th>
-- 
cgit v1.2.3


From 89194da727ebb8cc3d9a0f7d7aeca7741338fd9a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 9 Apr 2012 15:01:32 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120409093132-lxrojybxcy3u4bb1
---
 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 2be4f8afa9f..5ff98559f4a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -195,7 +195,7 @@
                                     </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>
+                                        <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>
-- 
cgit v1.2.3


From 5cb201f5eb634d976dc353f2ece2f518f1c5a599 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 9 Apr 2012 16:28:30 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120409105830-9xg6ikpqshravpdf
---
 addons/project/project_view.xml | 63 ++---------------------------------------
 1 file changed, 2 insertions(+), 61 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5ff98559f4a..72673430868 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -174,11 +174,12 @@
                     <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 class="oe_project_kanban_vignette">
+                                <li class="oe_project_kanban_vignette " t-attf-class="#{kanban_color(record.color.raw_value)}">
                                     <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
                                     <ul class="dropdown-menu">
                                       <li ><a type="edit" >Edit...</a></li>
@@ -233,66 +234,6 @@
                                 </li>
                             </div>
                         </t>
-                       
-                        <!--<t t-name="tasks">
-                            <ul class="oe_kanban_tooltip">
-                                <li><b>Tasks:</b> <field name="open_task"/></li>
-                            </ul>
-                        </t>
-                        <t t-name="kanban-box">
-                            <div class="oe_module_vignette oe_kanban_box oe_kanban_color_border">
-                                <table class="project_table">
-                                    <tr>
-                                        <td class="td_image">
-                                            <div class="sequence">
-                                                <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" class="avatar"/></button><br/>
-                                                <div class="manager"><field name="user_id"/></div>
-                                            </div>
-                                            <t t-if="record.date.raw_value">
-                                                <div class="sequence">
-                                                    <kbd class="user">Deadline</kbd>
-                                                    <div class="manager"><b><field name="date"/></b></div>
-                                                </div>
-                                            </t>
-                                          </td>
-                                        <td class="td_name">
-                                            <div>
-                                                <h4 class="oe_project_font1">
-                                                    <a type="edit"><div class="oe_project_font"><t t-esc="record.name.value.substr(0,35)"/><t t-if="record.name.value.length > 35">...</t></div></a>
-                                                </h4>
-                                                <table >
-                                                    <tr class ="task">
-                                                        <td class="buttons">
-                                                            <t t-if="record.task.raw_value">
-                                                                <button name="open_tasks" class="oe_project_buttons" type="object" tooltip="tasks"><img src="/project/static/src/img/tasks_icon.png" class="project_icon"/></button>
-                                                            </t>
-                                                        </td>
-                                                    </tr>
-                                                    <tr>
-                                                        <td height="45px" class="oe_project_members">
-                                                            <t t-foreach="record.members.raw_value" t-as="member">
-                                                                <img t-att-src="kanban_image('res.users', 'avatar', member)" class="img_member"/>
-                                                            </t>
-                                                        </td>
-                                                    </tr>
-                                                </table>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                                <table class="project_table">
-                                    <tr>
-                                        <td class="td_hours">
-                                            <div class="progress invoiced">
-                                                <t t-esc="Math.round(record.effective_hours.raw_value)"/> hrs
-                                                <progress t-att-value="record.effective_hours.raw_value" t-att-max="record.total_hours.raw_value"></progress>
-                                                <t t-esc="Math.round(record.total_hours.raw_value)"/> hrs
-                                            </div>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </div>
-                        </t>-->
                     </templates>
                 </kanban>
             </field>
-- 
cgit v1.2.3


From 1d4069695c4ead8fb6707fa824380f8b870d8677 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 9 Apr 2012 17:01:31 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120409113131-629ryv9q060m1q2a
---
 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 72673430868..afceca516a9 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -179,7 +179,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div class="project_vignettes">
-                                <li class="oe_project_kanban_vignette " t-attf-class="#{kanban_color(record.color.raw_value)}">
+                                <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette">
                                     <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
                                     <ul class="dropdown-menu">
                                       <li ><a type="edit" >Edit...</a></li>
-- 
cgit v1.2.3


From 389c2f9804332655da5ee8814c4fac5eb0979e09 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 10 Apr 2012 12:05:43 +0530
Subject: [IMP]:set bgcolor

bzr revid: apa@tinyerp.com-20120410063543-kmw7fkbht8d7s3qe
---
 addons/project/project_view.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index afceca516a9..c1cf4948b04 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,11 +186,11 @@
                                       <li ><a type="delete">Delete</a></li>
                                       <li>
                                         <ul class="color-chooser">
-                                            <li><a id="steelblue"><span class="steelblue square"></span></a></li>
-                                            <li><a id="firebrick"><span class="firebrick square"></span></a></li>
-                                            <li><a id="khaki"><span class="khaki square"></span></a></li>
-                                            <li><a id="thistle"><span class="thistle square"></span></a></li>
-                                            <li><a id="orange"><span class="orange square"></span></a></li>
+                                            <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>
-- 
cgit v1.2.3


From 4916d46cf9f1935393c693f568709fb9fe3c7f78 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 10 Apr 2012 15:03:17 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120410093317-yufo0pu7grib5ksw
---
 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 c1cf4948b04..cae0d54bb88 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -179,7 +179,7 @@
                     <templates>
                         <t t-name="kanban-box">
                             <div class="project_vignettes">
-                                <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette">
+                                <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette" id="oe_project_kanban_vignette">
                                     <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
                                     <ul class="dropdown-menu">
                                       <li ><a type="edit" >Edit...</a></li>
-- 
cgit v1.2.3


From b793ddb42a95647e827a124a09a0d201fb35fd30 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 11 Apr 2012 06:59:16 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120411012916-bjlod5t0wlg9arwr
---
 addons/project/project_view.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cae0d54bb88..9332296580e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -219,17 +219,14 @@
                                                 </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 t-if="record.members.raw_value.length &lt;= 7"><br/><br/><br/></t>
+                                        <t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/><br/></t>
+                      
+                                        
+                                        <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>
+
                                     </button>
                                 </li>
                             </div>
-- 
cgit v1.2.3


From 59e07ee6f05dde3e1916b4a9f195ab29dc7a0781 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 11 Apr 2012 11:13:56 +0530
Subject: [IMP]add white color background

bzr revid: sgo@tinyerp.com-20120411054356-9bfsxnvb4zkfcphm
---
 addons/project/project_view.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index cae0d54bb88..13446e5830f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,6 +186,7 @@
                                       <li ><a type="delete">Delete</a></li>
                                       <li>
                                         <ul class="color-chooser">
+                                        	<li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
                                             <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>
-- 
cgit v1.2.3


From e6648c61b00b3e92aa9329dddefac4c3f0848f18 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 11 Apr 2012 14:13:44 +0530
Subject: [IMP]increase font size

bzr revid: sgo@tinyerp.com-20120411084344-cshm49iu3ppw93r2
---
 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 1bdbe1b9307..b1e3c909dfc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -199,7 +199,7 @@
                                     <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>
+                                                <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><div class="fontsize"><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"/>)</div></button>
                                             </t>
                                         </a>
                                     </h4>
-- 
cgit v1.2.3


From b38ba6637b6832fdd68850591676aefbd39a62b5 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 11 Apr 2012 15:06:52 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120411093652-32fldjnoophainuw
---
 addons/project/project_view.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1bdbe1b9307..f617304e87e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,7 +186,7 @@
                                       <li ><a type="delete">Delete</a></li>
                                       <li>
                                         <ul class="color-chooser">
-                                        	<li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
                                             <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>
@@ -196,13 +196,13 @@
                                       </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">
+                                    <div id="list">
                                         <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>
+                                    </div>
                                     <button class="click_button" type="object">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
@@ -222,12 +222,9 @@
                                         </table>
                                         <t t-if="record.members.raw_value.length &lt;= 7"><br/><br/><br/></t>
                                         <t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/><br/></t>
-                      
-                                        
                                         <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>
-
                                     </button>
                                 </li>
                             </div>
-- 
cgit v1.2.3


From af2fff8998321ff261ac47070fa32d4136eb67ea Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 11 Apr 2012 16:27:36 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120411105736-tuopbrt86ixifq05
---
 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 f617304e87e..0e080c3a9a1 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -221,7 +221,7 @@
                                             </tr>
                                         </table>
                                         <t t-if="record.members.raw_value.length &lt;= 7"><br/><br/><br/></t>
-                                        <t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/><br/></t>
+                                        <t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/></t>
                                         <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>
-- 
cgit v1.2.3


From 490cc4a0cf767c4f2e97086b63aa450f1780be59 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 11 Apr 2012 17:33:29 +0530
Subject: [IMP]improve progress as per suggestion

bzr revid: sgo@tinyerp.com-20120411120329-as07fv3jd2hoeqxa
---
 addons/project/project_view.xml | 5 +++--
 1 file changed, 3 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 b1e3c909dfc..e19ddc0f62c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -167,7 +167,7 @@
             <field name="arch" type="xml">
                 <kanban>
                     <field name="effective_hours"/>
-                    <field name="total_hours"/>
+                    <field name="planned_hours"/>
                     <field name="date"/>
                     <field name="name"/>
                     <field name="members"/>
@@ -175,6 +175,7 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
+                    <field name="cal_days"/>
                     <field name="open_task"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -216,7 +217,7 @@
                                             <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
+                                                    <t t-esc="Math.round(record.effective_hours.raw_value/record.cal_days.value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value/record.cal_days.value)"/> days
                                                 </td>
                                             </tr>
                                         </table>
-- 
cgit v1.2.3


From 3aaf2d8b6af6be372e8d15dc8dd8b0176a1ae44d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 11 Apr 2012 18:10:08 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120411124008-2t1f7vsma5nib5ve
---
 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 4f2f87de8ca..755bcb58247 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -221,8 +221,8 @@
                                                 </td>
                                             </tr>
                                         </table>
-                                        <t t-if="record.members.raw_value.length &lt;= 7"><br/><br/><br/></t>
-                                        <t t-if="record.members.raw_value.length &gt; 7 and record.members.raw_value.length &lt;= 14"><br/></t>
+                                        <t t-if="record.members.raw_value.length &lt;=8"><br/><br/><br/></t>
+                                        <t t-if="record.members.raw_value.length &gt;8 and record.members.raw_value.length &lt;= 16"><br/></t>
                                         <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>
-- 
cgit v1.2.3


From ff4a2b1c757651bee0d86ac926818af4a02d8847 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Wed, 11 Apr 2012 18:45:11 +0530
Subject: [IMP]

bzr revid: sgo@tinyerp.com-20120411131511-d5ozvnd62n52wa2c
---
 addons/project/project_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 4f2f87de8ca..d570b7c10fc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -175,7 +175,6 @@
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
-                    <field name="cal_days"/>
                     <field name="open_task"/>
                     <templates>
                         <t t-name="kanban-box">
@@ -217,7 +216,7 @@
                                             <tr>
                                                 <th align="left" width="70px">Progress</th>
                                                 <td align="left">
-                                                    <t t-esc="Math.round(record.effective_hours.raw_value/record.cal_days.value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value/record.cal_days.value)"/> days
+                                                    <t t-esc="record.effective_hours.raw_value"/>/<t t-esc="record.planned_hours.raw_value"/> <field name="uom_company"/>
                                                 </td>
                                             </tr>
                                         </table>
-- 
cgit v1.2.3


From 3b5ccc5a77db22f3877894c49baa1baabeca928c Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 12 Apr 2012 11:16:31 +0530
Subject: [IMP]:improved bgcolor code.

bzr revid: apa@tinyerp.com-20120412054631-xs2nk19n3w858qpn
---
 addons/project/project_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 7b294d9f16f..10c49fc74cc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -186,12 +186,12 @@
                                       <li ><a type="delete">Delete</a></li>
                                       <li>
                                         <ul class="color-chooser">
-                                            <li><a t-att-id="record.id.value" class="bgcolor_white"><span class="white square"></span></a></li>
-                                            <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>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_0 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_1 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_2 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_3 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_4 square"></span></a></li>
+                                            <li><a t-att-id="record.id.value" class="bgcolor"><span class="oe_kanban_color_5 square"></span></a></li>
                                         </ul>
                                       </li>
                                     </ul>
-- 
cgit v1.2.3


From 219d7a41e26c207ac8121c2fa4aa8dd1f81290bb Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 12 Apr 2012 14:31:32 +0530
Subject: [IMP]

bzr revid: apa@tinyerp.com-20120412090132-6z0n88dekys017un
---
 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 10c49fc74cc..8633c61a07b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -195,7 +195,7 @@
                                         </ul>
                                       </li>
                                     </ul>
-                                    <h4><t t-esc="record.name.value.substr(0,32)"/><t t-if="record.name.value.length > 32">...</t></h4>
+                                    <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
                                     <div id="list">
                                         <a id="1">
                                             <t t-if="record.task.raw_value">
-- 
cgit v1.2.3


From 7ea9856d0e29907a917f3490c83dc954d920b125 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 24 Apr 2012 17:03:21 +0530
Subject: [IMP] Improve css and py fiel

bzr revid: mma@tinyerp.com-20120424113321-n9b5076z7v8pcfu5
---
 addons/project/project_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index b7f174733db..ea18796c2df 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -182,7 +182,7 @@
                         <t t-name="kanban-box">
                             <div class="project_vignettes">
                                 <li t-attf-class="#{kanban_color(record.color.raw_value)} oe_project_kanban_vignette" id="oe_project_kanban_vignette">
-                                    <a href="#" class="oe_project_kanban_action dropdown-toggle"><span class="i">B</span></a>
+                                    <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>
@@ -205,6 +205,7 @@
                                             </t>
                                         </a>
                                     </div>
+                                    <br/>
                                     <button class="click_button" type="object">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
-- 
cgit v1.2.3


From 50830935dc3b9783363b027c654279768b270960 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 24 Apr 2012 17:54:52 +0530
Subject: [IMP] Improve view file and css

bzr revid: mma@tinyerp.com-20120424122452-45phrpqugzax6wbm
---
 addons/project/project_view.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index ea18796c2df..c0054a3006d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -201,7 +201,7 @@
                                     <div id="list">
                                         <a id="1">
                                             <t t-if="record.task.raw_value">
-                                                <button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><div class="fontsize"><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"/>)</div></button>
+                                                <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>
                                     </div>
@@ -223,8 +223,7 @@
                                                 </td>
                                             </tr>
                                         </table>
-                                        <t t-if="record.members.raw_value.length &lt;=8"><br/><br/><br/></t>
-                                        <t t-if="record.members.raw_value.length &gt;8 and record.members.raw_value.length &lt;= 16"><br/></t>
+                                        <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>
-- 
cgit v1.2.3


From f8e076e9a4c1f08d33ab81a33706c645be75739a Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 27 Apr 2012 11:57:25 +0530
Subject: [IMP]:improved code.

bzr revid: apa@tinyerp.com-20120427062725-0lpfbxs0xkdmm7zf
---
 addons/project/project_view.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 16bace0db18..1b317d671ca 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -198,11 +198,9 @@
                                     </ul>
                                     <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
                                     <div id="list">
-                                        <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>
+                                        <t t-if="record.task.raw_value">
+                                            <a id="1" name="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"/>)</a>
+                                        </t>
                                     </div>
                                     <br/>
                                     <button class="click_button" type="object">
@@ -229,6 +227,17 @@
                                     </button>
                                 </li>
                             </div>
+                            <script type="text/javascript">
+                                //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();
+                                });
+                            </script>
                         </t>
                     </templates>
                 </kanban>
-- 
cgit v1.2.3


From bfd96de42bc942fa24158a8c87b9e905c2460b72 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Mon, 7 May 2012 12:50:49 +0530
Subject: [IMP]rename all fields which r required in project and another module
 and improve code and

bzr revid: sgo@tinyerp.com-20120507072049-u00lsqra9x34nf73
---
 addons/project/project_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1b317d671ca..a9886e3b1c7 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -45,7 +45,7 @@
                         <page string="Administration">
                             <group col="2" colspan="2" name="kanban">
                                 <separator colspan="2" string="Project Management"/>
-                                    <field name="task"/>
+                                    <field name="use_tasks"/>
                             </group>
                             <group col="2" colspan="2">
                                 <separator colspan="4" string="Performance"/>
@@ -172,11 +172,11 @@
                     <field name="date"/>
                     <field name="name"/>
                     <field name="members"/>
-                    <field name="task"/>
+                    <field name="use_tasks"/>
                     <field name="user_id"/>
                     <field name="date"/>
                     <field name="color"/>
-                    <field name="open_task"/>
+                    <field name="task_count"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div class="project_vignettes">
@@ -198,8 +198,8 @@
                                     </ul>
                                     <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
                                     <div id="list">
-                                        <t t-if="record.task.raw_value">
-                                            <a id="1" name="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"/>)</a>
+                                        <t t-if="record.use_tasks.raw_value">
+                                            <a id="1" name="open_tasks" class="oe_project_buttons" type="object"><t t-if="record.task_count.value &lt;= 1"> Task</t><t t-if="record.task_count.value &gt; 1"> Tasks</t>(<t t-esc="record.task_count.value"/>)</a>
                                         </t>
                                     </div>
                                     <br/>
@@ -216,7 +216,7 @@
                                             <tr>
                                                 <th align="left" width="70px">Progress</th>
                                                 <td align="left">
-                                                    <t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>s
+                                                    <t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
                                                 </td>
                                             </tr>
                                         </table>
-- 
cgit v1.2.3


From cb30916a6a3f62f6db86ad96507ed8f98002ec15 Mon Sep 17 00:00:00 2001
From: "apa-tiny (apa@tinyerp.com)" <>
Date: Mon, 7 May 2012 14:53:28 +0530
Subject: [IMP]:project:In kanban view, simply use <field name=date/>. removed
 hardcoded.

bzr revid: apa@tinyerp.com-20120507092328-t03v7kosvjg8omrz
---
 addons/project/project_view.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index a9886e3b1c7..3a9a825e950 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -169,7 +169,6 @@
                 <kanban>
                     <field name="effective_hours"/>
                     <field name="planned_hours"/>
-                    <field name="date"/>
                     <field name="name"/>
                     <field name="members"/>
                     <field name="use_tasks"/>
@@ -207,11 +206,7 @@
                                         <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>
+                                                <td align="left"><field name="date"/></td>
                                             </tr>
                                             <tr>
                                                 <th align="left" width="70px">Progress</th>
-- 
cgit v1.2.3


From 38fd7fa19df5d752c05eb21fad9f07daccca4395 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 7 May 2012 18:27:08 +0530
Subject: [IMP]:project:Used a relate action like
 'project.act_project_project_2_project_task_all' instead (easier to configure
 and maintain) and remove default value for project_id.

bzr revid: apa@tinyerp.com-20120507125708-7gcxl8915us0xoio
---
 addons/project/project_view.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 3a9a825e950..1e8b6ce77bc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -161,6 +161,16 @@
             </field>
         </record>
         
+        <act_window
+            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
+            id="act_project_project_2_project_task_all"
+            name="Tasks"
+            res_model="project.task"
+            src_model="project.project"
+            view_mode="kanban,tree,form,calendar,graph"
+            view_type="form"/>
+
+        
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
@@ -198,11 +208,11 @@
                                     <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
                                     <div id="list">
                                         <t t-if="record.use_tasks.raw_value">
-                                            <a id="1" name="open_tasks" class="oe_project_buttons" type="object"><t t-if="record.task_count.value &lt;= 1"> Task</t><t t-if="record.task_count.value &gt; 1"> Tasks</t>(<t t-esc="record.task_count.value"/>)</a>
+                                            <a id="1" name="%(act_project_project_2_project_task_all)d" class="oe_project_buttons" type="action"><t t-if="record.task_count.value &lt;= 1"> Task</t><t t-if="record.task_count.value &gt; 1"> Tasks</t>(<t t-esc="record.task_count.value"/>)</a>
                                         </t>
                                     </div>
                                     <br/>
-                                    <button class="click_button" type="object">
+                                    <button class="click_button" type="action">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
                                                 <th align="left">Deadline</th>
@@ -397,8 +407,7 @@
                 </form>
             </field>
         </record>
-
-
+        
         <!-- Project Task Kanban View  -->
         <record model="ir.ui.view" id="view_task_kanban">
             <field name="name">project.task.kanban</field>
@@ -717,15 +726,6 @@
 
         <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"/>
 
-        <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="tree,form,calendar,graph"
-            view_type="form"/>
-
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>
             <field name="model">res.company</field>
-- 
cgit v1.2.3


From 7dab19c32b6a8303711cdfb6d5da5d96d177e43d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 9 May 2012 08:55:22 +0200
Subject: [IMP] project: small code cleanup for project kanban view

bzr revid: rco@openerp.com-20120509065522-16ouzxqiwqgjdcyd
---
 addons/project/project_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e8b6ce77bc..19a1d0d4454 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -207,12 +207,12 @@
                                     </ul>
                                     <h4><t t-esc="record.name.value.substr(0,33)"/><t t-if="record.name.value.length > 33">...</t></h4>
                                     <div id="list">
-                                        <t t-if="record.use_tasks.raw_value">
-                                            <a id="1" name="%(act_project_project_2_project_task_all)d" class="oe_project_buttons" type="action"><t t-if="record.task_count.value &lt;= 1"> Task</t><t t-if="record.task_count.value &gt; 1"> Tasks</t>(<t t-esc="record.task_count.value"/>)</a>
-                                        </t>
+                                        <a t-if="record.use_tasks.raw_value" class="oe_project_buttons"
+                                            id="1" name="%(act_project_project_2_project_task_all)d" type="action">
+                                            Tasks(<field name="task_count"/>)</a>
                                     </div>
                                     <br/>
-                                    <button class="click_button" type="action">
+                                    <button class="click_button" name="dummy" type="object">
                                         <table class="project_fields">
                                             <tr id="deadline" t-if="record.date.raw_value">
                                                 <th align="left">Deadline</th>
-- 
cgit v1.2.3