From 15620422fdb9866942e12fb71edab585bfbb4181 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 27 May 2010 13:09:17 +0530
Subject: [PATCH 1/4] [ADD] project_issue : added crm in dependency

bzr revid: vir@tinyerp.com-20100527073917-sx03s5k2i0c99m19
---
 addons/project_issue/__openerp__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 513bae085bd..2bf67d47191 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -31,6 +31,7 @@
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': [
+        'crm',
         'project',
         'hr_timesheet_sheet',
     ],

From 7d98e5914bc900c6bc3a2e9be46c4d7ce1654569 Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 27 May 2010 15:21:37 +0530
Subject: [PATCH 2/4] [FIX] Report_intrastat : size of char should be given in
 integer format

bzr revid: jvo@tinyerp.com-20100527095137-oaigevsb9ztpfh26
---
 addons/report_intrastat/report_intrastat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/report_intrastat/report_intrastat.py b/addons/report_intrastat/report_intrastat.py
index 8d986aa4c64..3bf58ea034e 100644
--- a/addons/report_intrastat/report_intrastat.py
+++ b/addons/report_intrastat/report_intrastat.py
@@ -66,7 +66,7 @@ class report_intrastat(osv.osv):
                                   ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True),
         'supply_units':fields.float('Supply Units', readonly=True),
         'ref':fields.char('Source document',size=64, readonly=True),
-        'code': fields.char('Country code', size="2", readonly=True),
+        'code': fields.char('Country code', size=2, readonly=True),
         'intrastat_id': fields.many2one('report.intrastat.code', 'Intrastat code', readonly=True),
         'weight': fields.float('Weight', readonly=True),
         'value': fields.float('Value', readonly=True),

From 7267797d805653848b780921ea8445154f78204c Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 27 May 2010 15:27:03 +0530
Subject: [PATCH 3/4] [REF] Project: Minor modifs

bzr revid: jvo@tinyerp.com-20100527095703-2vocgaymbrkuddtc
---
 addons/project/project.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/project/project.py b/addons/project/project.py
index a6c703657d0..bdf7e30837e 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -47,6 +47,8 @@ class project(osv.osv):
     _inherits = {'account.analytic.account':"category_id"}
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
         if user == 1:
                 return super(project, self).search(cr, user, args, offset=offset, limit=limit, order=order, context=context, count=count)
         if context and context.has_key('user_prefence') and context['user_prefence']:
@@ -266,13 +268,11 @@ class task(osv.osv):
         hours = dict(cr.fetchall())
         for task in self.browse(cr, uid, ids, context=context):
             res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
+            res[task.id]['progress'] = 0.0
             if (task.remaining_hours + hours.get(task.id, 0.0)):
-                if task.state =='done':
-                    res[task.id]['progress'] = 100.0
-                else:
+                if task.state != 'done':
                     res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
-            else:
-                res[task.id]['progress'] = 0.0
+
             if task.state in ('done','cancel'):
                 res[task.id]['progress'] = 100.0
             res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
@@ -559,6 +559,8 @@ class config_compute_remaining(osv.osv_memory):
     }
 
     def compute_hours(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         task_obj = self.pool.get('project.task')
         request = self.pool.get('res.request')
         if 'active_id' in context:

From bd3885749af619b46768ee75fb76dde5a901ecea Mon Sep 17 00:00:00 2001
From: "Jay (Open ERP)" <jvo@tinyerp.com>
Date: Thu, 27 May 2010 15:30:31 +0530
Subject: [PATCH 4/4] [FIX/REF] Project_issue and Project_long_term

bzr revid: jvo@tinyerp.com-20100527100031-efjpuaas23niu1kd
---
 addons/project_issue/__openerp__.py           |  1 +
 addons/project_issue/project_issue.py         |  2 --
 addons/project_issue/project_issue_view.xml   | 18 +++++++-----------
 addons/project_long_term/__openerp__.py       |  8 ++++----
 addons/project_long_term/project_long_term.py |  4 ++--
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 2bf67d47191..982d1688014 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -34,6 +34,7 @@
         'crm',
         'project',
         'hr_timesheet_sheet',
+        'project_long_term',
     ],
     'init_xml': [
         'project_issue_data.xml'
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index f67986526cd..b67ef6a849a 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -113,7 +113,6 @@ class project_issue(osv.osv, crm.crm_case):
         'thread_id': fields.many2one('mailgate.thread', 'Thread', required=False), 
         'id': fields.integer('ID'),  
         'name': fields.char('Name', size=128, required=True), 
-        'active': fields.boolean('Active', required=False), 
         'create_date': fields.datetime('Creation Date' , readonly=True), 
         'write_date': fields.datetime('Update Date' , readonly=True), 
         'date_deadline': fields.date('Deadline'), 
@@ -173,7 +172,6 @@ class project_issue(osv.osv, crm.crm_case):
        return False
 
     _defaults = {
-        'active': lambda *a: 1, 
         'user_id': crm.crm_case._get_default_user, 
         'partner_id': crm.crm_case._get_default_partner, 
         'partner_address_id': crm.crm_case._get_default_partner_address, 
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 8b2b14c1cb7..27b72e459ef 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -82,11 +82,8 @@
                         		<separator string="Statistics" colspan="2" col="2"/>
                         		<field name="day_open"/>
                         		<field name="day_close"/>
-                    		</group>
-                            <group col="2" colspan="2">
                                 <separator string="References" colspan="2"/>
                                 <field name="id"/>
-                                <field name="active"/>
                             </group>
                             <field name="log_ids" nolabel="1" colspan="4">
 		                        <tree string="Logs">
@@ -143,6 +140,7 @@
             <field name="arch" type="xml">
                 <tree string="Issue Tracker Tree"  colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
+                    <field name="create_date"/>
                     <field name="name"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Severity"/>
@@ -155,6 +153,7 @@
                         states="open,draft,pending,done,cancel" />
                     <field name="type_id" string="Version"/>
                     <field name="user_id"/>
+                    <field name="assigned_to"/>
                     <field name="state"/>
                     <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
                     <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
@@ -172,21 +171,18 @@
             <field name="type">search</field>
             <field name="arch" type="xml">
                 <search string="Issue Tracker Search">
-                    <group>
+                    <group colspan="4" col="20">
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                            help="Todays's bugs"
+                            help="Today's bugs"
                             />
                         <filter icon="gtk-media-rewind"
                             string="    7 Days    " separator="1"
                             domain="[('date','&lt;', time.strftime('%%Y-%%m-%%d')), ('date','&gt;=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
                             help="Bugs during last 7 days"
                             />
-
-                    </group>
-                    <separator orientation="vertical"/>
-                    <group>
+                    	<separator orientation="vertical"/>
                         <field name="name" select='1' string="Subject"/>
                         <field name="user_id" select="1" widget="selection"/>
                         <field name="state" select="1">
@@ -196,7 +192,7 @@
                         <field name="project_id" select="1" widget="selection" string="Project"/>
                     </group>
                     <newline/>
-                    <group expand="1" string="Group By..." colspan="16" groups="base.group_extended">
+                    <group expand="1" string="Group By..." colspan="4" col="20" groups="base.group_extended">
 	                    <filter string="Stage" icon="terp-crm" domain="[]"
 	                        context="{'group_by':'stage_id'}" />
 	                    <filter string="Priority" icon="terp-crm" domain="[]"
@@ -271,7 +267,7 @@
                         <filter icon="gtk-home" string="   Today   "
                             separator="1"
                             domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"
-                            help="Todays's features"
+                            help="Today's features"
                             />
                         <filter icon="gtk-media-rewind"
                             string="    7 Days    " separator="1"
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 70ce9020cf5..32945899b30 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -27,13 +27,13 @@
     "depends" : ["project", "resource"],
     "description": """
 
-        Long Term Project management module that track planning, scheduling, resources allocation.
+        Long Term Project management module that tracks planning, scheduling, resources allocation.
         Mainly used with Big project management.
             - Project Phases will be maintained by Manager of the project
             - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.
-                                        If no project given then all the draft,open and pending states phases will be taken
-            - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as arguement and computes all the open,draft and pending tasks
-            - Schedule Tasks: All the tasks which are in draft,pending and open states are scheduled with taking the phase's start date
+                                        If no project given then all the draft,open and pending state phases will be taken
+            - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks
+            - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date
 
     """,
     "init_xml" : [],
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index ebcc62b7bc3..b9246508198 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -33,7 +33,7 @@ class project_phase(osv.osv):
          data_phase = self.browse(cr, uid, ids[0], context=context)
          prev_ids = data_phase.previous_phase_ids
          next_ids = data_phase.next_phase_ids
-         # it should nither be in prev_ids nor in next_ids
+         # it should neither be in prev_ids nor in next_ids
          if (data_phase in prev_ids) or (data_phase in next_ids):
              return False
          ids = [id for id in prev_ids if id in next_ids]
@@ -234,7 +234,7 @@ class project_resource_allocation(osv.osv):
     _columns = {
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
         'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
-        'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"),
+        'useability': fields.float('Usability', help="Usability of this resource for this project phase in percentage (=50%)"),
     }
     _defaults = {
         'useability': 100,