[MERGE]

bzr revid: uco@tinyerp.com-20100710045533-op3teksgyqouzv0o

21 files changed, 152 insertions, 140 deletions

diff --git a/addons/project/__init__.py b/addons/project/__init__.py
index 44154c8ae05..3f65abca376 100644
--- a/addons/project/__init__.py
+++ b/addons/project/__init__.py
@@ -27,5 +27,4 @@ import report
 import wizard
 import res_partner
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index c3784c457b1..726e87b5979 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -26,8 +26,8 @@
     "author": "Tiny",
     "website": "http://www.openerp.com",
     "category": "Generic Modules/Projects & Services",
-    "depends": ["product", "analytic", "process", "mail_gateway","board"],
-    "description": """Project management module that track multi-level projects, tasks,
+    "depends": ["product", "analytic", "mail_gateway", "board"],
+    "description": """Project management module tracks multi-level projects, tasks,
 work done on tasks, eso. It is able to render planning, order tasks, eso.
  Dashboard for project members that includes:
     * List of my open tasks
@@ -41,7 +41,6 @@ work done on tasks, eso. It is able to render planning, order tasks, eso.
         "wizard/project_task_delegate_view.xml",
         "security/ir.model.access.csv",
         "project_data.xml",
-        "project_wizard.xml",
         "project_view.xml",
         "project_report.xml",
         "process/task_process.xml",
diff --git a/addons/project/board_project_demo.xml b/addons/project/board_project_demo.xml
index 2a160b4454f..99c9c4a23ff 100644
--- a/addons/project/board_project_demo.xml
+++ b/addons/project/board_project_demo.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
-        
+             
         <!--
 		 Administrator shortcut
 		 Demo user startup menu
@@ -14,6 +13,7 @@
             <field name="sequence">3</field>
             <field name="res_id" ref="menu_board_project"/>
         </record-->
+        
         <record id="base.user_root" model="res.users">
             <field name="action_id" ref="open_board_project"/>
         </record>
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index f9e2dc5dd52..6258c85f689 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -6,22 +6,6 @@
             <field name="name">Project</field>
         </record>
 
-        <record id="view_task_tree" model="ir.ui.view">
-            <field name="name">project.task.tree</field>
-            <field name="model">project.task</field>
-            <field name="type">tree</field>
-            <field eval="99" name="priority"/>
-            <field name="arch" type="xml">
-                <tree colors="red:date_deadline&lt;current_date;blue:date_deadline==current_date;black:date_deadline&gt;current_date" string="My Tasks">
-                    <field name="name"/>
-                    <field name="project_id"/>
-                    <field name="date_deadline"/>
-                    <field name="planned_hours"/>
-                    <field name="effective_hours"/>
-                    <field name="priority"/>
-                </tree>
-            </field>
-        </record>
         <!-- Editable My task -->
         <record id="view_task_tree" model="ir.ui.view">
             <field name="name">project.task.tree</field>
@@ -39,6 +23,7 @@
                 </tree>
             </field>
         </record>
+        
         <record id="action_view_task_tree" model="ir.actions.act_window">
             <field name="name">My Open Tasks</field>
             <field name="res_model">project.task</field>
@@ -47,6 +32,7 @@
             <field name="domain">[('user_id','=',uid),('state','=','open')]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
+        
         <record id="action_view_pending_task_tree" model="ir.actions.act_window">
             <field name="name">My Pending Tasks</field>
             <field name="res_model">project.task</field>
@@ -55,6 +41,7 @@
             <field name="domain">[('user_id','=',uid),('state','=','pending')]</field>
             <field name="view_id" ref="view_task_tree"/>
         </record>
+        
         <record id="action_view_task_tree_deadline" model="ir.actions.act_window">
             <field name="name">My Task's Deadlines</field>
             <field name="res_model">project.task</field>
@@ -125,17 +112,20 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_project_form"/>
         </record>
+        
         <menuitem
             id="next_id_86"
             name="Dashboard"
             icon="terp-graph"
             sequence="0"
             parent="base.menu_project_report"/>
+            
         <menuitem
             action="open_board_project"
             icon="terp-graph"
             id="menu_board_project"
             parent="next_id_86"
             sequence="1"/>
+            
     </data>
 </openerp>
diff --git a/addons/project/installer.py b/addons/project/installer.py
index e35e1b72a6c..23ab9630570 100644
--- a/addons/project/installer.py
+++ b/addons/project/installer.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 
 class project_installer(osv.osv_memory):
@@ -26,7 +27,8 @@ class project_installer(osv.osv_memory):
 
     _columns = {
         # Project Management
-        'project_long_term': fields.boolean('Long Term Planning',
+        'project_long_term': fields.boolean(
+        'Long Term Planning',
             help="Enables long-term projects tracking, including "
                  "multiple-phase projects and resource allocation handling."),
         'project_wiki': fields.boolean('Specifications in a Wiki',
@@ -35,7 +37,7 @@ class project_installer(osv.osv_memory):
             help="Tracks and helps employees encode and validate timesheets "
                  "and attendance."),
         'hr_timesheet_invoice': fields.boolean('Invoice Based on Hours',
-            help="Helps generate invoice based on based on human resources "
+            help="Helps generate invoice based on human resources "
                  "costs and general expenses."),
         'account_budget': fields.boolean('Budgets',
             help="Helps accountants manage analytic and crossover budgets."),
@@ -49,12 +51,14 @@ class project_installer(osv.osv_memory):
             help="Implements and tracks the concepts and task types defined "
                  "in the SCRUM methodology."),
         'project_gtd': fields.boolean('Getting Things Done',
-            help="Embeds the Getting Things Done concepts into OpenERP's "
+            help="Embeds the 'Getting Things Done concepts' into OpenERP's "
                  "project management."),
         }
+    
     _defaults={
-             'project_crm': True,
+                'project_crm': True,
                }
+    
 project_installer()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/project.py b/addons/project/project.py
index 0d62929416e..5ed5f9641ab 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from lxml import etree
-import datetime
 import time
 
 from tools.translate import _
@@ -38,6 +38,7 @@ class project_task_type(osv.osv):
     _defaults = {
         'sequence': 1
     }
+    
 project_task_type()
 
 class project(osv.osv):
@@ -46,10 +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)
+            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']:
                 cr.execute("""SELECT project.id FROM project_project project
                            LEFT JOIN account_analytic_account account ON account.id = project.category_id
@@ -61,8 +60,6 @@ class project(osv.osv):
             context=context, count=count)
 
     def _complete_name(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         res = {}
         for m in self.browse(cr, uid, ids, context=context):
             res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name
@@ -73,8 +70,6 @@ class project(osv.osv):
                 parent=parent)
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
-        if context is None:
-            context = {}
         partner_obj = self.pool.get('res.partner')
         if not part:
             return {'value':{'contact_id': False, 'pricelist_id': False}}
@@ -84,8 +79,6 @@ class project(osv.osv):
         return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
 
     def _progress_rate(self, cr, uid, ids, names, arg, context=None):
-        if context is None:
-            context = {}
         res = {}.fromkeys(ids, 0.0)
         progress = {}
         if not ids:
@@ -143,13 +136,16 @@ class project(osv.osv):
         'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages'),
         'project_escalation_id': fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.'),
      }
+    
     _order = "sequence"
+    
     _defaults = {
         'active': True,
         'priority': 1,
         'sequence': 10,
         'warn_manager': True,
     }
+    
     def _check_dates(self, cr, uid, ids):
          leave = self.read(cr, uid, ids[0], ['date_start', 'date'])
          if leave['date_start'] and leave['date']:
@@ -168,6 +164,7 @@ class project(osv.osv):
         (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']),
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
+    
     def set_template(self, cr, uid, ids, context=None):
         res = self.setActive(cr, uid, ids, value=False, context=context)
         return res
@@ -255,16 +252,11 @@ class project(osv.osv):
                 'search_view_id': search_view['res_id'],
                 'nodestroy': True
                 }
-#        return result
 
     # set active value for a project, its sub projects and its tasks
     def setActive(self, cr, uid, ids, value=True, context=None):
-        if context is None:
-            context = {}
         task_obj = self.pool.get('project.task')
         for proj in self.browse(cr, uid, ids, context=None):
-            if context is None:
-                context = {}
             self.write(cr, uid, [proj.id], {'state': value and 'open' or 'template'}, context)
             cr.execute('select id from project_task where project_id=%s', (proj.id,))
             tasks_id = [x[0] for x in cr.fetchall()]
@@ -273,9 +265,8 @@ class project(osv.osv):
             child_ids = self.search(cr, uid, [('parent_id','=', proj.id)])
             if child_ids:
                 self.setActive(cr, uid, child_ids, value, context=None)
-                if context is None:
-                    context = {}
         return True
+    
 project()
 
 class task(osv.osv):
@@ -285,16 +276,12 @@ class task(osv.osv):
     _date_name = "date_start"
 
     def _str_get(self, task, level=0, border='***', context=None):
-        if context is None:
-            context = {}
         return border+' '+(task.user_id and task.user_id.name.upper() or '')+(level and (': L'+str(level)) or '')+(' - %.1fh / %.1fh'%(task.effective_hours or 0.0,task.planned_hours))+' '+border+'\n'+ \
             border[0]+' '+(task.name or '')+'\n'+ \
             (task.description or '')+'\n\n'
 
     # Compute: effective_hours, total_hours, progress
     def _hours_get(self, cr, uid, ids, field_names, args, context=None):
-        if context is None:
-            context = {}
         res = {}
         cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
         hours = dict(cr.fetchall())
@@ -314,6 +301,8 @@ class task(osv.osv):
         return {'value':{'remaining_hours': planned - effective}}
 
     def _default_project(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'project_id' in context and context['project_id']:
             return int(context['project_id'])
         return False
@@ -323,15 +312,11 @@ class task(osv.osv):
     #]
 
     def copy_data(self, cr, uid, id, default={}, context=None):
-        if context is None:
-            context = {}
         default = default or {}
         default['work_ids'] = []
         return super(task, self).copy_data(cr, uid, id, default, context)
 
     def _check_dates(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         task = self.read(cr, uid, ids[0], ['date_start', 'date_end'])
         if task['date_start'] and task['date_end']:
              if task['date_start'] > task['date_end']:
@@ -346,7 +331,7 @@ class task(osv.osv):
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."),
         'type': fields.many2one('project.task.type', 'Stage',),
         'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
-                                  help='If the task is created the state \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
+                                  help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\
                                   \n If the task is over, the states is set to \'Done\'.'),
         'date_start': fields.datetime('Starting Date'),
         'date_end': fields.datetime('Ending Date'),
@@ -370,6 +355,7 @@ class task(osv.osv):
         'manager_id': fields.related('project_id', 'category_id', 'user_id', type='many2one', relation='res.users', string='Project Manager'),
         'company_id': fields.many2one('res.company', 'Company'),
     }
+    
     _defaults = {
         'state': 'draft',
         'priority': '2',
@@ -380,6 +366,7 @@ class task(osv.osv):
         'project_id': _default_project,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c)
     }
+    
     _order = "sequence, priority, date_start, id"
 
     _constraints = [
@@ -388,10 +375,9 @@ class task(osv.osv):
     #
     # Override view according to the company definition
     #
+    
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         users_obj = self.pool.get('res.users')
-        if context is None:
-            context = {}
         obj_tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
@@ -424,6 +410,10 @@ class task(osv.osv):
         mod_obj = self.pool.get('ir.model.data')
         request = self.pool.get('res.request')
         tasks = self.browse(cr, uid, ids)
+        task_id = ids[0]
+        cntx = {}
+        if len(args):
+            cntx = args[0]
         for task in tasks:
             project = task.project_id
             if project:
@@ -437,8 +427,7 @@ class task(osv.osv):
                         'ref_doc1': 'project.task,%d'% (task.id,),
                         'ref_doc2': 'project.project,%d'% (project.id,),
                     })
-                elif project.warn_manager:
-                    task_id = ids[0]
+                elif project.warn_manager and cntx.get('mail_send',False):
                     mail_send = True
             message = _('Task ') + " '" + task.name + "' "+ _("is Done.")
             self.log(cr, uid, task.id, message)
@@ -454,11 +443,11 @@ class task(osv.osv):
         if mail_send:
             model_data_ids = mod_obj.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_project_close_task')])
             resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
-            args[0].update({'task_id': task_id})
+            cntx.update({'task_id': task_id})
             return {
                 'name': _('Email Send to Customer'),
                 'view_type': 'form',
-                'context': args[0], # improve me
+                'context': cntx, # improve me
                 'view_mode': 'tree,form',
                 'res_model': 'close.task',
                 'views': [(resource_id,'form')],
@@ -466,7 +455,9 @@ class task(osv.osv):
                 'target': 'new',
                 'nodestroy': True
                     }
-        return True
+        else:
+            self.write(cr, uid, [task_id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
+        return False
 
     def do_reopen(self, cr, uid, ids, *args):
         request = self.pool.get('res.request')
@@ -562,11 +553,14 @@ class project_work(osv.osv):
         'user_id': fields.many2one('res.users', 'Done by', required=True),
         'company_id': fields.related('task_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True)
     }
+    
     _defaults = {
         'user_id': lambda obj, cr, uid, context: uid,
         'date': time.strftime('%Y-%m-%d %H:%M:%S')
     }
+    
     _order = "date desc"
+    
     def create(self, cr, uid, vals, *args, **kwargs):
         if 'hours' in vals and (not vals['hours']):
             vals['hours'] = 0.00
@@ -588,10 +582,12 @@ class project_work(osv.osv):
         for work in self.browse(cr, uid, ids):
             cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
         return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
+    
 project_work()
 
 class config_compute_remaining(osv.osv_memory):
     _name='config.compute.remaining'
+    
     def _get_remaining(self,cr, uid, ctx):
         task_obj = self.pool.get('project.task')
         if 'active_id' in ctx:
@@ -638,6 +634,7 @@ config_compute_remaining()
 class message(osv.osv):
     _name = "project.message"
     _description = "Message"
+    
     _columns = {
         'subject': fields.char('Subject', size=128, required="True"),
         'project_id': fields.many2one('project.project', 'Project', ondelete='cascade'),
@@ -655,7 +652,7 @@ class message(osv.osv):
 
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,
-        'date': lambda self,cr,uid,ctx: time.strftime('%Y-%m-%d'),
+        'date': time.strftime('%Y-%m-%d'),
         'project_id': _default_project
     }
 
@@ -667,6 +664,7 @@ class users(osv.osv):
     _columns = {
         'context_project_id': fields.many2one('project.project', 'Project')
      }
+    
 users()
 
 class account_analytic_account(osv.osv):
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index a931c96f635..7c5b40f3ddf 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
         <!--
 		Requests Links
 		-->
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 973194e0e31..43f01c2120d 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -45,7 +45,7 @@
         <record id="project_project_22" model="project.project">
             <field name="priority">20</field>
             <field name="parent_id" ref="project_project_9"/>
-            <field name="name">Specific Developements</field>
+            <field name="name">Specific Developments</field>
             <field name="manager" ref="base.user_root"/>
             <field eval="[(6, 0, [ref('project_tt_specification'), ref('project_tt_development')])]" name="type_ids"/>
         </record>
@@ -64,7 +64,7 @@
             <field name="type" ref="project_tt_development"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_22"/>
-            <field name="description">BoM, After sales returns, interventions. Tracability.</field>
+            <field name="description">BoM, After sales returns, interventions. Traceability.</field>
             <field name="name">Specific adaptation to MRP</field>
         </record>
         <record id="project_task_130" model="project.task">
@@ -146,7 +146,7 @@
             <field name="remaining_hours">24.0</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="project_id" ref="project_project_21"/>
-            <field name="name">MRP; functionnal layer</field>
+            <field name="name">MRP; functional layer</field>
             <field name="state">done</field>
             <field eval="time.strftime('%Y-%m-%d 12:12')" name="date_close"/>
         </record>
@@ -172,7 +172,7 @@
             <field name="remaining_hours">32.0</field>
             <field model="res.users" name="user_id" search="[('login','=','demo')]"/>
             <field name="project_id" ref="project_project_22"/>
-            <field name="name">Customer docs</field>
+            <field name="name">Customer doc</field>
         </record>
         <record id="project_task_197" model="project.task">
             <field name="sequence">30</field>
@@ -266,5 +266,6 @@
 - Create Users</field>
 			<field name="subject">Configuration steps</field>
 		</record>
+		
     </data>
 </openerp>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 12510f8b944..c989ab50aab 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -1,12 +1,13 @@
 <openerp>
   <data>
+  
     <record id="view_project_installer" model="ir.ui.view">
       <field name="name">project.installer.view</field>
       <field name="model">project.installer</field>
       <field name="type">form</field>
       <field name="inherit_id" ref="base.res_config_installer"/>
       <field name="arch" type="xml">
-        <data>
+      	<data>
           <form position="attributes">
             <attribute name="string">Project Modules Installation</attribute>
           </form>
@@ -16,12 +17,11 @@
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
           	  <attribute name='string'></attribute>
      		</xpath>
-          <xpath expr="//label[@string='description']"
-                 position="attributes">
-            <attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
+          <xpath expr="//label[@string='description']" position="attributes">
+          	<attribute name="string">Various OpenERP applications are available to bring your project management to the next levels of control and flexibility.</attribute>
           </xpath>
           <xpath expr="//button[@string='Install Modules']" position="attributes">
-                   <attribute name="string">Configure</attribute>
+          	<attribute name="string">Configure</attribute>
           </xpath>
           <group colspan="8">
             <field name="project_crm"/>
@@ -65,5 +65,6 @@
   				</xpath>
   			</field>
 	</record>
+	
   </data>
 </openerp>
diff --git a/addons/project/project_mailgate.py b/addons/project/project_mailgate.py
index b057c98b03d..8c1004b52fa 100644
--- a/addons/project/project_mailgate.py
+++ b/addons/project/project_mailgate.py
@@ -19,24 +19,13 @@
 #
 ##############################################################################
 
-import time
-import re
-import os
-
-import mx.DateTime
-import base64
-
-from tools.translate import _
-
-import tools
-from osv import fields,osv,orm
-from osv.orm import except_orm
+from osv import fields,osv
 
 class project_tasks(osv.osv):
     _name = "project.task"
     _inherit = "project.task"
 
-    def msg_new(self, cr, uid, msg):        
+    def msg_new(self, cr, uid, msg):
         mailgate_obj = self.pool.get('mail.gateway')
         msg_body = mailgate_obj.msg_body_get(msg)
         data = {      
@@ -72,14 +61,11 @@ class project_tasks(osv.osv):
             if msg_actions['priority'] in ('1','2','3','4','5'):
                 data['priority'] = msg_actions['priority']
         
-
         self.write(cr, uid, [id], data)
         getattr(self,act)(cr, uid, [id])
         return True
 
     def message_followers(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         res = []
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -93,6 +79,8 @@ class project_tasks(osv.osv):
         return res
 
     def msg_send(self, cr, uid, id, *args, **argv):
-        return True 
+        return True
 
 project_tasks()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/project_resource.py b/addons/project/project_resource.py
index 8ff68c94ea8..1295ea9e64a 100644
--- a/addons/project/project_resource.py
+++ b/addons/project/project_resource.py
@@ -1,10 +1,29 @@
+# -*- 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/>.
+#
+##############################################################################
+
 import pooler
 import datetime
 
-def timeformat_convert(cr, uid, time_string, context=None):
+def timeformat_convert(cr, uid, time_string):
 #    Function to convert input time string:: 8.5 to output time string 8:30
-        if context is None:
-            context = {}
         split_list = str(time_string).split('.')
         hour_part = split_list[0]
         mins_part = split_list[1]
@@ -12,7 +31,7 @@ def timeformat_convert(cr, uid, time_string, context=None):
         converted_string = hour_part + ':' + str(round_mins)[0:2]
         return converted_string
 
-def leaves_resource(cr,uid,calendar_id,resource_id=False,resource_calendar=False):
+def leaves_resource(cr, uid, calendar_id, resource_id=False, resource_calendar=False):
 #    To get the leaves for the resource_ids working on phase
 
         pool = pooler.get_pool(cr.dbname)
@@ -31,20 +50,20 @@ def leaves_resource(cr,uid,calendar_id,resource_id=False,resource_calendar=False
                 leaves.sort()
         return leaves
 
-def compute_working_calendar(cr,uid,calendar_id):
+def compute_working_calendar(cr, uid, calendar_id):
 #     To change the format of working calendar to bring it into 'faces' format
 
         pool = pooler.get_pool(cr.dbname)
         resource_week_pool = pool.get('resource.calendar.week')
         time_range = "8:00-8:00"
         non_working = ""
-        wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"}
+        wk = {"0":"mon", "1":"tue", "2":"wed", "3":"thu", "4":"fri", "5":"sat", "6":"sun"}
         wk_days = {}
         wk_time = {}
         wktime_list = []
         wktime_cal = []
         week_ids = resource_week_pool.search(cr, uid, [('calendar_id','=',calendar_id)])
-        week_obj = resource_week_pool.read(cr, uid, week_ids, ['dayofweek','hour_from','hour_to'])
+        week_obj = resource_week_pool.read(cr, uid, week_ids, ['dayofweek', 'hour_from', 'hour_to'])
 
 #     Converting time formats into appropriate format required
 #     and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')]
@@ -80,3 +99,5 @@ def compute_working_calendar(cr,uid,calendar_id):
             wktime_cal.append((non_working[:-1],time_range))
 
         return wktime_cal
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 006d32b8b68..0c9b2f671ce 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
         <menuitem
             icon="terp-project" id="base.menu_main_pm"
             name="Project" sequence="10"
@@ -148,6 +149,7 @@
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
                     <field name="partner_id" string="Partner"/>
+                    <field name="parent_id" invisible="1"/>
                     <field name="planned_hours" widget="float_time"/>
                     <field name="total_hours" widget="float_time"/>
                     <field name="effective_hours" widget="float_time"/>
@@ -252,18 +254,19 @@
                     </group>
                     <notebook colspan="4">
                         <page string="Information">
+                            <group col="2" colspan="2">
+                                <field
+                                    name="planned_hours"
+                                    widget="float_time"
+                                    attrs="{'readonly':[('state','!=','draft')]}"
+                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
+                                <field name="effective_hours" widget="float_time"/>
+                            </group>
                             <group col="3" colspan="2">
-                            <field
-                                name="planned_hours"
-                                widget="float_time"
-                                attrs="{'readonly':[('state','!=','draft')]}"
-                                on_change="onchange_planned(planned_hours, effective_hours)"/>
                                 <field name="remaining_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
                                 <button name="%(action_config_compute_remaining)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
-                            </group>
-                            <group col="2" colspan="2">
-                            <field name="delay_hours" widget="float_time"/>
-                            <field name="effective_hours" widget="float_time"/>
+
+                                <field name="delay_hours" widget="float_time"/>
                             </group>
 
                             <field colspan="4" name="description" nolabel="1"  attrs="{'readonly':[('state','=','done')]}" widget="text_wiki"/>
@@ -647,5 +650,6 @@
         <act_window domain="[('user_id', '=', active_id),('date', '&gt;=', time.strftime('%Y-%m-01'))]" id="act_res_users_2_project_task_work_month" name="Month works" res_model="project.task.work" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
         <act_window domain="[('project_id', '=', active_id)]" id="act_project_messages" name="Messages" res_model="project.message" src_model="project.project"/>
+        
     </data>
 </openerp>
diff --git a/addons/project/project_wizard.xml b/addons/project/project_wizard.xml
deleted file mode 100644
index 25001605210..00000000000
--- a/addons/project/project_wizard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--<wizard id="wizard_close_task" menu="False" model="project.task" name="project.task.close" string="Close Task"/>-->
-        <!--<wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/>-->
-        <!--<wizard
-            id="wizard_duplicate_template"
-            menu="False"
-            model="project.project"
-            name="project.duplicate.template" string="Duplicate Template"/>
--->
-    </data>
-</openerp>
diff --git a/addons/project/report/__init__.py b/addons/project/report/__init__.py
index 295b8c9674d..f35064b9752 100644
--- a/addons/project/report/__init__.py
+++ b/addons/project/report/__init__.py
@@ -18,6 +18,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 import project_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index fec1052b28b..a3ecf0f4ba1 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -118,6 +118,7 @@ class report_project_task_user(osv.osv):
                     t.type
 
         """)
+
 report_project_task_user()
 
 #This class is generated for project deshboard purpose
@@ -162,6 +163,7 @@ class project_vs_remaining_hours(osv.osv):
                  GROUP BY pur.uid,aaa.state,aaa.name
             )
         """)
+
 project_vs_remaining_hours()
 
 class task_by_days(osv.osv):
@@ -192,6 +194,7 @@ class task_by_days(osv.osv):
                     to_char(pt.create_date, 'YYYY-MM-DD'),pt.state,pt.project_id
             )
         """)
+
 task_by_days()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 9df6bd1f8ab..f22875cee4d 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
         <menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
 
         <record id="view_task_project_user_tree" model="ir.ui.view">
@@ -42,13 +43,13 @@
             <field name="model">report.project.task.user</field>
             <field name="type">graph</field>
             <field name="arch" type="xml">
-            <graph string="Tasks Analysis" type="bar">
-                 <field name="name"/>
-                 <field name="state" group="True"/>
-                 <field name="no_of_days" operator="+"/>
-             </graph>
-         </field>
-    </record>
+	            <graph string="Tasks Analysis" type="bar">
+	                 <field name="name"/>
+	                 <field name="state" group="True"/>
+	                 <field name="no_of_days" operator="+"/>
+	             </graph>
+         	</field>
+    	</record>
 
         <record id="view_task_project_user_search" model="ir.ui.view">
             <field name="name">report.project.task.user.search</field>
@@ -174,7 +175,7 @@
          </field>
     </record>
 
-   <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
+    <record id="action_project_vs_remaining_hours_graph" model="ir.actions.act_window">
         <field name="name">Project and remaining hours</field>
         <field name="res_model">project.vs.remaining.hours</field>
         <field name="view_type">form</field>
@@ -184,7 +185,7 @@
     </record>
 
     <!-- Views and action for project issue dashboard -->
-       <record id="view_task_by_days_tree" model="ir.ui.view">
+    <record id="view_task_by_days_tree" model="ir.ui.view">
         <field name="name">task.by.days.tree</field>
         <field name="model">task.by.days</field>
         <field name="type">tree</field>
diff --git a/addons/project/res_partner.py b/addons/project/res_partner.py
index 351f28cb283..3e2ff83f078 100644
--- a/addons/project/res_partner.py
+++ b/addons/project/res_partner.py
@@ -23,7 +23,7 @@ from osv import fields,osv
 
 class res_partner(osv.osv):
 
-    """ Inherits partner and adds CRM information in the partner form """
+    """ Inherits partner and adds Tasks information in the partner form """
     _inherit = 'res.partner'
     _columns = {
         'task_ids': fields.one2many('project.task', 'partner_id', 'Tasks'),
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml
index 4778c0f1017..b130b057062 100644
--- a/addons/project/res_partner_view.xml
+++ b/addons/project/res_partner_view.xml
@@ -20,6 +20,7 @@
                 </page>
             </field>
        </record>
+       
    </data>
 </openerp>
 
diff --git a/addons/project/wizard/project_close_task.py b/addons/project/wizard/project_close_task.py
index b1cd933a4f7..715e70e59d0 100644
--- a/addons/project/wizard/project_close_task.py
+++ b/addons/project/wizard/project_close_task.py
@@ -19,8 +19,9 @@
 #
 ##############################################################################
 
-from osv import fields, osv
+import time
 
+from osv import fields, osv
 from tools.translate import _
 from tools import email_send as email
 
@@ -42,7 +43,7 @@ class project_close_task(osv.osv_memory):
         if 'task_id' in context:
             task = self.pool.get('project.task').browse(cr, uid, context['task_id'])
             partner_id = task.partner_id or task.project_id.partner_id
-            if partner_id and partner_id.address[0].email:
+            if partner_id and len(partner_id.address) and partner_id.address[0].email:
                 email = partner_id.address[0].email
         return email
 
@@ -54,10 +55,15 @@ class project_close_task(osv.osv_memory):
             return task.description or task.name
         return ''
 
-    _defaults={
+    _defaults = {
        'email': _get_email,
        'description': _get_desc,
                }
+    
+    def close(self, cr, uid, ids, context=None):
+        if 'task_id' in context:
+            self.pool.get('project.task').write(cr, uid, [context['task_id']], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
+        return {}
 
     def confirm(self, cr, uid, ids, context=None):
         if context is None:
@@ -67,8 +73,10 @@ class project_close_task(osv.osv_memory):
         close_task = self.read(cr, uid, ids[0], [])
         to_adr = close_task['email']
         description = close_task['description']
+        
         if 'task_id' in context:
-            for task in self.pool.get('project.task').browse(cr, uid, [context['task_id']], context=context):
+            task_obj = self.pool.get('project.task')
+            for task in task_obj.browse(cr, uid, [context['task_id']], context=context):
                 project = task.project_id
                 subject = "Task '%s' closed" % task.name
                 if task.user_id and task.user_id.address_id and task.user_id.address_id.email:
@@ -89,9 +97,11 @@ class project_close_task(osv.osv_memory):
                     footer = (project.warn_footer or '') % val
                     body = u'%s\n%s\n%s\n\n-- \n%s' % (header, description, footer, signature)
                     email(from_adr, [to_adr], subject, body.encode('utf-8'), email_bcc=[from_adr])
+                    task_obj.write(cr, uid, [task.id], {'state': 'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S'), 'remaining_hours': 0.0})
                 else:
-                    raise osv.except_osv(_('Error'), _("Couldn't send mail because the contact for this task (%s) has no email address!") % contact.name)
+                    raise osv.except_osv(_('Error'), _("Please specify the email address of partner."))
         return {}
 
 project_close_task()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/wizard/project_close_task_view.xml b/addons/project/wizard/project_close_task_view.xml
index f9206152b25..e46ddf7d6da 100644
--- a/addons/project/wizard/project_close_task_view.xml
+++ b/addons/project/wizard/project_close_task_view.xml
@@ -16,9 +16,11 @@
 		              <newline/>
 		              <field name="description" />
 		              </group>
-		              <group colspan="4" col="6">
-		            		<button  icon="gtk-cancel" special="cancel" string="_Close"/>
-		            		<button icon="gtk-ok" name="confirm" string="Send Mail" type="object"/>
+		              <separator string="" colspan="6"/>
+		              <group colspan="6" col="6">
+		            		<button icon="gtk-ok" name="confirm" string="Send and Close" type="object"/>
+		            		<button  icon="gtk-ok" string="Close" name="close" type="object"/>
+		            		<button  icon="gtk-cancel" special="cancel" string="_Cancel"/>
 		              </group>
 			  	</form>
             </field>
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 779909273df..850f27b99d4 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -102,19 +102,20 @@ class project_task_delegate(osv.osv_memory):
             'description': delegate_data['new_task_description'] or '',
             'child_ids': [],
             'work_ids': []
-        })
+        }, context)
         task_obj.write(cr, uid, [task.id], {
             'remaining_hours': delegate_data['planned_hours_me'],
             'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
             'name': newname,
-        })
+        }, context)
         if delegate_data['state'] == 'pending':
-            task_obj.do_pending(cr, uid, [task.id])
+            task_obj.do_pending(cr, uid, [task.id], context)
         else:
-            task_obj.do_close(cr, uid, [task.id])
-        delegrate_user = user_obj.browse(cr, uid, delegate_data['user_id'], context=context)
-        message = _('Task ') + " '" + delegate_data['name'] + "' "+ _("is Delegated to User:") +" '"+ delegrate_user.name +"' "
-        self.log(cr, uid, task.id, message)
+            context.update({'mail_send': False} )
+            task_obj.do_close(cr, uid, [task.id], context)
+            delegrate_user = user_obj.browse(cr, uid, delegate_data['user_id'], context=context)
+            message = _('Task ') + " '" + delegate_data['name'] + "' "+ _("is Delegated to User:") +" '"+ delegrate_user.name +"' "
+            self.log(cr, uid, task.id, message)
         return {}
 
 project_task_delegate()