From 50da95e65b24cef21b816b88e0cccc50ddb7ded0 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 30 Oct 2012 11:59:03 +0530
Subject: [PATCH 1/8] [IMP] remove widget from the vesrsion field

bzr revid: nco@tinyerp.com-20121030062903-h69jahwg8w16xgqo
---
 addons/project_issue/project_issue_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 9284322880d..b5f2962077f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -131,7 +131,7 @@
                         <page string="Description">
                             <group>
                                 <group>
-                                    <field name="version_id" widget="selection"/>
+                                    <field name="version_id"/>
                                 </group>
                             </group>
                             <field name="description" placeholder="Add a description..."/>

From ac98394a8c02fba16b25c6ed3155ddb1446cba8a Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 30 Oct 2012 12:02:43 +0530
Subject: [PATCH 2/8] [IMP] move version filed below the category field.

bzr revid: nco@tinyerp.com-20121030063243-n5h80im9y0yr672g
---
 addons/project_issue/project_issue_view.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b5f2962077f..85cb5b161a1 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -125,15 +125,11 @@
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
                             <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="version_id"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <group>
-                                <group>
-                                    <field name="version_id"/>
-                                </group>
-                            </group>
                             <field name="description" placeholder="Add a description..."/>
                         </page>
                         <page string="Extra Info" groups="base.group_no_one">

From cb679f0818c657a2ea58c8036fea8e8a66fa5918 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Tue, 30 Oct 2012 18:14:05 +0530
Subject: [PATCH 3/8] [IMP] rename Categories into Tags field in issue

bzr revid: fka@tinyerp.com-20121030124405-92yw2j89a1ryum6p
---
 addons/project_issue/project_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 770c226fc2f..2e591826da0 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -240,7 +240,7 @@ class project_issue(base_stage, osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
-        'categ_ids': fields.many2many('project.category', string='Categories'),
+        'categ_ids': fields.many2many('project.category', string='Tags'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',

From f00b59f21b233ec3e92260d30eab219e4dae454d Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 31 Oct 2012 11:35:13 +0530
Subject: [PATCH 4/8] [IMP] in project kanban view, display a plural with only
 one task and issue

bzr revid: fka@tinyerp.com-20121031060513-1dulsf7ypbor5oik
---
 addons/project/project_view.xml             | 5 ++++-
 addons/project_issue/project_issue_view.xml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 29be26bc127..e29373872bc 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -238,7 +238,10 @@
 
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> <field name="task_count"/> Tasks</a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> <field name="task_count"/> 
+                                            <span t-if="record.task_count.raw_value gt 1"> Tasks</span>
+                                            <span t-if="record.task_count.raw_value lt 2"> Task</span>
+                                        </a>
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <span groups="project.group_time_work_estimation_tasks">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 85cb5b161a1..56cc1ab4109 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -376,7 +376,10 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
-                        <field name="issue_count"/> Issues</a>
+                        <field name="issue_count"/>
+                        <span t-if="record.issue_count.raw_value gt 1"> Issues</span>
+                        <span t-if="record.issue_count.raw_value lt 2"> Issue</span>
+                    </a>
                 </xpath>
             </field>
         </record>

From f910304739431d5166eaa5a25d67f0005bea74e7 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 31 Oct 2012 11:56:09 +0530
Subject: [PATCH 5/8] [IMP] in project kanban add underline link on issues &
 task

bzr revid: fka@tinyerp.com-20121031062609-tpgx46bzlg27gdtv
---
 addons/project/static/src/css/project.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index 8381e6d68d3..7fca36c40c4 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -7,8 +7,9 @@
     min-height: 160px;
 }
 
-.oe_kanban_project_list {
+.oe_kanban_project_list > a > span:hover{
     margin: 4px 0;
+    text-decoration: underline;
 }
 
 .openerp .oe_kanban_content h4 {

From c53a3678499eb5099530bf2068c6eeeeca19f9fd Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 31 Oct 2012 12:57:59 +0530
Subject: [PATCH 6/8] [IMP] improve code

bzr revid: fka@tinyerp.com-20121031072759-705esml0nb4cvsdm
---
 addons/project/project_view.xml             | 6 +++---
 addons/project_issue/project_issue_view.xml | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e29373872bc..ba8ee631821 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -238,9 +238,9 @@
 
                                     <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> <field name="task_count"/> 
-                                            <span t-if="record.task_count.raw_value gt 1"> Tasks</span>
-                                            <span t-if="record.task_count.raw_value lt 2"> Task</span>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> 
+                                            <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
+                                            <span t-if="record.task_count.raw_value lt 2"><field name="task_count"/> Task</span>
                                         </a>
                                     </div>
                                     <div class="oe_kanban_footer_left">
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 56cc1ab4109..e3105127c5d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -376,9 +376,8 @@
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
-                        <field name="issue_count"/>
-                        <span t-if="record.issue_count.raw_value gt 1"> Issues</span>
-                        <span t-if="record.issue_count.raw_value lt 2"> Issue</span>
+                        <span t-if="record.issue_count.raw_value gt 1"><field name="issue_count"/> Issues</span>
+                        <span t-if="record.issue_count.raw_value lt 2"><field name="issue_count"/> Issue</span>
                     </a>
                 </xpath>
             </field>

From 6d6263f53f458c8b841e3f204b128d5a23f5e863 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 31 Oct 2012 14:52:54 +0530
Subject: [PATCH 7/8] [IMP] Add Underline Link on phase

bzr revid: fka@tinyerp.com-20121031092254-gnksoid6z7lwr1d8
---
 addons/project_long_term/project_long_term_view.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 69fe335c1b0..52eb5d80a3a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -120,7 +120,10 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_phases.raw_value"
-                        name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
+                        name="%(act_project_phases)d" type="action">
+                        <span t-if="record.phase_count.raw_value gt 1">Phases(<field name="phase_count"/>)</span>
+                        <span t-if="record.phase_count.raw_value lt 2">Phase(<field name="phase_count"/>)</span>
+                    </a>
                 </xpath>
             </field>
         </record>

From 6db8c34ce9f9a7610d160870a1e564172fd98511 Mon Sep 17 00:00:00 2001
From: "Foram Katharotiya (OpenERP)" <fka@tinyerp.com>
Date: Wed, 31 Oct 2012 15:02:46 +0530
Subject: [PATCH 8/8] [IMP] Add Underline Link on timesheet

bzr revid: fka@tinyerp.com-20121031093246-eki39atypv7dg4ie
---
 addons/project_timesheet/project_timesheet_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 81935b3434b..863a2cbc37c 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -15,7 +15,7 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_timesheets.raw_value" style="margin-right: 10px"
-                        name="open_timesheets" type="object"><field name="hours_quantity"/> Hours</a>
+                        name="open_timesheets" type="object"><span><field name="hours_quantity"/> Hours</span></a>
                 </xpath>
             </field>
         </record>