From 696233dfd628c15e1b714a1edca7c3843a361e72 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Fri, 1 Oct 2010 20:13:57 +0530
Subject: [PATCH 1/9] [IMP]: Project module-task menu :Project View-red for
 ovepassed deadline

bzr revid: ron@tinyerp.com-20101001144357-lzmauail17hoytdc
---
 addons/project/project_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6efc64dd494..4be52e78c1e 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -112,7 +112,7 @@
                        <field name="name" string="Project Name"/>
                        <field name="user_id" string="Project Manager" default="1">
                             <filter domain="[('user_id','=',uid)]" help="Projects in which I am a manage" icon="terp-personal"/>
-                       </field> 
+                       </field>
                        <field name="partner_id" string="Partner"/>
                    </group>
                    <newline />
@@ -302,7 +302,7 @@
             <field name="type">tree</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline&gt;current_date) and (state in ('draft','open'));black:state not in ('cancelled','done')" string="Tasks">
+                <tree colors="grey:state in ('cancelled','done');blue:remaining_hours&lt;0 and state in ('pending');red:date_deadline and (date_deadline &lt;current_date) and (state not in ('done'));" string="Tasks">
                     <field name="id"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>

From fdc839079f63171745b9dc18d86035d74b6c0a2c Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Mon, 4 Oct 2010 18:40:33 +0530
Subject: [PATCH 2/9] [FIX]:Issue Menu:-Issue will be Convert Task Only when
 Issue in To Do State  -- progressbar on issue to related with task
 progressbar >> Long Term Planning Menu:The Gantt View Display Phase Name
 ---calender view and Gantt View Display All Phases

bzr revid: ron@tinyerp.com-20101004131033-czvqbsgeebo2wu0w
---
 addons/project/project.py                     | 15 ++-
 addons/project_issue/project_issue.py         | 95 +++++++++++--------
 .../project_long_term_view.xml                |  8 +-
 3 files changed, 69 insertions(+), 49 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index 996e79a1f8b..75be42823bd 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -316,7 +316,7 @@ class project(osv.osv):
             if child_ids:
                 self.setActive(cr, uid, child_ids, value, context=None)
         return True
-    
+
 project()
 
 class users(osv.osv):
@@ -523,7 +523,7 @@ class task(osv.osv):
         if not project_id: return False
         task = self.browse(cr, uid, project_id, context=context)
         project = task.project_id
-        res = self.do_close(cr, uid, [project_id], context=context) 
+        res = self.do_close(cr, uid, [project_id], context=context)
         if project.warn_manager or project.warn_customer:
            return {
                 'name': _('Send Email after close task'),
@@ -534,7 +534,7 @@ class task(osv.osv):
                 'target': 'new',
                 'nodestroy': True,
                 'context': {'active_id': task.id}
-           } 
+           }
         return res
 
     def do_close(self, cr, uid, ids, context=None):
@@ -576,6 +576,8 @@ class task(osv.osv):
         if context is None:
             context = {}
         request = self.pool.get('res.request')
+        p_issue = self.pool.get('project.issue')
+
         for task in self.browse(cr, uid, ids, context=context):
             project = task.project_id
             if project and project.warn_manager and project.user_id.id and (project.user_id.id != uid):
@@ -590,10 +592,15 @@ class task(osv.osv):
                 })
 
             self.write(cr, uid, [task.id], {'state': 'open'})
+            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
+            p_issue.write(cr, uid,issue_id, {'progress':0.0})
+
         return True
 
     def do_cancel(self, cr, uid, ids, *args):
         request = self.pool.get('res.request')
+        p_issue = self.pool.get('project.issue')
+        print "Cancel"
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
             project = task.project_id
@@ -609,7 +616,9 @@ class task(osv.osv):
                 })
             message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
             self.log(cr, uid, task.id, message)
+            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
             self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
+            p_issue.write(cr, uid,issue_id, {'progress':100.0})
         return True
 
     def do_open(self, cr, uid, ids, *args):
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2788b59ed7d..6496e93f2e9 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -141,7 +141,7 @@ class project_issue(crm.crm_case, osv.osv):
                 else:
                     res[issue.id][field] = abs(float(duration))
         return res
-    
+
     _columns = {
         'id': fields.integer('ID'),
         'name': fields.char('Name', size=128, required=True),
@@ -220,48 +220,59 @@ class project_issue(crm.crm_case, osv.osv):
         data_obj = self.pool.get('ir.model.data')
         task_obj = self.pool.get('project.task')
 
-        if context is None:
-            context = {}
 
-        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
-        res = data_obj.read(cr, uid, result, ['res_id'])
-        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
-        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
-        if id2:
-            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-        if id3:
-            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        for curr_task in case_obj.browse(cr, uid,ids):
+            if curr_task.state in ['open']:
+                if context is None:
+                    context = {}
+                result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+                res = data_obj.read(cr, uid, result, ['res_id'])
+                id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+                id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+                if id2:
+                    id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+                if id3:
+                    id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-        for bug in case_obj.browse(cr, uid, ids, context=context):
-            new_task_id = task_obj.create(cr, uid, {
-                'name': bug.name,
-                'partner_id': bug.partner_id.id,
-                'description':bug.description,
-                'date': bug.date,
-                'project_id': bug.project_id.id,
-                'priority': bug.priority,
-                'user_id': bug.assigned_to.id,
-                'planned_hours': 0.0,
-            })
+                for bug in case_obj.browse(cr, uid, ids, context=context):
+                    new_task_id = task_obj.create(cr, uid, {
+                        'name': bug.name,
+                        'partner_id': bug.partner_id.id,
+                        'description':bug.description,
+                        'date': bug.date,
+                        'project_id': bug.project_id.id,
+                        'priority': bug.priority,
+                        'user_id': bug.assigned_to.id,
+                        'planned_hours': 0.0,
+                    })
 
-            vals = {
-                'task_id': new_task_id,
-                'state':'open'
-            }
-            case_obj.write(cr, uid, [bug.id], vals)
+                    vals = {
+                        'task_id': new_task_id,
+                        'state':'open'
+                    }
+                    case_obj.write(cr, uid, [bug.id], vals)
+
+                return  {
+                    'name': _('Tasks'),
+                    'view_type': 'form',
+                    'view_mode': 'form,tree',
+                    'res_model': 'project.task',
+                    'res_id': int(new_task_id),
+                    'view_id': False,
+                    'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+                    'type': 'ir.actions.act_window',
+                    'search_view_id': res['res_id'],
+                    'nodestroy': True
+                        }
+            elif curr_task.state in ['done', 'cancel']:
+                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
+Issue Could not convert into Task"))
+                return True
+            else:
+                raise osv.except_osv(_("Warning !"), _("Issue should be in \
+\'To Do\'  state before converting to Task."))
+                return True
 
-        return  {
-            'name': _('Tasks'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'project.task',
-            'res_id': int(new_task_id),
-            'view_id': False,
-            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-            'type': 'ir.actions.act_window',
-            'search_view_id': res['res_id'],
-            'nodestroy': True
-        }
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
         data_obj = self.pool.get('ir.model.data')
@@ -288,11 +299,11 @@ class project_issue(crm.crm_case, osv.osv):
         if not stage.on_change:
             return {'value':{}}
         return {'value':{}}
-    
+
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
         if context is None:
             context = {}
-        result = {}    
+        result = {}
         if not task_id:
             return {'value':{}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context)
@@ -442,7 +453,7 @@ class project_issue(crm.crm_case, osv.osv):
             @param **args: Return Dictionary of Keyword Value
         """
         return True
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not context:
             context={}
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 3412ba7ca08..c7122726f75 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -15,7 +15,7 @@
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                   <field name="useability" string="Availability"/>
+                   <field name="phase_id" string="Phase Name"/>
                 </level>
               </gantt>
             </field>
@@ -326,7 +326,7 @@
     # ------------------------------------------------------
     # Project Task
     # ------------------------------------------------------
-    
+
         <record id="view_phase_task_form2" model="ir.ui.view">
             <field name="name">phase.task.form2</field>
             <field name="model">project.task</field>
@@ -348,8 +348,8 @@
                     <field name="phase_id" select="1"/>
                 </field>
             </field>
-        </record>   
-    
+        </record>
+
     <act_window
         id="project_phase_task_list"
         name="Related Tasks"

From c4526df82a16634d09c34f2943e384140c51e6ab Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Oct 2010 13:01:06 +0530
Subject: [PATCH 3/9] [ADD]:Project->Time Tracking->Add Partner Invoices Menu

bzr revid: ron@tinyerp.com-20101005073106-4x1lvc7kcaztzb60
---
 addons/account/account_invoice_view.xml   | 19 +++++++++++++++++++
 addons/hr_timesheet/hr_timesheet_view.xml |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 1db17ed16cf..634caa86e75 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
+        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
+                  parent="base.menu_main_pm" sequence="3"/>
 
         <!--
         Invoices
@@ -436,6 +439,20 @@
             <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
 
+        <record id="action_invoice_tree_partner" model="ir.actions.act_window">
+            <field name="name">Partner Invoice</field>
+            <field name="res_model">account.invoice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
+            <field eval="False" name="view_id"/>
+            <field name="domain">[('type','=','out_invoice')]</field>
+            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
+            <field name="search_view_id" ref="view_account_invoice_filter"/>
+            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
+        </record>
+
+
+
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
             <field name="view_mode">tree</field>
@@ -448,7 +465,9 @@
             <field name="view_id" ref="invoice_form"/>
             <field name="act_window_id" ref="action_invoice_tree1"/>
         </record>
+
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
+        <menuitem action="action_invoice_tree_partner" id="menu_action_invoice_tree1_project" parent="base.menu_project_management_time_tracking" sequence="100"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Vendor Invoices</field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 4165f71d73f..d7138f9137f 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -81,8 +81,8 @@
                         <filter string="Anlytic account" icon="terp-folder-green" domain="[]" context="{'group_by':'account_id'}"/>
                         <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>                        
-                    </group>                     
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
                 </search>
             </field>
 

From 0a65ae1625240fe19486645f6c6d57c63f3782cf Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Oct 2010 18:40:44 +0530
Subject: [PATCH 4/9] [ADD]:Project->Scrum->Scrum mitting->Add a Email wizard 
 button

bzr revid: ron@tinyerp.com-20101005131044-gqmhbf136rpmebns
---
 addons/project_scrum/__openerp__.py         |  1 +
 addons/project_scrum/project_scrum_view.xml | 11 ++++++-----
 addons/project_scrum/wizard/__init__.py     |  1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py
index 3e18db77f68..dea267e41f5 100644
--- a/addons/project_scrum/__openerp__.py
+++ b/addons/project_scrum/__openerp__.py
@@ -54,6 +54,7 @@
         'project_scrum_report.xml',
         'wizard/project_scrum_backlog_create_task_view.xml',
         'wizard/project_scrum_backlog_merger_view.xml',
+        "wizard/project_scrum_email_view.xml",
         'project_scrum_view.xml',
         'wizard/project_scrum_backlog_sprint_view.xml',
         'process/project_scrum_process.xml',
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 843b35646e4..f2b56041d49 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -192,7 +192,7 @@
         <!--
               Scrum Sprint
        -->
-        
+
         <record id="view_scrum_sprint_calendar" model="ir.ui.view">
             <field name="name">project.scrum.sprint.calendar</field>
             <field name="model">project.scrum.sprint</field>
@@ -204,7 +204,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_sprint_tree" model="ir.ui.view">
             <field name="name">project.scrum.sprint.tree</field>
             <field name="model">project.scrum.sprint</field>
@@ -357,7 +357,7 @@
         <!--
               Daily Meeting
        -->
-        
+
         <record id="view_scrum_meeting_calendar" model="ir.ui.view">
             <field name="name">project.scrum.meeting.calendar</field>
             <field name="model">project.scrum.meeting</field>
@@ -369,7 +369,7 @@
                 </calendar>
             </field>
         </record>
-        
+
         <record id="view_scrum_meeting_tree" model="ir.ui.view">
             <field name="name">project.scrum.meeting.tree</field>
             <field name="model">project.scrum.meeting</field>
@@ -389,10 +389,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Scrum Meeting">
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="8">
                         <field name="date"/>
                         <field name="sprint_id" domain="[('state', '=', 'open')]"/>
                         <field name="user_id"/>
+                        <button name="%(action_project_scrum_email)d"  string="Send Email" type="action" icon="terp-mail-message-new" />
                     </group>
                     <notebook colspan="4">
                         <page string="Scrum Meeting">
diff --git a/addons/project_scrum/wizard/__init__.py b/addons/project_scrum/wizard/__init__.py
index 92ed57d7d7e..69e6ecc0969 100644
--- a/addons/project_scrum/wizard/__init__.py
+++ b/addons/project_scrum/wizard/__init__.py
@@ -22,6 +22,7 @@
 import project_scrum_backlog_create_task
 import project_scrum_backlog_sprint
 import project_scrum_backlog_merger
+import project_scrum_email
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

From 4ec92089ec43ec71bfeaf9add7c60b8e24410560 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 5 Oct 2010 18:48:04 +0530
Subject: [PATCH 5/9] [ADD]:Project->Scrum->Scrum mitting->Add Wizard File

bzr revid: ron@tinyerp.com-20101005131804-m4q8hup6zozdihz4
---
 .../wizard/project_scrum_email.py             | 133 ++++++++++++++++++
 .../wizard/project_scrum_email_view.xml       |  39 +++++
 2 files changed, 172 insertions(+)
 create mode 100644 addons/project_scrum/wizard/project_scrum_email.py
 create mode 100644 addons/project_scrum/wizard/project_scrum_email_view.xml

diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
new file mode 100644
index 00000000000..d10746ee83f
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from lxml import etree
+from osv import fields, osv
+from tools.translate import _
+from datetime import datetime
+
+class project_scrum_email(osv.osv_memory):
+    _name = 'project.scrum.email'
+
+    def _get_master_email(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+#        res='master@gmail.com'
+        if active_id:
+            res = self.pool.get('project.scrum.meeting').browse(cr,uid,active_id,context=context).sprint_id.scrum_master_id.user_email
+        return res
+
+    def _get_owner_email(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+#        res='owner@gmail.com'
+        if active_id:
+            res = self.pool.get('project.scrum.meeting').browse(cr, uid,active_id,context=context).sprint_id.product_owner_id.user_email
+        return res
+
+    def _get_subject(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+
+#        res='owner@gmail.com'
+        if active_id:
+            res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
+            res=" Scrum Meeting  of " + res1
+            print res
+        return res
+
+    def _get_message(self,cr, uid, context=None):
+        if context is None:
+            context = {}
+        active_id = context.get('active_id', False)
+        res = False
+
+#        res='owner@gmail.com'
+        if active_id:
+
+            res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
+            cnv_date = datetime.strptime(res1,'%Y-%m-%d')
+            weekfordate=datetime.strftime(cnv_date,'%W')
+            res2= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).sprint_id.project_id.name
+            res=" Scrum Meeting  of "+res1+" on Sprint Week "+weekfordate+" of Project "+res2
+        return res
+
+
+    _columns = {
+        'scrum_master_id': fields.char('Scrum Master Email', size=220,help="The person who is maintains the processes for the product"),
+        'product_owner_id': fields.char('Product Owner Email', size=220,help="The person who is responsible for the product"),
+        'subject':fields.char('Subject',size=220),
+        'message':fields.text('Message'),
+
+               }
+
+    _defaults = {
+        'scrum_master_id': _get_master_email,
+        'product_owner_id': _get_owner_email,
+        'subject': _get_subject,
+        'message': _get_message,
+
+    }
+
+#    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+#        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
+#        users_pool = self.pool.get('res.users')
+#        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
+#        time_mode_name = time_mode and time_mode.name or 'Hours'
+#        if time_mode_name in ['Hours','Hour']:
+#            return res
+#
+#        eview = etree.fromstring(res['arch'])
+#
+#        def _check_rec(eview):
+#            if eview.attrib.get('widget','') == 'float_time':
+#                eview.set('widget','float')
+#            for child in eview:
+#                _check_rec(child)
+#            return True
+#
+#        _check_rec(eview)
+#
+#        res['arch'] = etree.tostring(eview)
+#
+#        for field in res['fields']:
+#            if 'Hours' in res['fields'][field]['string']:
+#                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
+#        return res
+
+#    def compute_hours(self, cr, uid, ids, context=None):
+#        if context is None:
+#            context = {}
+#        data = self.browse(cr, uid, ids, context=context)[0]
+#        task_pool = self.pool.get('project.task')
+#        task_id = context.get('active_id', False)
+#        if task_id:
+#            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
+#            if context.get('button_reactivate', False):
+#                task_pool.do_reopen(cr, uid, [task_id], context=context)
+#        return {}
+project_scrum_email()
diff --git a/addons/project_scrum/wizard/project_scrum_email_view.xml b/addons/project_scrum/wizard/project_scrum_email_view.xml
new file mode 100644
index 00000000000..1552192b02c
--- /dev/null
+++ b/addons/project_scrum/wizard/project_scrum_email_view.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <record id="view_project_scrum_email" model="ir.ui.view">
+            <field name="name">Meeting E-mail</field>
+            <field name="model">project.scrum.email</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Meeting Email">
+                    <separator colspan="4" string="Scrum Meeting Email"/>
+                    <group col="2" colspan="4">
+	                    <field name="scrum_master_id"/>
+	                    <field name="product_owner_id"/>
+	                    <field name="subject"/>
+                    </group>
+					<notebook colspan="4">
+						<page string="Message">
+                    		<field name="message" nolabel="1"/>
+                    	</page>
+                    </notebook>
+
+                    <separator string="" colspan="4"/>
+                    <button icon="gtk-close" special="cancel" string="_Cancel"/>
+                    <button icon="gtk-go-forward"  string="_Send" type="object" default_focus="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_project_scrum_email" model="ir.actions.act_window">
+            <field name="name">Meeting E-mail</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">project.scrum.email</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+ </data>
+</openerp>

From 22c272feb68976836c1d191df51413d651272bf1 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Wed, 6 Oct 2010 19:27:37 +0530
Subject: [PATCH 6/9] [IMP] Project->scrum->scrum Meeting-Improvement in send
 Email Button(wizard)

bzr revid: ron@tinyerp.com-20101006135737-5fb9bbl0bv9sc9ht
---
 addons/project_scrum/project_scrum_view.xml   |   2 -
 .../wizard/project_scrum_email.py             | 150 ++++++++++++------
 .../wizard/project_scrum_email_view.xml       |   6 +-
 3 files changed, 107 insertions(+), 51 deletions(-)

diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index f2b56041d49..1a7d1cdc5ee 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -404,8 +404,6 @@
                             <separator colspan="4" string="Are there anything blocking you?"/>
                             <field colspan="4" name="question_blocks" nolabel="1"/>
                             <separator colspan="4" string=""/>
-							<button name="button_send_to_master" type="object" string="Send to Scrum Master" icon="gtk-ok"/>
-                            <button name="button_send_product_owner" type="object" string="Send to Product Owner" icon="gtk-ok"/>
                         </page>
                         <page string="Optional Info">
                             <separator colspan="4" string="Are your Sprint Backlog estimate accurate ?"/>
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index d10746ee83f..9d0dbf54e2d 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -23,6 +23,7 @@ from lxml import etree
 from osv import fields, osv
 from tools.translate import _
 from datetime import datetime
+import tools
 
 class project_scrum_email(osv.osv_memory):
     _name = 'project.scrum.email'
@@ -32,7 +33,6 @@ class project_scrum_email(osv.osv_memory):
             context = {}
         active_id = context.get('active_id', False)
         res = False
-#        res='master@gmail.com'
         if active_id:
             res = self.pool.get('project.scrum.meeting').browse(cr,uid,active_id,context=context).sprint_id.scrum_master_id.user_email
         return res
@@ -42,7 +42,6 @@ class project_scrum_email(osv.osv_memory):
             context = {}
         active_id = context.get('active_id', False)
         res = False
-#        res='owner@gmail.com'
         if active_id:
             res = self.pool.get('project.scrum.meeting').browse(cr, uid,active_id,context=context).sprint_id.product_owner_id.user_email
         return res
@@ -53,11 +52,9 @@ class project_scrum_email(osv.osv_memory):
         active_id = context.get('active_id', False)
         res = False
 
-#        res='owner@gmail.com'
         if active_id:
             res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
             res=" Scrum Meeting  of " + res1
-            print res
         return res
 
     def _get_message(self,cr, uid, context=None):
@@ -66,21 +63,21 @@ class project_scrum_email(osv.osv_memory):
         active_id = context.get('active_id', False)
         res = False
 
-#        res='owner@gmail.com'
         if active_id:
-
             res1= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).date
+            sprint_name= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).sprint_id.name
             cnv_date = datetime.strptime(res1,'%Y-%m-%d')
             weekfordate=datetime.strftime(cnv_date,'%W')
             res2= self.pool.get('project.scrum.meeting').browse(cr,uid,active_id).sprint_id.project_id.name
-            res=" Scrum Meeting  of "+res1+" on Sprint Week "+weekfordate+" of Project "+res2
+            res3='Hello  , \n    I am sending you Daily Meeting Details of date  '+res1+'  for the Sprint  '+sprint_name
+            res=res3+" of Project "+res2
         return res
 
 
     _columns = {
-        'scrum_master_id': fields.char('Scrum Master Email', size=220,help="The person who is maintains the processes for the product"),
-        'product_owner_id': fields.char('Product Owner Email', size=220,help="The person who is responsible for the product"),
-        'subject':fields.char('Subject',size=220),
+        'scrum_master_id': fields.char('Scrum Master Email', size=64,help="The person who is maintains the processes for the product"),
+        'product_owner_id': fields.char('Product Owner Email', size=64,help="The person who is responsible for the product"),
+        'subject':fields.char('Subject',size=64),
         'message':fields.text('Message'),
 
                }
@@ -93,41 +90,102 @@ class project_scrum_email(osv.osv_memory):
 
     }
 
-#    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
-#        res = super(project_task_reevaluate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
-#        users_pool = self.pool.get('res.users')
-#        time_mode = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
-#        time_mode_name = time_mode and time_mode.name or 'Hours'
-#        if time_mode_name in ['Hours','Hour']:
-#            return res
-#
-#        eview = etree.fromstring(res['arch'])
-#
-#        def _check_rec(eview):
-#            if eview.attrib.get('widget','') == 'float_time':
-#                eview.set('widget','float')
-#            for child in eview:
-#                _check_rec(child)
-#            return True
-#
-#        _check_rec(eview)
-#
-#        res['arch'] = etree.tostring(eview)
-#
-#        for field in res['fields']:
-#            if 'Hours' in res['fields'][field]['string']:
-#                res['fields'][field]['string'] = res['fields'][field]['string'].replace('Hours',time_mode_name)
-#        return res
 
-#    def compute_hours(self, cr, uid, ids, context=None):
-#        if context is None:
-#            context = {}
-#        data = self.browse(cr, uid, ids, context=context)[0]
-#        task_pool = self.pool.get('project.task')
-#        task_id = context.get('active_id', False)
-#        if task_id:
-#            task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours})
-#            if context.get('button_reactivate', False):
-#                task_pool.do_reopen(cr, uid, [task_id], context=context)
-#        return {}
+    def button_send_scrum_email(self, cr, uid, ids, context=None):
+        if context is None:
+            context={}
+
+        active_id = context.get('active_id', False)
+        scrum_obj=self.pool.get('project.scrum.meeting').browse(cr, uid,active_id,context=context)
+
+#        wizard data
+        meeting_wizard_id=self.browse(cr,uid,ids,context=context)[0]
+        scrum_master_email=meeting_wizard_id.scrum_master_id
+        product_owner_email=meeting_wizard_id.product_owner_id
+        mail_subject=meeting_wizard_id.subject
+        mail_message=meeting_wizard_id.message
+
+
+
+#        Record Data
+        if active_id:
+            scrum_master_name=scrum_obj.sprint_id.scrum_master_id.name
+            product_owner_name=scrum_obj.sprint_id.product_owner_id.name
+            last_meeting = scrum_obj.question_yesterday
+            if not last_meeting:
+                last_meeting=""
+            next_meeting = scrum_obj.question_today
+            if not next_meeting:
+                next_meeting=""
+            block_meeting = scrum_obj.question_blocks
+            if not block_meeting:
+                block_meeting=""
+            backlog_accurate = scrum_obj.question_backlog
+            if not backlog_accurate:
+                backlog_accurate=""
+            mail_date=scrum_obj.date
+            sprint_name=scrum_obj.sprint_id.name
+            task_record_list=[]
+            for task_assign in scrum_obj.task_ids:
+                task_record=task_assign.name
+                task_record_list.append(task_record)
+
+#         Email
+        if scrum_master_email:
+            if product_owner_email:
+                send_owner = self.email_send(cr,uid, ids,product_owner_email,mail_subject,mail_message,
+                                             last_meeting,next_meeting,block_meeting,backlog_accurate,
+                                             task_record_list,product_owner_name,
+                                             mail_date,sprint_name,active_id)
+                if not send_owner:
+                    raise osv.except_osv(_('Error !'), _(' Email Not send to the product owner !' ))
+
+            else:
+                raise osv.except_osv(_('Error !'), _('Please provide email address for product owner defined on sprint.'))
+            send_master = self.email_send(cr, uid, ids,scrum_master_email,mail_subject,mail_message,
+                                          last_meeting,next_meeting,block_meeting,backlog_accurate,
+                                          task_record_list,scrum_master_name,mail_date,
+                                          sprint_name,active_id)
+            if not send_master:
+                    raise osv.except_osv(_('Error !'), _(' Email Not send to the scrum master !' ))
+            else:
+                return {'type':'ir.actions.act_window_close' }
+        else:
+            raise osv.except_osv(_('Error !'), _('Please provide email address for scrum master defined on sprint.'))
+
+        return True
+
+    def email_send(self, cr, uid, ids, email,mail_subject,mail_message,
+                   last_meeting,next_meeting,block_meeting,backlog_accurate,
+                   task_record_list,user_own_name,mail_date,sprint_name,active_id,
+                   context=None):
+        if context is None:
+            context = {}
+        email_from = tools.config.get('email_from', False)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        user_email = email_from or user.address_id.email
+        sub_name = mail_subject
+
+        body ="\n"+mail_message+"\n"
+        body += "\n"+ _('What did you do since the last meeting?')+ '\n_______________________\n'
+        body +="\n"+last_meeting+"\n"
+        body +="\n" +_("What do you plan to do till the next meeting?")+ '\n_______________________ \n'
+        body +="\n"+next_meeting+"\n"
+        body +="\n"+ _('Are there anything blocking you?') +'\n_______________________ \n'
+        body +="\n"+block_meeting+"\n"
+        body +="\n"+ _('Are your Sprint Backlog estimate accurate ?') +'\n_______________________ \n'
+        body +="\n"+backlog_accurate+"\n"
+        body += "\n"+ _('Tasks Summary:')+ '\n_______________________'
+        str=""
+        for taskassign in task_record_list:
+            str=str +"\n"
+            str  =str + taskassign
+        body +=str
+        body += "\n\n"+_('Thank you')+",\n"+ user.name
+
+        flag = tools.email_send(user_email,[email], sub_name, body, reply_to=None,openobject_id=active_id)
+        if not flag:
+            return False
+        return True
+
 project_scrum_email()
diff --git a/addons/project_scrum/wizard/project_scrum_email_view.xml b/addons/project_scrum/wizard/project_scrum_email_view.xml
index 1552192b02c..5308bd34e89 100644
--- a/addons/project_scrum/wizard/project_scrum_email_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_email_view.xml
@@ -12,8 +12,8 @@
                     <group col="2" colspan="4">
 	                    <field name="scrum_master_id"/>
 	                    <field name="product_owner_id"/>
-	                    <field name="subject"/>
-                    </group>
+					</group>
+                    <field name="subject"/>
 					<notebook colspan="4">
 						<page string="Message">
                     		<field name="message" nolabel="1"/>
@@ -22,7 +22,7 @@
 
                     <separator string="" colspan="4"/>
                     <button icon="gtk-close" special="cancel" string="_Cancel"/>
-                    <button icon="gtk-go-forward"  string="_Send" type="object" default_focus="1"/>
+                    <button icon="gtk-go-forward" name="button_send_scrum_email"  string="_Send" type="object" default_focus="1" />
                 </form>
             </field>
         </record>

From 635e3389e9fcba904ede1ae7d57fec1f6b587608 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Thu, 7 Oct 2010 14:13:14 +0530
Subject: [PATCH 7/9] [IMP] 5008 and 5009 Revert Changes

bzr revid: ron@tinyerp.com-20101007084314-iiqqleknx8j1vy9c
---
 addons/account/account_invoice_view.xml       | 18 ----
 addons/project/project.py                     |  7 --
 addons/project_issue/project_issue.py         | 87 +++++++++----------
 .../project_long_term_view.xml                |  2 +-
 .../wizard/project_scrum_email_view.xml       |  2 +
 5 files changed, 42 insertions(+), 74 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 634caa86e75..e6323ae3a4b 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
-        <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
-                  parent="base.menu_main_pm" sequence="3"/>
-
         <!--
         Invoices
         -->
@@ -439,19 +435,6 @@
             <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
         </record>
 
-        <record id="action_invoice_tree_partner" model="ir.actions.act_window">
-            <field name="name">Partner Invoice</field>
-            <field name="res_model">account.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar,graph</field>
-            <field eval="False" name="view_id"/>
-            <field name="domain">[('type','=','out_invoice')]</field>
-            <field name="context">{'type':'out_invoice', 'journal_type': 'sale'}</field>
-            <field name="search_view_id" ref="view_account_invoice_filter"/>
-            <field name="help">Most of customer invoices are automatically generated in draft mode by OpenERP flows, following a purchase order for instance. Review, confirm or cancel, pay or refund your customers' invoices here. A manual invoice can be created here.</field>
-        </record>
-
-
 
         <record id="action_invoice_tree1_view1" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -467,7 +450,6 @@
         </record>
 
         <menuitem action="action_invoice_tree1" id="menu_action_invoice_tree1" parent="menu_finance_receivables"/>
-        <menuitem action="action_invoice_tree_partner" id="menu_action_invoice_tree1_project" parent="base.menu_project_management_time_tracking" sequence="100"/>
 
         <record id="action_invoice_tree2" model="ir.actions.act_window">
             <field name="name">Vendor Invoices</field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 75be42823bd..abae697cacf 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -576,7 +576,6 @@ class task(osv.osv):
         if context is None:
             context = {}
         request = self.pool.get('res.request')
-        p_issue = self.pool.get('project.issue')
 
         for task in self.browse(cr, uid, ids, context=context):
             project = task.project_id
@@ -592,15 +591,11 @@ class task(osv.osv):
                 })
 
             self.write(cr, uid, [task.id], {'state': 'open'})
-            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
-            p_issue.write(cr, uid,issue_id, {'progress':0.0})
 
         return True
 
     def do_cancel(self, cr, uid, ids, *args):
         request = self.pool.get('res.request')
-        p_issue = self.pool.get('project.issue')
-        print "Cancel"
         tasks = self.browse(cr, uid, ids)
         for task in tasks:
             project = task.project_id
@@ -616,9 +611,7 @@ class task(osv.osv):
                 })
             message = _('Task ') + " '" + task.name + "' "+ _("is Cancelled.")
             self.log(cr, uid, task.id, message)
-            issue_id=p_issue.search(cr,uid,[('task_id','=',task.id)])
             self.write(cr, uid, [task.id], {'state': 'cancelled', 'remaining_hours':0.0})
-            p_issue.write(cr, uid,issue_id, {'progress':100.0})
         return True
 
     def do_open(self, cr, uid, ids, *args):
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 6496e93f2e9..83871e02b66 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -221,57 +221,48 @@ class project_issue(crm.crm_case, osv.osv):
         task_obj = self.pool.get('project.task')
 
 
-        for curr_task in case_obj.browse(cr, uid,ids):
-            if curr_task.state in ['open']:
-                if context is None:
-                    context = {}
-                result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
-                res = data_obj.read(cr, uid, result, ['res_id'])
-                id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
-                id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
-                if id2:
-                    id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-                if id3:
-                    id3 = data_obj.browse(cr, uid, id3, context=context).res_id
+        if context is None:
+            context = {}
 
-                for bug in case_obj.browse(cr, uid, ids, context=context):
-                    new_task_id = task_obj.create(cr, uid, {
-                        'name': bug.name,
-                        'partner_id': bug.partner_id.id,
-                        'description':bug.description,
-                        'date': bug.date,
-                        'project_id': bug.project_id.id,
-                        'priority': bug.priority,
-                        'user_id': bug.assigned_to.id,
-                        'planned_hours': 0.0,
-                    })
+        result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form')
+        res = data_obj.read(cr, uid, result, ['res_id'])
+        id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2')
+        id3 = data_obj._get_id(cr, uid, 'project', 'view_task_tree2')
+        if id2:
+            id2 = data_obj.browse(cr, uid, id2, context=context).res_id
+        if id3:
+            id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-                    vals = {
-                        'task_id': new_task_id,
-                        'state':'open'
-                    }
-                    case_obj.write(cr, uid, [bug.id], vals)
+        for bug in case_obj.browse(cr, uid, ids, context=context):
+            new_task_id = task_obj.create(cr, uid, {
+                'name': bug.name,
+                'partner_id': bug.partner_id.id,
+                'description':bug.description,
+                'date': bug.date,
+                'project_id': bug.project_id.id,
+                'priority': bug.priority,
+                'user_id': bug.assigned_to.id,
+                'planned_hours': 0.0,
+            })
 
-                return  {
-                    'name': _('Tasks'),
-                    'view_type': 'form',
-                    'view_mode': 'form,tree',
-                    'res_model': 'project.task',
-                    'res_id': int(new_task_id),
-                    'view_id': False,
-                    'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
-                    'type': 'ir.actions.act_window',
-                    'search_view_id': res['res_id'],
-                    'nodestroy': True
-                        }
-            elif curr_task.state in ['done', 'cancel']:
-                raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
-Issue Could not convert into Task"))
-                return True
-            else:
-                raise osv.except_osv(_("Warning !"), _("Issue should be in \
-\'To Do\'  state before converting to Task."))
-                return True
+            vals = {
+                'task_id': new_task_id,
+                'state':'open'
+            }
+            case_obj.write(cr, uid, [bug.id], vals)
+
+        return  {
+            'name': _('Tasks'),
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            'res_model': 'project.task',
+            'res_id': int(new_task_id),
+            'view_id': False,
+            'views': [(id2,'form'),(id3,'tree'),(False,'calendar'),(False,'graph')],
+            'type': 'ir.actions.act_window',
+            'search_view_id': res['res_id'],
+            'nodestroy': True
+        }
 
 
     def _convert(self, cr, uid, ids, xml_id, context=None):
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index c7122726f75..6575d2e03ae 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -15,7 +15,7 @@
             <field name="arch" type="xml">
               <gantt color="phase_id" date_start="date_start" date_stop="date_end" string="R.A." mode="year">
                <level object="res.users" link="user_id" domain="[]">
-                   <field name="phase_id" string="Phase Name"/>
+                   <field name="useability" string="Availability"/>
                 </level>
               </gantt>
             </field>
diff --git a/addons/project_scrum/wizard/project_scrum_email_view.xml b/addons/project_scrum/wizard/project_scrum_email_view.xml
index 5308bd34e89..d0d8723709e 100644
--- a/addons/project_scrum/wizard/project_scrum_email_view.xml
+++ b/addons/project_scrum/wizard/project_scrum_email_view.xml
@@ -13,7 +13,9 @@
 	                    <field name="scrum_master_id"/>
 	                    <field name="product_owner_id"/>
 					</group>
+					<group colspan="4">
                     <field name="subject"/>
+                    </group>
 					<notebook colspan="4">
 						<page string="Message">
                     		<field name="message" nolabel="1"/>

From e848ed0cf4133f3c0827e81d13527dd1dbfa07e6 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 12 Oct 2010 11:56:08 +0530
Subject: [PATCH 8/9] [IMP] ::Documents->Shared Repository:enlarge the FTP
 server field,Documents-> descending by date and tooltip change and fix bug on
 my document filter button::Reporting->Document Dashboard->group by year/Month
 and default user_id context remove

bzr revid: ron@tinyerp.com-20101012062608-nvlyu9qag6zeyh5h
---
 addons/document/board_document_view.xml       |  6 ++--
 addons/document/document.py                   |  7 ++--
 addons/document/document_directory.py         | 20 ++++++------
 addons/document/document_view.xml             |  6 ++--
 addons/document/report/document_report.py     |  8 +++--
 .../document/report/document_report_view.xml  | 32 +++++++------------
 .../document_ftp/test/document_ftp_test2.yml  |  2 +-
 .../document_ftp/wizard/ftp_browse_view.xml   |  2 +-
 .../document_ftp/wizard/ftp_configuration.py  |  2 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  1 +
 addons/project/report/project_report.py       |  2 +-
 11 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 2bfc5a6f200..7ba8c498271 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -16,9 +16,7 @@
                             <action
                                 string="New Files"
                                 name="%(document.action_view_all_document_tree1)d"
-                                view_mode="tree"
-                                domain="[('name','=',time.strftime('%%Y')),('month','=',time.strftime('%%m'))]"/>
-
+                                view_mode="tree,form"/>
                             <action
                                 string="File Size by Month"
                                 name="%(document.action_view_size_month)d"
@@ -28,7 +26,7 @@
                             <action
                                 string="Files by Resource Type"
                                 name="%(document.action_view_document_by_resourcetype_graph)d"
-                                view_mode="graph,tree"/>
+                                />
 
                             <action
                                 string="Files by Partner"
diff --git a/addons/document/document.py b/addons/document/document.py
index 624af24c1fb..f4b752fb636 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -41,7 +41,7 @@ class document_file(osv.osv):
         fbrl = self.browse(cr, uid, ids, context=context)
         nctx = nodes.get_node_context(cr, uid, context={})
         # nctx will /not/ inherit the caller's context. Most of
-        # it would be useless, anyway (like active_id, active_model, 
+        # it would be useless, anyway (like active_id, active_model,
         # bin_size etc.)
         result = {}
         bin_size = context.get('bin_size', False)
@@ -91,10 +91,11 @@ class document_file(osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'file_size': fields.integer('File Size', required=True),
         'file_type': fields.char('Content Type', size=128),
-        
+
         # fields used for file storage
         'store_fname': fields.char('Stored Filename', size=200),
     }
+    _order = "create_date desc"
 
     def __get_def_directory(self, cr, uid, context=None):
         dirobj = self.pool.get('document.directory')
@@ -150,7 +151,7 @@ class document_file(osv.osv):
             return False
         if not self._check_duplication(cr, uid, vals, ids, 'write'):
             raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-        
+
         # if nodes call this write(), they must skip the code below
         from_node = context and context.get('__from_node', False)
         if (('parent_id' in vals) or ('name' in vals)) and not from_node:
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 3486359f183..9cc8e4a9950 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -44,13 +44,13 @@ class document_directory(osv.osv):
         'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'),
         'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'),
         'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'),
-        'type': fields.selection([ 
+        'type': fields.selection([
             ('directory','Static Directory'),
             ('ressource','Folders per resource'),
             ],
             'Type', required=True, select=1,
             help="Defines directory's behaviour."),
-        
+
         'ressource_type_id': fields.many2one('ir.model', 'Resource model',
             help="Select an object here and there will be one folder per record of that resource."),
         'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
@@ -95,13 +95,13 @@ class document_directory(osv.osv):
                 return objid.browse(cr, uid, mid, context=context).res_id
         except Exception:
                 return None
-        
+
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'document.directory', context=c),
         'user_id': lambda self,cr,uid,ctx: uid,
         'domain': lambda self,cr,uid,ctx: '[]',
         'type': lambda *args: 'directory',
-        'ressource_id': lambda *a: 0,        
+        'ressource_id': lambda *a: 0,
         'storage_id': _get_def_storage,
         'resource_find_all': True,
     }
@@ -151,7 +151,7 @@ class document_directory(osv.osv):
     _constraints = [
         (_check_recursion, 'Error! You can not create recursive Directories.', ['parent_id'])
     ]
-    
+
     def __init__(self, *args, **kwargs):
         super(document_directory, self).__init__(*args, **kwargs)
 
@@ -172,7 +172,7 @@ class document_directory(osv.osv):
         """
         if not context:
                 context = {}
-            
+
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
     def get_dir_permissions(self, cr, uid, ids ):
@@ -180,7 +180,7 @@ class document_directory(osv.osv):
         """
         assert len(ids) == 1
         id = ids[0]
-        
+
         cr.execute( "SELECT count(dg.item_id) AS needs, count(ug.uid) AS has " \
                 " FROM document_directory_group_rel dg " \
                 "   LEFT OUTER JOIN res_groups_users_rel ug " \
@@ -197,7 +197,7 @@ class document_directory(osv.osv):
             Return a tuple (node_dir, remaining_path)
         """
         return (nodes.node_database(context=ncontext), uri)
-        
+
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default ={}
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 13e4cff02d4..aa4d94382ee 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -291,7 +291,7 @@
                  <field name="parent_id" />
                  <field name="user_id">
                     <filter icon="terp-personal"
-                        domain="[('user_id','=', False)]"
+                        domain="[('user_id','=',uid)]"
                         help="Filter on my documents" />
                  </field>
                 <field name="partner_id"/>
@@ -333,7 +333,7 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
         <field name="search_view_id" ref="view_attach_filter"/>
-        <field name="help">Documents give your access to all attached documents; it's a repository of all attached documents (mails, documents attached to a project, etc.)</field>
+        <field name="help">The Documents repository gives you access to all attachments, such as mails, project documents, invoices etc.</field>
     </record>
     <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="0"/>
     <menuitem
@@ -403,7 +403,7 @@
         src_model="res.partner"
         groups="base.group_extended"/>
 
-    <act_window 
+    <act_window
     	context="{'search_default_parent_id': [active_id]}"
         id="zoom_directory" name="Related Documents"
         res_model="ir.attachment"
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 419b37ca68e..34b61f01c01 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -34,6 +34,7 @@ class report_document_user(osv.osv):
         'user_id':fields.integer('Owner', readonly=True),
         'user':fields.char('User',size=64,readonly=True),
         'directory': fields.char('Directory',size=64,readonly=True),
+        'datas_fname': fields.char('File Name',size=64,readonly=True),
         'create_date': fields.datetime('Date Created', readonly=True),
         'change_date': fields.datetime('Modified Date', readonly=True),
         'file_size': fields.integer('File Size', readonly=True),
@@ -52,6 +53,7 @@ class report_document_user(osv.osv):
                      u.name as user,
                      count(*) as nbr,
                      d.name as directory,
+                     f.datas_fname as datas_fname,
                      f.create_date as create_date,
                      f.file_size as file_size,
                      min(d.type) as type,
@@ -59,11 +61,13 @@ class report_document_user(osv.osv):
                  FROM ir_attachment f
                      left join document_directory d on (f.parent_id=d.id and d.name<>'')
                      inner join res_users u on (f.user_id=u.id)
-                 group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date
+                 group by to_char(f.create_date, 'YYYY'), to_char(f.create_date, 'MM'),d.name,f.parent_id,d.type,f.create_date,f.user_id,f.file_size,u.name,d.type,f.write_date,f.datas_fname
              )
         """)
 report_document_user()
 
+
+
 class report_files_partner(osv.osv):
     _name = "report.files.partner"
     _description = "Files details by Partners"
@@ -86,7 +90,7 @@ class report_files_partner(osv.osv):
                        to_char(date_trunc('month', f.create_date),'MM') AS month,
                        SUM(f.file_size) AS file_size,
                        p.name AS partner
-                       
+
                 FROM ir_attachment f
                   LEFT JOIN res_partner p ON (f.partner_id=p.id)
                 WHERE f.datas_fname IS NOT NULL
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index d0ba1303a39..b9a1652388c 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -10,6 +10,7 @@
                     <field name="name" select="1"/>
                     <field name="user" select="1"/>
                     <field name="directory" select="1"/>
+                    <field name="datas_fname" select="1"/>
                     <field name="file_size"/>
                     <field name="create_date"/>
                 </form>
@@ -25,10 +26,11 @@
                 <tree string="Files">
                     <field name="name" select="1"/>
                     <field name="month" select="1"/>
-                    <field name="user" select="1"/>
-                    <field name="directory" select="1"/>
-                    <field name="file_size"/>
-                    <field name="create_date"/>
+                    <field name="user" select="1" invisible="1"/>
+                    <field name="directory" select="1" invisible="1"/>
+                    <field name="file_size" invisible="1"/>
+                    <field name="create_date" invisible="1"/>
+                    <field name="nbr"/>
                 </tree>
             </field>
         </record>
@@ -60,8 +62,8 @@
             <field name="name">All Users files</field>
             <field name="res_model">report.document.user</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
-            <field name="context">{'search_default_user': 'user_id'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'group_by': ['name','month']}</field>
             <field name="search_view_id" ref="view_report_document_user_search"/>
         </record>
 
@@ -112,30 +114,18 @@
             <field name="arch" type="xml">
                 <graph string="Files by Resource Type" type="pie">
                     <field name="type" />
-<!--                    <field name="file_size" operator="+"/>-->
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
         </record>
 
-<!--        <record model="ir.ui.view" id="view_document_by_resourcetype_tree">-->
-<!--            <field name="name">report.document.resource.tree.view</field>-->
-<!--            <field name="model">report.document.user</field>-->
-<!--            <field name="type">tree</field>-->
-<!--            <field name="arch" type="xml">-->
-<!--                <tree string="Files by Resource Type">-->
-<!--                    <field name="type" />-->
-<!--                    <field name="nbr"/>-->
-<!--                </tree>-->
-<!--            </field>-->
-<!--        </record>-->
 
         <record model="ir.actions.act_window" id="action_view_document_by_resourcetype_graph">
             <field name="name">Files by Resource Type</field>
             <field name="res_model">report.document.user</field>
-            <field name="view_id" ref="view_document_by_resourcetype_graph"></field>
+            <field name="view_id" ref="view_document_by_resourcetype_graph"/>
             <field name="view_type">form</field>
-            <field name="view_mode">tree</field>
+            <field name="view_mode">graph,tree</field>
         </record>
 
 <!--***************************************************************************************-->
@@ -150,7 +140,7 @@
                     <field name="file_size" operator="+"/>
                 </graph>
             </field>
-        </record>
+    </record>
 
     <record model="ir.ui.view" id="view_size_month_tree">
             <field name="name">report.document.user.tree</field>
diff --git a/addons/document_ftp/test/document_ftp_test2.yml b/addons/document_ftp/test/document_ftp_test2.yml
index 32434962ba2..53d5a2b78bf 100644
--- a/addons/document_ftp/test/document_ftp_test2.yml
+++ b/addons/document_ftp/test/document_ftp_test2.yml
@@ -196,7 +196,7 @@
     !python {model: ir.attachment}: |
         from document_ftp import test_easyftp as te
         ftp = te.get_ftp_folder(cr, uid, self, 'Documents')
-        ftp.mkd("Test-Folder2")
+        ftp.mkd("Test-Folder3")
         # TODO move
 -
     I remove the 'Test-Folder3'
diff --git a/addons/document_ftp/wizard/ftp_browse_view.xml b/addons/document_ftp/wizard/ftp_browse_view.xml
index 7a52c1fd291..90182b70e0d 100644
--- a/addons/document_ftp/wizard/ftp_browse_view.xml
+++ b/addons/document_ftp/wizard/ftp_browse_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Browse Document">
                     <separator string="Browse Document" colspan="4"/>
-                    <field name="url" widget="url" colspan="4"/>
+                    <field name="url" widget="url" colspan="4" width="250"/>
                     <separator colspan="4"/>
                     <group col="4" colspan="4">
                         <label string="" colspan="2"/>
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 0522e0348b8..5c6544dac5d 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -30,7 +30,7 @@ class document_ftp_configuration(osv.osv_memory):
     _rec_name = 'host'
     _columns = {
         'host': fields.char('Address', size=64,
-                            help="Server address or IP and port to which users should connect to for DMS access", 
+                            help="Server address or IP and port to which users should connect to for DMS access",
                             required=True),
     }
 
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d7138f9137f..2a47d8ea297 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -113,6 +113,7 @@
 
     <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
     <menuitem id="menu_hr_working_hours" parent="hr_attendance.menu_hr_time_tracking" action="act_hr_timesheet_line_evry1_all_form"/>
+    <menuitem id="menu_partner_invc" name="Partner Invoice" parent="base.menu_project_management_time_tracking" action="account.action_invoice_tree1"/>
 
         <record id="hr_timesheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.employee.extd_form</field>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index f4d8b32e569..989f646724e 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -89,7 +89,7 @@ class report_project_task_user(osv.osv):
                     planned_hours as hours_planned,
                     (extract('epoch' from (t.date_end-t.create_date)))/(3600*24)  as closing_days,
                     (extract('epoch' from (t.date_start-t.create_date)))/(3600*24)  as opening_days,
-                    (extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24)  as delay_endings_days
+                    abs((extract('epoch' from (t.date_deadline-t.date_end)))/(3600*24))  as delay_endings_days
               FROM project_task t
 
                 GROUP BY

From 802541e5c78daac2cfc2a1273780193306ba5522 Mon Sep 17 00:00:00 2001
From: "ron@tinyerp.com" <>
Date: Tue, 12 Oct 2010 18:51:51 +0530
Subject: [PATCH 9/9] [IMP] Project->Long Term Planning--Changes Demo data for
 user:Projects Phases--Useability should be availablity,rename group by user
 into responsible and default group on project,top area field
 arrange:Resources Allocations--change icon in group by Project and resource

bzr revid: ron@tinyerp.com-20101012132151-39z9a08pwj71c7pt
---
 addons/document/board_document_view.xml       |  1 +
 addons/project_long_term/project_long_term.py | 32 ++++++++--------
 .../project_long_term_demo.xml                | 26 ++++++-------
 .../project_long_term_view.xml                | 37 +++++++++----------
 4 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index 7ba8c498271..8f102f5936d 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -26,6 +26,7 @@
                             <action
                                 string="Files by Resource Type"
                                 name="%(document.action_view_document_by_resourcetype_graph)d"
+                                view_mode="graph,tree"
                                 />
 
                             <action
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index 2caf36766b0..e843c6952a7 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -91,7 +91,7 @@ class project_phase(osv.osv):
        model_data_obj = self.pool.get('ir.model.data')
        model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
        return model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
-    
+
     def _compute(self, cr, uid, ids, context=None):
         res = {}
         if not ids:
@@ -145,7 +145,7 @@ class project_phase(osv.osv):
             project_id = project_obj.browse(cr, uid, project, context=context)
             result['date_start'] = project_id.date_start
         return {'value': result}
-    
+
     def onchange_days(self, cr, uid, ids, project, context=None):
         result = {}
         for id in ids:
@@ -221,7 +221,7 @@ class project_phase(osv.osv):
                 cal_id = resource_obj.browse(cr, uid, resource_id[0], context=context).calendar_id.id
                 if cal_id:
                     calendar_id = cal_id
-        
+
             avg_hours = uom_obj._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
             # Change the date_start and date_end
             # for previous and next phases respectively based on valid condition
@@ -234,7 +234,7 @@ class project_phase(osv.osv):
                     if prv_phase.id == phase.id:
                         continue
                     self._check_date_start(cr, uid, prv_phase, dt_start, context=context)
-                        
+
             if vals.get('date_end', False) and vals['date_end'] > phase.date_end:
                 dt_end = datetime.strptime(vals['date_end'], '%Y-%m-%d')
                 work_times = resource_calendar_obj.interval_min_get(cr, uid, calendar_id, dt_end, avg_hours or 0.0, resource_id and resource_id[0] or False)
@@ -244,7 +244,7 @@ class project_phase(osv.osv):
                     if next_phase.id == phase.id:
                         continue
                     self._check_date_end(cr, uid, next_phase, dt_end, context=context)
-                    
+
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -295,7 +295,7 @@ class project_phase(osv.osv):
         Schedule phase with the start date till all the next phases are completed.
         @param: start_dsate : start date for the phase
         @param: calendar_id : working calendar of the project
-        """ 
+        """
         if context is None:
             context = {}
         resource_pool = self.pool.get('resource.resource')
@@ -306,7 +306,7 @@ class project_phase(osv.osv):
         for phase in self.browse(cr, uid, ids, context=context):
             if not phase.responsible_id:
                 raise osv.except_osv(_('No responsible person assigned !'),_("You must assign a responsible person for phase '%s' !") % (phase.name,))
-            
+
             phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
             avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, default_uom_id)
             duration = str(avg_hours) + 'H'
@@ -371,7 +371,7 @@ class project_phase(osv.osv):
             if not start_date and phase.project_id.date_start:
                 start_date = phase.project_id.date_start
             if not start_date:
-                start_date = datetime.now().strftime("%Y-%m-%d")                    
+                start_date = datetime.now().strftime("%Y-%m-%d")
             resources = resources_list.get(phase.id, [])
             calendar_id = phase.project_id.resource_calendar_id.id
             task_ids = map(lambda x : x.id, (filter(lambda x : x.state in ['open', 'draft', 'pending'] , phase.task_ids)))
@@ -398,7 +398,7 @@ class project_resource_allocation(osv.osv):
         'user_id': fields.related('resource_id', 'user_id', type='many2one', relation="res.users", string='User'),
         'date_start': fields.date('Start Date', help="Starting Date"),
         'date_end': fields.date('End Date', help="Ending Date"),
-        'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
+        'useability': fields.float('Availability', help="Usability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
         'useability': 100,
@@ -460,19 +460,19 @@ class project(osv.osv):
         resource_pool = self.pool.get('resource.resource')
         if context is None:
             context = {}
-        
+
         resources_list = self.generate_members(cr, uid, ids, context=context)
         return_msg = {}
         for project in self.browse(cr, uid, ids, context=context):
             start_date = project.date_start
             if not start_date:
-                start_date = datetime.now().strftime("%Y-%m-%d")                    
+                start_date = datetime.now().strftime("%Y-%m-%d")
             resources = resources_list.get(project.id, [])
             calendar_id = project.resource_calendar_id.id
             task_ids = task_pool.search(cr, uid, [('project_id', '=', project.id),
                                               ('state', 'in', ['draft', 'open', 'pending'])
                                               ])
-            
+
 
             if task_ids:
                 task_pool.generate_schedule(cr, uid, task_ids, resources, calendar_id, start_date, context=context)
@@ -483,7 +483,7 @@ class project(osv.osv):
                 else:
                     return_msg["warning"] = return_msg["warning"] + "\n" + warning_msg
 
-        return return_msg    
+        return return_msg
 
 project()
 
@@ -506,7 +506,7 @@ class project_task(osv.osv):
     _columns = {
         'phase_id': fields.many2one('project.phase', 'Project Phase'),
     }
-    
+
     def generate_schedule(self, cr, uid, ids, resources, calendar_id, start_date, context=None):
         """
         Schedule the tasks according to resource available and priority.
@@ -556,10 +556,10 @@ class project_task(osv.osv):
                         if task_resource.__name__ == task_resource:
                             real_resource = task_resource
                             break
-                
+
                 task = create_tasks(task_number, hours, priorty, real_resource)
                 task_number += 1
-        
+
 
         face_projects = Task.BalancedProject(Project)
         loop_no = 0
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index 30acac99377..4de53c0f38d 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" ?>
 <openerp>
     <data noupdate="1">
-<!-- 
+<!--
 This Demo data file includes Users, Human Resources, Projects and it' members list, Phases and Resources,Tasks allocation and  also run scheduling of phase and tasks.
 -->
         <!-- Users -->
-        
+
         <record id="res_users_analyst" model="res.users">
-            <field name="name">Phoung</field>
+            <field name="name">Phuong</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]" name="groups_id"/>
             <field name="login">phu</field>
             <field name="password">phu</field>
@@ -19,7 +19,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="password">al</field>
         </record>
         <record id="res_users_technical_leader" model="res.users">
-            <field name="name">Qwintin</field>
+            <field name="name">Quentin</field>
             <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]" name="groups_id"/>
             <field name="login">qdp</field>
             <field name="password">qdp</field>
@@ -91,8 +91,8 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="name">Project Finacial Manager</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
         </record>
-        
-        
+
+
 
         <!-- Projects -->
         <record id="project_integrate_openerp" model="project.project">
@@ -101,12 +101,12 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="type">normal</field>
             <field name="description">Integrate an Sale and Warehouse Management.</field>
             <field eval="[(6, 0, [
-                    ref('res_users_analyst'), 
-                    ref('res_users_project_manager'), 
-                    ref('res_users_technical_leader'), 
-                    ref('res_users_developer'), 
-                    ref('res_users_designer'), 
-                    ref('res_users_tester'), 
+                    ref('res_users_analyst'),
+                    ref('res_users_project_manager'),
+                    ref('res_users_technical_leader'),
+                    ref('res_users_developer'),
+                    ref('res_users_designer'),
+                    ref('res_users_tester'),
                     ref('res_users_finacial_manager')])]" name="members"/>
             <field name="user_id" ref="res_users_project_manager"/>
             <field name="name">Integrate an Sale and Warehouse Management.</field>
@@ -213,7 +213,7 @@ This Demo data file includes Users, Human Resources, Projects and it' members li
             <field name="resource_id" ref="resource_project_manager"/>
             <field name="phase_id" ref="project_phase_5"/>
         </record>
-        
+
         <record id="resource_allocation_9" model="project.resource.allocation">
             <field name="resource_id" ref="resource_analyst"/>
             <field name="phase_id" ref="project_phase_6"/>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 6575d2e03ae..bb8e05770ed 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -81,9 +81,9 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20">
-                        <filter name="resource" string="Resource" icon="terp-folder-blue" domain="[]" context="{'group_by':'resource_id'}"/>
+                        <filter name="resource" string="Resource" icon="terp-personal" domain="[]" context="{'group_by':'resource_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter string="Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
+                        <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Phase" icon="terp-project" domain="[]" context="{'group_by':'phase_id'}"/>
                     </group>
                 </search>
@@ -111,21 +111,18 @@
             <field name="arch" type="xml">
                 <form string="Project Phase">
                     <group colspan="6" col="6">
-	                    <group colspan="2" col="2">
-	                        <field name="name" select="1"/>
-	                        <field name="date_start"/>
-	                    </group>
-	                    <group colspan="2" col="4">
-	                       <field name="project_id" on_change="onchange_project(project_id)" colspan="4"/>
-                           <newline/>
-	                       <field name="duration" colspan="1" on_change="onchange_days(project_id)" />
-                           <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
-	                    </group>
-	                    <group colspan="2" col="2">
-	                       <field name="responsible_id"/>
-	                       <field name="date_end"/>
-                    	</group>
-					</group>
+                        <group colspan="6" col="6" >
+                            <field name="name" select="1"/>
+                            <field name="project_id" on_change="onchange_project(project_id)"/>
+                            <field name="responsible_id"/>
+                        </group>
+                        <group colspan="6" col="6">
+                            <field name="date_start"/>
+                            <field name="duration"  on_change="onchange_days(project_id)" />
+                            <field name="product_uom" nolabel="1" domain="[('category_id.name', '=', 'Working Time')]"/>
+                            <field name="date_end"/>
+                        </group>
+                     </group>
                     <notebook colspan="4">
                         <page string="Resource Allocation">
                             <field colspan="4" name="resource_ids" nolabel="1">
@@ -274,7 +271,7 @@
                     </group>
                     <newline/>
                     <group expand="0" string="Group By..." colspan="4" col="20" groups="base.group_extended">
-                        <filter string="User" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
+                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'responsible_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Project" icon="terp-folder-blue" domain="[]" context="{'group_by':'project_id'}" name="project"/>
                         <separator orientation="vertical"/>
@@ -291,7 +288,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
-            <field name="context">{'search_default_responsible_id':uid}</field>
+            <field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
             <field name="help">You can subdivide your larger projects into several phases. For each phase, you can define your resources allocation (humans or engine), describe de differend task and link your phase with previous and next one, add constraints date and scheduling. A gantt view of your project phase is also available from this menu. Gantt view is a graphically draw of the project plan; it includes any task dependencies by visually adjusting task durations and priorities, and by linking tasks to each other.</field>
         </record>
@@ -301,7 +298,7 @@
             <field name="res_model">project.phase</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
- 			<field name="context">{'search_default_responsible_id':uid}</field>
+ 			<field name="context">{'search_default_responsible_id':uid,'group_by':'project_id'}</field>
             <field name="search_view_id" ref="view_project_phase_search"/>
         </record>