From 8ade69632e43b7c1ea5a33933e39f0de0958ccd8 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Thu, 19 May 2011 12:02:55 +0530
Subject: [usability], with project task in calendar view replaced the start
 date with deadline date

bzr revid: amb@tinyerp.com-20110519063255-lao3cufauxk6sfpe
---
 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 d3b28c0d562..a2c52d3d85b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -356,7 +356,7 @@
             <field name="type">calendar</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <calendar color="user_id" date_delay="planned_hours" date_start="date_start" string="Tasks">
+                <calendar color="user_id" date_delay="planned_hours" date_start="date_deadline" string="Tasks">
                     <field name="name"/>
                     <field name="project_id"/>
                 </calendar>
-- 
cgit v1.2.3


From da785dae559dde0cf77d97237c51f12b5479d636 Mon Sep 17 00:00:00 2001
From: Jigar Amin <jam@tinyerp.com>
Date: Tue, 28 Jun 2011 11:09:40 +0530
Subject: [FIX] 1) project - imporved the gantt view of the Task 2)
 project_long_term:refectored phase scheduling procress

bzr revid: jam@tinyerp.com-20110628053940-fg62i9foq6ph1adz
---
 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 5faa0090a15..0f53aff7ed4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -369,7 +369,7 @@
             <field name="type">gantt</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <gantt color="user_id" date_delay="planned_hours" date_start="date_start" string="Tasks">
+                <gantt color="user_id" date_start="date_start" date_stop="date_end" string="Tasks">
                     <level object="project.project" link="project_id" domain="[]">
                         <field name="name"/>
                     </level>
-- 
cgit v1.2.3


From 5bc8c72cf543cedb2ef1943b836eb37bb1e5973a Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Wed, 20 Jul 2011 15:34:54 +0530
Subject: [usability],tooltip on search button

bzr revid: amb@tinyerp.com-20110720100454-ko6iub7h021u25ry
---
 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 85cde448c6d..334e43ad1bd 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -397,7 +397,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="Draft and In Progress tasks" icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="draft, open and pending documents" icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-- 
cgit v1.2.3


From 772719e00fe0127d72b686b9c9ab6c7a842d3c4d Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Fri, 22 Jul 2011 15:30:00 +0530
Subject: [usability],tooptip on search button

bzr revid: amb@tinyerp.com-20110722100000-736i3hxq1rlxq5oq
---
 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 334e43ad1bd..6fb57817a3e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -397,7 +397,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft'))]"  name="current" help="draft, open and pending documents" icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, Open and Pending Documents." icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-- 
cgit v1.2.3


From 76511fd3cf314009d08d9a265b883ff977b4cd6f Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 25 Jul 2011 14:44:54 +0530
Subject: [usability],improve tooltip on search button

bzr revid: amb@tinyerp.com-20110725091454-mmcau026pyzze68f
---
 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 6fb57817a3e..c20d971c845 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -397,7 +397,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, Open and Pending Documents." icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, Open and Pending Tasks." icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-- 
cgit v1.2.3


From 44ab57643e4e27cac356936205941c61cddf5a08 Mon Sep 17 00:00:00 2001
From: "Amit Bhavsar (Open ERP)" <amb@tinyerp.com>
Date: Mon, 25 Jul 2011 15:21:30 +0530
Subject: [usability],improve tooltip on search button tasks/phases

bzr revid: amb@tinyerp.com-20110725095130-ttzkwmd36p4k3cba
---
 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 c20d971c845..b4645e9eac8 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -397,7 +397,7 @@
             <field name="arch" type="xml">
                <search string="Task Edition">
                     <group col="20" colspan="4">
-                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, Open and Pending Tasks." icon="terp-check"/>
+                        <filter string="Current" domain="[('state','in',('open','draft','pending'))]"  name="current" help="Draft, In Progress and Pending Tasks." icon="terp-check"/>
                         <filter string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
                         <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
                         <separator orientation="vertical"/>
-- 
cgit v1.2.3


From caa3c07094a5250b18c7cd44f7f4708b4e08907c Mon Sep 17 00:00:00 2001
From: "RavishchanraMurari (Open ERP)" <rmu@tinyerp.com>
Date: Thu, 28 Jul 2011 11:41:56 +0530
Subject: email.addresss_id_repalce_by_user_email

bzr revid: rmu@tinyerp.com-20110728061156-swmn5jz78zb3w4vd
---
 addons/project/project_view.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 5cda5222e35..70eef194c2c 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -63,7 +63,6 @@
                                 <tree string="Members">
                                     <field name="name"/>
                                     <field name="user_email"/>
-                                    <field name="address_id"/>
                                 </tree>
                             </field>
                         </page>
-- 
cgit v1.2.3


From c81a94ba3c9d37eef6d7f43cb27db21b444ccb68 Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Tue, 2 Aug 2011 16:40:20 +0200
Subject: adapt default filters to new user preferences view

bzr revid: rco@openerp.com-20110802144020-m8bk7a8xo6ji9z00
---
 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 5cda5222e35..10dd89b846a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -559,9 +559,9 @@
          <field name="type">form</field>
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
-            <page string="Current Activity" position="inside">
+            <group name="default_filters" position="inside">
                 <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection" readonly="0"/>
-            </page>
+            </group>
        </field>
     </record>
     <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" domain="[('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>
-- 
cgit v1.2.3


From f40c454fe4558dbf40222b04263fc3cd79ab9bef Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 3 Aug 2011 10:16:20 +0200
Subject: adapt inherited views to new users form

bzr revid: rco@openerp.com-20110803081620-kzl9agsl7900tsdd
---
 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 10dd89b846a..dbed52c6a25 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -546,9 +546,9 @@
           <field name="inherit_id" ref="base.view_users_form"/>
           <field eval="18" name="priority"/>
           <field name="arch" type="xml">
-              <xpath expr="/form/notebook" position="before">
+              <group name="default_filters" position="inside">
                    <field name="context_project_id"/>
-              </xpath>
+              </group>
           </field>
      </record>
 
@@ -560,7 +560,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <group name="default_filters" position="inside">
-                <field name="context_project_id" completion="1" context="{'user_prefence':True}" widget="selection" readonly="0"/>
+                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
             </group>
        </field>
     </record>
-- 
cgit v1.2.3


From fa7874cddc48e7ba4bd7f74ce5159351536d1514 Mon Sep 17 00:00:00 2001
From: fp <fp@fp-laptop>
Date: Mon, 15 Aug 2011 16:21:41 +0200
Subject: [IMP] Improved bank account management, report footer, stages by
 default on projects

bzr revid: fp@fp-laptop-20110815142141-938zg1laoe8wtbkd
---
 addons/project/project_view.xml | 5 ++++-
 1 file changed, 4 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 731134d0cc6..435bf64fe8d 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -247,7 +247,7 @@
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
-                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'invisible':[('state','in',['draft'])],'readonly':[('state','=','done')]}">
+                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
                                 <tree string="Task Work" editable="top">
                                     <field name="name" />
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
@@ -481,8 +481,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Task Stage">
+                    <group colspan="4" col="6">
                     <field name="name" select="1"/>
+                    <field name="project_default"/>
                     <field name="sequence"/>
+                    </group>
                     <separator string="Description" colspan="4"/>
                     <field colspan="4" name="description" nolabel="1"/>
                 </form>
-- 
cgit v1.2.3


From c94116f41becac94b9bcb6c87a862ff4fbaeb58c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 6 Sep 2011 09:37:42 +0200
Subject: [IMP] project,crm: spellcheck/cleanup
 `user_prefence`->`user_preference`

bzr revid: odo@openerp.com-20110906073742-lzge2gphka2vmft7
---
 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 435bf64fe8d..fdb7aa1ebb0 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -562,7 +562,7 @@
          <field eval="18" name="priority"/>
          <field name="arch" type="xml">
             <group name="default_filters" position="inside">
-                <field name="context_project_id" context="{'user_prefence':True}" widget="selection"/>
+                <field name="context_project_id" context="{'user_preference':True}" widget="selection"/>
             </group>
        </field>
     </record>
-- 
cgit v1.2.3


From 178fec5c6410db05dd7b49f362454a49a4dd8b21 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Sun, 11 Sep 2011 15:50:25 +0200
Subject: [FIX] str 'in' str (singletons missing tuple-building comma), in
 @colors attributes. Replace by string equality

bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
---
 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 fdb7aa1ebb0..a84423a4703 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -134,7 +134,7 @@
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="red:date and (date&lt;current_date) and (state in ('open'));blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
                     <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
-- 
cgit v1.2.3


From ea2e8b64c42430b2323149b3b3d6c90f23800c5f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 13 Sep 2011 18:29:07 +0200
Subject: [MERGE] trunk-kanban-ysa (manually because of uncommit in trunk)

bzr revid: al@openerp.com-20110913162907-4gvjesa21nvf8v95
---
 addons/project/project_view.xml | 65 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 61 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 a84423a4703..0f0c4a9ca0b 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -297,7 +297,7 @@
                                 <field name="create_date"/>
                             </group>
                             <separator string="Miscelleanous" colspan="4"/>
-                            <field name="partner_id"/>
+                            <field name="partner_id" />
                             <field name="company_id" select="1" groups="base.group_multi_company" widget="selection"/>
                             <group col="4" colspan="2">
                                 <field name="type_id" widget="selection" readonly="1"/>
@@ -312,6 +312,63 @@
             </field>
         </record>
 
+
+
+        <record id="view_task_kanban" model="ir.ui.view">
+            <field name="name">project.task.kanban</field>
+            <field name="model">project.task</field>
+            <field name="type">kanban</field>
+            <field name="arch" type="xml">
+                <kanban>
+                <field name="state"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <t t-set="color">#fff</t>
+                            <t t-if="state.raw_value == 'done'" t-set="color">#dfd</t>
+                            <t t-if="state.raw_value == 'open'" t-set="color">lightcyan</t>
+                            <t t-if="state.raw_value == 'cancel' and total_hours.raw_value gt 0" t-set="color">red</t>
+                            <div t-attf-style="background: #{color}">
+                                <table>
+                                    <tr>
+                                        <td>Title :</td>
+                                        <td><field name="name"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Progress :</td>
+                                        <td><field name="progress"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td><button data-type="action" data-name="%(action_project_task_reevaluate)d">Reevaluate</button><button data-type="edit" >Edit</button></td>
+                                        <td><button data-type="object" data-name="prev_type">Previous phase</button></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Project name:</td>
+                                        <td colspan="2"><field name="project_id"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Phase</td>
+                                        <td colspan="2"><field name="type_id"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Remain Time :</td>
+                                        <td colspan="2"><field name="remaining_hours"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Spent Time :</td>
+                                        <td colspan="2"><field name="remaining_hours"/></td>
+                                    </tr>
+                                    <tr>
+                                        <td>Remain Time :</td>
+                                        <td colspan="2"><field name="remaining_hours"/></td>
+                                    </tr>
+                                </table>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
         <record id="view_task_tree2" model="ir.ui.view">
             <field name="name">project.task.tree</field>
             <field name="model">project.task</field>
@@ -437,7 +494,7 @@
             <field name="name">Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,gantt,graph</field>
+            <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
             <field eval="False" name="filter"/>
             <field name="view_id" ref="view_task_tree2"/>
             <field name="context">{"search_default_user_id":uid, "search_default_current": 1}</field>
@@ -450,7 +507,7 @@
             <field name="name">Overpassed Tasks</field>
             <field name="res_model">project.task</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
+            <field name="view_mode">tree,form,calendar,graph,kanban</field>
             <field name="domain">[('date_deadline','&lt;',time.strftime('%Y-%m-%d')),('state','in',('draft','pending','open'))]</field>
             <field name="filter" eval="True"/>
             <field name="search_view_id" ref="view_task_search_form"/>
@@ -461,7 +518,7 @@
             <field name="res_model">project.task</field>
             <field name="name">Project's tasks</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph,gantt</field>
+            <field name="view_mode">tree,form,calendar,graph,gantt,kanban</field>
             <field name="domain">[('project_id', 'child_of', [active_id])]</field>
             <field name="context">{'project_id':active_id, 'active_test':False}</field>
         </record>
-- 
cgit v1.2.3