Merge lp:~openerp-commiter/openobject-addons/trunk-rpa-new into lp:~openerp/openobject-addons/old_trunk

[Rucha (Open ERP)]

[Rucha (Open ERP) (rpa-openerp)]

Tasks for Planning Improvement

1.add integer 'Business Days' in planning

2.improve view and do a fixed area in top (as for new design since 5.0)

3. Change the default name to be the current month instead of the current day

4. add a many2one(planning) on project.task

5. add a boolean on planning line: "Assigned to task(s)"

6. 1st tab: Planning By User
everything read-only, psql view:
   user: should list all the employee that are in the department of the user responsible (search users where (id, child_of, [uid])). There is one more line added, for everything planned with no user given.
   tasks: total of remaining hours of uncanceled tasks linked to this planning
   plan(tasks): total of planning line that have the Boolean "assigned to task(s)" = TRUE
   plan(open): total of planning line that have the boolean "assigned to task(s)" = FALSE
   holidays: total of holiday requests (all except the refused ones) between the 2 dates of the planning
   free: depicts the number of unplanned days for someone: computed as business days on planning - plan(tasks) - plan(open) - holidays
   timesheet: total of the timesheet lines between the dates of the planning

7. 2nd tab: Planning By Account
everything read-only, psql view:
   same than 1st tab except that it's group by account, not by user

8. 3th tab: time allocation
that's where we can write the planning lines.

9. 4th tab: tasks allocation
that's the one2many where we can see the tasks linked to this planning. use a widget many2many

10. in list view, we should ba able to see
   name: name of the planning
   responsible: the planning responsible
   total days: business days of the planning
   total planned: sum of total plan(tasks) and total plan(open) for all lines of 1st tab
   total free: sum of free field for all lines of 1st tab
   state: the planning state

=== modified file 'report_analytic_planning/__terp__.py'
--- report_analytic_planning/__terp__.py	2009-02-03 17:02:20 +0000
+++ report_analytic_planning/__terp__.py	2009-05-05 09:52:10 +0000
@@ -28,7 +28,9 @@
     'description': """Planning on analytic accounts.""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['account', 'hr_timesheet_invoice', 'project', 'report_analytic_line'],
+    'depends': ['account', 'hr_timesheet_invoice', 'project', 'report_analytic_line', 'hr_holidays',
+                        'hr_timesheet_sheet'
+                ],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',

=== modified file 'report_analytic_planning/report_account_analytic.planning.csv'
--- report_analytic_planning/report_account_analytic.planning.csv	2007-08-09 11:20:41 +0000
+++ report_analytic_planning/report_account_analytic.planning.csv	2009-05-07 12:36:03 +0000
@@ -1,10 +1,10 @@
-name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id
-Planning 2007,5.0,Day,admin,Seagate P1,admin
-,7.0,Day,admin,Seagate P2,
-,2.0,Day,admin,Sednacom,
-,3.0,Day,admin,Administratif,
-,4.0,Day,admin,Commercial & Marketing,
-,6.0,Day,demo,Seagate P1,
-,7.0,Day,demo,Seagate P2,
-,1.0,Day,demo,CampToCamp,
-,7.0,Day,demo,Agrolait,
+name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/task,line_ids/account_id,user_id
+Planning 2007,5.0,Day,admin,1,Seagate P1,admin
+,7.0,Day,admin,0,Seagate P2,
+,2.0,Day,admin,1,Sednacom,
+,3.0,Day,admin,0,Administratif,
+,4.0,Day,admin,0,Commercial & Marketing,
+,6.0,Day,demo,1,Seagate P1,
+,7.0,Day,demo,1,Seagate P2,
+,1.0,Day,demo,0,CampToCamp,
+,7.0,Day,demo,0,Agrolait,

=== modified file 'report_analytic_planning/report_analytic_planning.py'
--- report_analytic_planning/report_analytic_planning.py	2009-04-29 05:03:05 +0000
+++ report_analytic_planning/report_analytic_planning.py	2009-05-11 09:20:03 +0000
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 
 import time
 import mx.DateTime
@@ -28,31 +28,68 @@
 class report_account_analytic_planning(osv.osv):
     _name = "report_account_analytic.planning"
     _description = "Planning"
+    
+    def _get_total_planned(self, cr, uid, ids, name, args, context):
+         result = {}
+         for plan in self.browse(cr, uid, ids, context):
+             plan_hrs=0.0
+             for p in plan.planning_user:
+                 if not p.plan_open : p.plan_open = 0.0
+                 if not p.plan_tasks : p.plan_tasks = 0.0
+                 plan_hrs=plan_hrs +p.plan_open+p.plan_tasks
+             result[plan.id] = plan_hrs
+         return result
+     
+    def _get_total_free(self, cr, uid, ids, name, args, context):
+         result = {}
+         for plan in self.browse(cr, uid, ids, context):
+             total_free=0.0
+             for p in plan.planning_user:
+                 if  p.free:
+                     total_free=total_free+p.free
+             result[plan.id] = total_free
+         return result
+     
+     
     _columns = {
-        'name': fields.char('Planning Name', size=32, required=True, readonly=True, states={'open':[('readonly',False)]}),
-        'user_id': fields.many2one('res.users', 'Responsible', required=True, readonly=True, states={'open':[('readonly',False)]}),
-        'date_from':fields.date('Start Date', required=True, readonly=True, states={'open':[('readonly',False)]}),
-        'date_to':fields.date('End Date', required=True, readonly=True, states={'open':[('readonly',False)]}),
-        'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', readonly=True, states={'open':[('readonly',False)]}),
-        'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True),
-        'stat_user_ids': fields.one2many('report_account_analytic.planning.stat.user', 'planning_id', 'Planning by user', readonly=True),
-        'stat_account_ids': fields.one2many('report_account_analytic.planning.stat.account', 'planning_id', 'Planning by account', readonly=True),
-        'state': fields.selection([('open','Open'),('done','Done')], 'Status', required=True),
-        'business_days' : fields.integer('Business Days')
+        'name': fields.char('Planning Name', size=32, required=True, readonly=True, states={'open':[('readonly', False)]}), 
+        'user_id': fields.many2one('res.users', 'Responsible', required=True, readonly=True, states={'open':[('readonly', False)]}), 
+        'date_from':fields.date('Start Date', required=True, readonly=True, states={'open':[('readonly', False)]}), 
+        'date_to':fields.date('End Date', required=True, readonly=True, states={'open':[('readonly', False)]}), 
+        'line_ids': fields.one2many('report_account_analytic.planning.line', 'planning_id', 'Planning lines', readonly=True, states={'open':[('readonly', False)]}), 
+        'stat_ids': fields.one2many('report_account_analytic.planning.stat', 'planning_id', 'Planning analysis', readonly=True), 
+        'stat_user_ids': fields.one2many('report_account_analytic.planning.stat.user', 'planning_id', 'Planning by user', readonly=True), 
+        'stat_account_ids': fields.one2many('report_account_analytic.planning.stat.account', 'planning_id', 'Planning by account', readonly=True), 
+        'state': fields.selection([('draft','Draft'),('open', 'Open'), ('done', 'Done'),('cancel','Cancelled')], 'Status', required=True), 
+        'business_days' : fields.integer('Business Days', required=True), 
+        'task_ids': fields.one2many('project.task', 'planning_id', 'Planning Tasks'), 
+        'planning_user': fields.one2many('report_account_analytic.planning.user', 'planning_id', 'Planning By User'), 
+        'planning_account': fields.one2many('report_account_analytic.planning.account', 'planning_id', 'Planning By Account'), 
+        'total_planned'  : fields.function(_get_total_planned, method=True, string='Total Planned'), 
+        'total_free'  : fields.function(_get_total_free, method=True, string='Total Free'),
     }
     _defaults = {
-        'name': lambda *a: time.strftime('%Y-%m-%d'),
-        'date_from': lambda *a: time.strftime('%Y-%m-01'),
-        'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1,day=1,days=-1)).strftime('%Y-%m-%d'),
-        'user_id': lambda self,cr,uid,c: uid,
-        'state': lambda *args: 'open'
+        'name': lambda *a: time.strftime('%B-%y'), 
+        'date_from': lambda *a: time.strftime('%Y-%m-01'), 
+        'date_to': lambda *a: (mx.DateTime.now()+mx.DateTime.RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'), 
+        'user_id': lambda self, cr, uid, c: uid, 
+        'state': lambda *args: 'draft', 
+        'business_days' : lambda *a: 20, 
     }
     _order = 'date_from desc'
     
     def action_open(self, cr, uid, id, context={}):
         self.write(cr, uid, id, {'state' : 'open'})
         return True
-        
+
+    def action_cancel(self, cr, uid, id, context={}):
+        self.write(cr, uid, id, {'state' : 'cancel'})
+        return True
+    
+    def action_draft(self, cr, uid, id, context={}):
+        self.write(cr, uid, id, {'state' : 'draft'})
+        return True
+    
     def action_done(self, cr, uid, id, context={}):
         self.write(cr, uid, id, {'state' : 'done'})
         return True
@@ -64,16 +101,187 @@
     _description = "Planning Line"
     _rec_name = 'user_id'
     _columns = {
-        'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True),
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'),
-        'user_id': fields.many2one('res.users', 'User'),
-        'amount': fields.float('Quantity', required=True),
-        'amount_unit':fields.many2one('product.uom', 'Qty UoM', required=True),
-        'note':fields.text('Note', size=64),
+        'account_id':fields.many2one('account.analytic.account', 'Analytic account', required=True), 
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True, ondelete='cascade'), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'amount': fields.float('Quantity', required=True), 
+        'amount_unit': fields.many2one('product.uom', 'Qty UoM', required=True), 
+        'note': fields.text('Note', size=64), 
+        'task' : fields.boolean('Assigned to task(s)'), 
+        
     }
     _order = 'user_id,account_id'
 report_account_analytic_planning_line()
 
+class project_task(osv.osv):
+    _name = "project.task"
+    _inherit = "project.task"
+    _columns = {
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', ondelete='cascade'), 
+    }
+project_task()
+
+
+class report_account_analytic_planning_user(osv.osv):
+    _name = "report_account_analytic.planning.user"
+    _description = "Planning by User"
+    _rec_name = 'user_id'
+    _auto = False
+    
+    
+    def _get_tasks(self, cr, uid, ids, name, args, context):
+         result = {}
+         for line in self.browse(cr, uid, ids, context):
+            if line.user_id.id:
+                cr.execute("""select COALESCE(sum(tasks.remaining_hours),0) from project_task tasks \
+                               where tasks.user_id=%s and  tasks.planning_id=%s""", (line.user_id.id, line.planning_id.id,))
+                result[line.id] = cr.fetchall()[0][0]
+            else:
+                result[line.id] = 0
+         return result
+
+    
+    def _get_free(self, cr, uid, ids, name, args, context):
+        result = {}
+        for line in self.browse(cr, uid, ids, context):
+            
+            result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open - line.holiday 
+        return result
+    
+    def _get_plan_open(self, cr, uid, ids, name, args, context):
+        result = {}
+        for line in self.browse(cr, uid, ids, context):
+            if line.user_id.id:
+                cr.execute('select sum(amount) as plan_tasks\
+                 from report_account_analytic_planning_line where task=False and user_id=  %s ', (line.user_id.id or None,))
+                result[line.id] = cr.fetchall()[0][0]
+            else:
+                cr.execute('select sum(amount) as plan_tasks\
+                 from report_account_analytic_planning_line where task=False and user_id is null')
+                result[line.id] = cr.fetchall()[0][0]
+        return result
+        
+    
+    _columns = {
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'user_id': fields.many2one('res.users', 'User', readonly=True), 
+        'tasks' : fields.function(_get_tasks, method=True, string='Tasks'), 
+        'plan_tasks': fields.float('Planned to tasks', readonly=True), 
+        'free' : fields.function(_get_free, method=True, string='Free', readonly=True), 
+        'plan_open': fields.float('Planned-Open', readonly=True), 
+        'holiday': fields.float('Holidays'), 
+        'timesheet': fields.float('Timesheet'), 
+    }
+    
+    def init(self, cr):
+        cr.execute(""" create or replace view report_account_analytic_planning_user as (
+          select 
+            planning.id as planning_id,
+            sum(line.id) as id,
+            planning.business_days,
+            line.user_id,        
+            (Select sum(line1.amount) from report_account_analytic_planning_line line1
+                where line1.task = True and line1.user_id = line.user_id
+                and line1.planning_id = line.planning_id
+                )
+                 as plan_tasks,
+            (Select sum(line1.amount) from report_account_analytic_planning_line line1
+                where line1.task = False and line1.user_id = line.user_id
+                and line1.planning_id = line.planning_id
+                )
+                as plan_open,
+            ( select sum(holidays.number_of_days) from hr_holidays holidays where line.user_id=holidays.user_id and holidays.state in ('validate','confirm') 
+            and holidays.date_from>=planning.date_from and holidays.date_to <= planning.date_to)
+                as holiday,
+            (select sum(sheet_day.total_timesheet) as timesheet 
+                from hr_timesheet_sheet_sheet_day sheet_day
+                left join hr_timesheet_sheet_sheet sheet on sheet_day.sheet_id = sheet.id
+                where sheet_day.name BETWEEN planning.date_from and planning.date_to
+                and sheet.user_id =line.user_id
+             ) as timesheet 
+        from report_account_analytic_planning planning 
+        inner join report_account_analytic_planning_line line on line.planning_id = planning.id and line.user_id is not null
+        group by planning.id,planning.business_days, line.planning_id, line.user_id, planning.date_from, planning.date_to
+        UNION
+        
+        select 
+        planning.id as planning_id,
+        max(planning.id) as id,
+        planning.business_days,
+        line.user_id,        
+        (Select sum(line1.amount) from report_account_analytic_planning_line line1
+            where line1.task = True and line1.user_id is null)
+            as plan_tasks,
+        (Select sum(line1.amount) from report_account_analytic_planning_line line1
+            where line1.task = False and line1.user_id is null)
+            as plan_open,
+            '0' as holiday,
+            '0' as timesheet 
+        from report_account_analytic_planning planning 
+        inner join report_account_analytic_planning_line line on line.planning_id = planning.id and line.user_id is null
+        group by planning.id,planning.business_days, line.user_id, planning.date_from, planning.date_to
+            )
+        """)
+    
+    
+report_account_analytic_planning_user()
+    
+class report_account_analytic_planning_account(osv.osv):
+    _name = "report_account_analytic.planning.account"
+    _description = "Planning by Account"
+    _rec_name = 'account_id'
+    _auto = False
+    
+    def _get_free(self, cr, uid, ids, name, args, context):
+        result = {}
+        for line in self.browse(cr, uid, ids, context):
+            result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open 
+        return result
+    
+    _columns = {
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'account_id': fields.many2one('account.analytic.account', 'Analytic account', readonly=True), 
+        'tasks' : fields.float('Tasks'), 
+        'plan_tasks': fields.float('Planned to tasks', readonly=True), 
+        'free' : fields.function(_get_free, method=True, string='Free', readonly=True), 
+        'plan_open': fields.float('Planned-Open', readonly=True), 
+    }
+    
+    def init(self, cr):
+        cr.execute(""" create or replace view report_account_analytic_planning_account as (
+           select 
+            min(l.id) as id,
+            l.account_id as account_id,
+            sum(l.amount) as quantity,
+            l.planning_id as planning_id,
+            (Select sum(line1.amount) from report_account_analytic_planning_line line1
+                        where line1.task = True and l.account_id = line1.account_id
+                    and l.planning_id = line1.planning_id
+                        )
+                 as plan_tasks,
+            (Select sum(line1.amount) from report_account_analytic_planning_line line1
+                    where line1.task = False and l.account_id = line1.account_id
+                and l.planning_id = line1.planning_id
+                )
+                 as plan_open,
+            
+            (
+           select sum(tasks.remaining_hours)
+                from report_account_analytic_planning plan
+                left join project_task tasks on tasks.planning_id = plan.id
+                inner join project_project proj on tasks.project_id = proj.id
+            where plan.id = l.planning_id and proj.category_id = l.account_id
+            group by proj.category_id
+            ) as tasks
+        from report_account_analytic_planning_line l
+        group by l.account_id, l.planning_id
+            )
+        """)
+    
+    
+report_account_analytic_planning_account()
+    
+
 class report_account_analytic_planning_stat_account(osv.osv):
     _name = "report_account_analytic.planning.stat.account"
     _description = "Planning account stat"
@@ -83,14 +291,14 @@
     def _sum_amount_real(self, cr, uid, ids, name, args, context):
         result = {}
         for line in self.browse(cr, uid, ids, context):
-            cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+            cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             result[line.id] = cr.fetchone()[0]
         return result
     _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
-        'quantity': fields.float('Planned', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True), 
+        'quantity': fields.float('Planned', required=True), 
+        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'), 
     }
     def init(self, cr):
         cr.execute("""
@@ -120,9 +328,9 @@
         result = {}
         for line in self.browse(cr, uid, ids, context):
             if line.user_id:
-                cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and account_id=%s and date>=%s and date<=%s', (line.user_id.id,line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+                cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and account_id=%s and date>=%s and date<=%s', (line.user_id.id, line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             else:
-                cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id,line.planning_id.date_from,line.planning_id.date_to))
+                cr.execute('select sum(unit_amount) from account_analytic_line where account_id=%s and date>=%s and date<=%s', (line.account_id.id, line.planning_id.date_from, line.planning_id.date_to))
             result[line.id] = cr.fetchone()[0]
         return result
     def _sum_amount_tasks(self, cr, uid, ids, name, args, context):
@@ -140,20 +348,20 @@
                     project_id in (select id from project_project where category_id=%s) and
                     date_close>=%s and
                     date_close<=%s''', (
-                line.account_id.id,
-                line.planning_id.date_from,
+                line.account_id.id, 
+                line.planning_id.date_from, 
                 line.planning_id.date_to)
             )
             result[line.id] = cr.fetchone()[0]
         return result
     _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'),
-        'user_id': fields.many2one('res.users', 'User'),
-        'manager_id': fields.many2one('res.users', 'Manager'),
-        'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
-        'sum_amount': fields.float('Planned hours', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
-        'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning'), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'manager_id': fields.many2one('res.users', 'Manager'), 
+        'account_id': fields.many2one('account.analytic.account', 'Account', required=True), 
+        'sum_amount': fields.float('Planned hours', required=True), 
+        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'), 
+        'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'), 
     }
     _order = 'planning_id,user_id'
     def init(self, cr):
@@ -189,14 +397,14 @@
         for line in self.browse(cr, uid, ids, context):
             result[line.id] = 0.0
             if line.user_id:
-                cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and date>=%s and date<=%s', (line.user_id.id,line.planning_id.date_from,line.planning_id.date_to))
+                cr.execute('select sum(unit_amount) from account_analytic_line where user_id=%s and date>=%s and date<=%s', (line.user_id.id, line.planning_id.date_from, line.planning_id.date_to))
                 result[line.id] = cr.fetchone()[0]
         return result
     _columns = {
-        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True),
-        'user_id': fields.many2one('res.users', 'User'),
-        'quantity': fields.float('Planned', required=True),
-        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
+        'planning_id': fields.many2one('report_account_analytic.planning', 'Planning', required=True), 
+        'user_id': fields.many2one('res.users', 'User'), 
+        'quantity': fields.float('Planned', required=True), 
+        'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'), 
     }
     def init(self, cr):
         cr.execute("""
@@ -218,3 +426,4 @@
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+

=== modified file 'report_analytic_planning/report_analytic_planning_view.xml'
--- report_analytic_planning/report_analytic_planning_view.xml	2009-04-29 05:03:05 +0000
+++ report_analytic_planning/report_analytic_planning_view.xml	2009-05-11 09:20:03 +0000
@@ -1,219 +1,277 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="account_analytic_planning_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.tree</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Planning by Account">
-                    <field name="name"/>
-                    <field name="user_id"/>
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="account_analytic_planning_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.form</field>
-            <field name="model">report_account_analytic.planning</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Planning by Account">
-                      <field name="name" select="1"/>
-                      <field name="user_id" select="1"/>
-                      <field name="date_from"/>
-                      <field name="date_to"/>
-                      <notebook>
-                		   <page string="Planning">
-                   		   <field colspan="4" name="line_ids" nolabel="1">
-                                <tree editable="bottom" string="Planning Line">
-                                    <field name="user_id"/>
-                                    <field name="account_id"/>
-                                    <field name="amount"/>
-                                    <field name="amount_unit"/>
-                                    <field name="note"/>
-                                </tree>
-                                <form string="Planning Line">
-                                    <field name="user_id"/>
-                                    <field name="account_id"/>
-                                    <field name="amount"/>
-                                    <field name="amount_unit"/>
-                                    <separator string="Notes" colspan="4" />
-                                    <field name="note" colspan="4" nolabel="1"/>
-                                </form>
-                            </field>
-                            <group col="4" colspan="4">
-	                            <field name="state" select="1" readonly="1"/>
-	                            <button name="action_open" states="done" string="Re-Open" type="object" icon="gtk-convert"/>
-	                             <button name="action_done" states="open" string="Done" type="object" icon="gtk-jump-to"/>
-                            </group>
-                        </page>
-                        <page string="Analysis">
-                            <field colspan="4" name="stat_ids" nolabel="1" readonly="1">
-                                <tree editable="bottom" string="Planning Line">
-                                    <field name="user_id"/>
-                                    <field name="account_id"/>
-                                    <field name="sum_amount"/>
-                                    <field name="sum_amount_real"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Time by User">
-                            <field colspan="4" name="stat_user_ids" nolabel="1">
-                                <tree string="Quantities by User">
-                                    <field name="user_id"/>
-                                    <field name="quantity" sum="Total Planned"/>
-                                    <field name="sum_amount_real" sum="Total Timesheet"/>
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Time by Account">
-                            <field colspan="4" name="stat_account_ids" nolabel="1">
-                                <tree string="Quantities by Account">
-                                    <field name="account_id"/>
-                                    <field name="quantity" sum="Total Planned"/>
-                                    <field name="sum_amount_real" sum="Total Timesheet"/>
-                                </tree>
-                            </field>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-        
-        <record id="action_account_analytic_planning_form" model="ir.actions.act_window">
-            <field name="name">Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-        <menuitem id="planning_main" name="Planning" parent="hr.menu_hr_root"/>
-		<menuitem 
-			action="action_account_analytic_planning_form" 
-			id="menu_report_account_analytic_planning" 
-			parent="planning_main"/>
-        
-        <record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
-            <field name="name">My Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        <menuitem
-            action="action_account_analytic_planning_form_my"
-            id="menu_report_account_analytic_planning_my2" 
-            parent="planning_main"/>
-        
-        <record id="action_account_analytic_planning_form_current_my" model="ir.actions.act_window">
-            <field name="name">My Current Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+	<data>
+	
+		<record id="account_analytic_planning_view_tree" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.tree</field>
+			<field name="model">report_account_analytic.planning</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Planning by Account">
+					<field name="name" />
+					<field name="user_id" />
+					<field name="date_from" />
+					<field name="date_to" />
+					<field name="business_days" />
+					<field name="total_planned" />
+					<field name="total_free" />
+					<field name="state" />
+				</tree>
+			</field>
+		</record>
+
+		<record id="account_analytic_planning_view_form" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.form</field>
+			<field name="model">report_account_analytic.planning</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Planning by Account">
+					<group col="6" colspan="4">
+						<field name="name" select="1" />
+						<field name="user_id" select="1" />
+						<field name="business_days" />
+						<field name="date_from" />
+						<field name="date_to" />
+					</group>
+					<notebook colspan="4">
+						<page string="Planning by User">
+						<field colspan="4" name="planning_user"
+								nolabel="1" widget="one2many_list" readonly="1">
+							<tree string="Planning By User">
+								<field name="user_id"/>
+								<field name="tasks" />
+								<field name="plan_tasks" />
+								<field name="plan_open" />
+								<field name="holiday" />
+								<field name="free" />
+								<field name="timesheet" />
+							</tree>
+						</field>
+						</page>
+						<page string="Planning by Account">
+						<field colspan="4" name="planning_account"
+								nolabel="1" widget="one2many_list" readonly="1">
+							<tree string="Planning By Account">
+								<field name="account_id" />
+								<field name="tasks" />
+								<field name="plan_tasks" />
+								<field name="plan_open" />
+								<field name="free" />
+							</tree>
+						</field>
+						</page>
+						<page string="Time Allocation">
+							<field colspan="4" name="line_ids"
+								nolabel="1">
+								<tree editable="bottom"
+									string="Planning Lines">
+									<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+									<field name="account_id" />
+									<field name="amount" />
+									<field name="amount_unit" />
+									<field name="task" />
+									<field name="note" />
+								</tree>
+								<form string="Planning Lines">
+									<field name="user_id" domain="[('id','child_of',[parent.user_id])]"/>
+									<field name="account_id" />
+									<field name="amount" />
+									<field name="amount_unit" />
+									<field name="task" />
+									<separator string="Notes" colspan="4" />
+									<field name="note" colspan="4"
+										nolabel="1" />
+								</form>
+							</field>
+						</page>
+						<page string="Tasks Allocation">
+						<separator string="Tasks" colspan="4"/>
+						<field name="task_ids" nolabel="1" colspan="4" widget="many2many"/>
+						</page>
+					</notebook>
+					<group col="6" colspan="4">
+						<field name="state" select="1"
+							readonly="1" />
+						<button name="action_open" states="draft"
+							string="Open" type="object" icon="gtk-yes" />
+						<button name="action_done" states="open"
+							string="Done" type="object" icon="gtk-jump-to" />
+						<button name="action_cancel" states="draft,open"
+							string="Cancel" type="object" icon="gtk-cancel" />
+						<button name="action_draft" states="done,cancel"
+							string="Reset to Draft" type="object" icon="gtk-convert" />
+					</group>
+				</form>
+			</field>
+		</record>
+
+		<record id="action_account_analytic_planning_form" model="ir.actions.act_window">
+			<field name="name">Planning</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+		</record>
+		
+		<menuitem id="planning_main" name="Planning"
+			parent="hr.menu_hr_root" />
+			
+		<menuitem action="action_account_analytic_planning_form"
+			id="menu_report_account_analytic_planning" parent="planning_main" />
+
+		<record id="action_account_analytic_planning_form_my" model="ir.actions.act_window">
+			<field name="name">My Planning</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('user_id','=',uid)]</field>
+		</record>
+		
+		<menuitem action="action_account_analytic_planning_form_my"
+			id="menu_report_account_analytic_planning_my2"
+			parent="planning_main" />
+
+		<record id="action_account_analytic_planning_form_current_my"
+			model="ir.actions.act_window">
+			<field name="name">My Current Planning</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid),('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_form_current_my" id="menu_report_account_analytic_planning_current_my" parent="menu_report_account_analytic_planning_my2"/>
-        
-        <record id="action_account_analytic_planning_form_current" model="ir.actions.act_window">
-            <field name="name">Current Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')), ('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_form_current" id="menu_report_account_analytic_planning_current" parent="report_analytic_planning.menu_report_account_analytic_planning"/>
-
-        <record id="action_account_analytic_planning_form_new" model="ir.actions.act_window">
-            <field name="name">New Planning</field>
-            <field name="res_model">report_account_analytic.planning</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_form_new" id="menu_report_account_analytic_planning_new" parent="planning_main"/>
-        
-        
-        
-        <!--
-	Planning statistics
--->
-        <record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.form</field>
-            <field name="model">report_account_analytic.planning.stat</field>
+		</record>
+		<menuitem
+			action="action_account_analytic_planning_form_current_my"
+			id="menu_report_account_analytic_planning_current_my"
+			parent="menu_report_account_analytic_planning_my2" />
+
+		<record id="action_account_analytic_planning_form_current"
+			model="ir.actions.act_window">
+			<field name="name">Current Planning</field>
+			<field name="res_model">
+				report_account_analytic.planning
+			</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">tree,form</field>
+			<field name="domain">[('date_from','&lt;=',time.strftime('%Y-%m-%d')),('date_to','&gt;=',time.strftime('%Y-%m-%d'))]</field>
+		</record>
+		<menuitem action="action_account_analytic_planning_form_current"
+			id="menu_report_account_analytic_planning_current"
+			parent="report_analytic_planning.menu_report_account_analytic_planning" />
+
+		<record id="action_account_analytic_planning_form_new"
+			model="ir.actions.act_window">
+			<field name="name">New Planning</field>
+			<field name="res_model">report_account_analytic.planning</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+		</record>
+		
+		<menuitem action="action_account_analytic_planning_form_new"
+			id="menu_report_account_analytic_planning_new"
+			parent="planning_main" />
+
+
+
+		<!--
+			Planning statistics
+		-->
+		<record id="account_analytic_planning_stat_view_form" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.stat.form</field>
+			<field name="model">report_account_analytic.planning.stat</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Planning statistics">
+					<field name="planning_id" select="1" />
+					<field name="user_id" select="1" />
+					<field name="account_id" select="1" />
+				</form>
+			</field>
+		</record>
+
+
+		<record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.stat.tree</field>
+			<field name="model">report_account_analytic.planning.stat</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Planning statistics">
+					<field name="planning_id" />
+					<field name="user_id" />
+					<field name="manager_id" />
+					<field name="account_id" />
+					<field name="sum_amount" />
+					<field name="sum_amount_real" />
+					<field name="sum_amount_tasks" />
+				</tree>
+			</field>
+		</record>
+
+		<record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
+			<field name="name">report.account.analytic.planning.stat.graph</field>
+			<field name="model">report_account_analytic.planning.stat</field>
+			<field name="type">graph</field>
+			<field name="arch" type="xml">
+				<graph string="Planning statistics" type="bar">
+					<field name="account_id" />
+					<field name="sum_amount" operator="+" />
+					<field name="sum_amount_real" operator="+" />
+					<field name="sum_amount_tasks" operator="+" />
+				</graph>
+			</field>
+		</record>
+
+
+
+		<record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
+			<field name="name">Planning Statistics</field>
+			<field name="res_model">report_account_analytic.planning.stat</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+		<menuitem id="next_id_85" name="Planning"
+			parent="hr.menu_hr_reporting" />
+		<menuitem action="action_account_analytic_planning_stat_form"
+			id="menu_report_account_analytic_planning_stat" parent="next_id_85" />
+
+		<record id="action_account_analytic_planning_stat_my_form"
+			model="ir.actions.act_window">
+			<field name="name">My Planning Statistics</field>
+			<field name="res_model">report_account_analytic.planning.stat</field>
+			<field name="view_type">form</field>
+			<field name="domain">[('user_id','=',uid),('planning_id.state','=','open')]</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+		
+		<menuitem action="action_account_analytic_planning_stat_my_form"
+			id="menu_report_account_analytic_planning_stat_my"
+			parent="report_analytic_planning.next_id_85" />
+
+		<record
+			id="action_account_analytic_planning_stat_my_manager_form" model="ir.actions.act_window">
+			<field name="name">Planning Statistics of My Projects</field>
+			<field name="res_model">report_account_analytic.planning.stat</field>
+			<field name="view_type">form</field>
+			<field name="domain">[('manager_id','=',uid),('planning_id.state','=','open')]</field>
+			<field name="view_mode">graph,tree</field>
+		</record>
+		
+		<menuitem
+			action="action_account_analytic_planning_stat_my_manager_form"
+			id="menu_report_account_analytic_planning_stat_my_manager"
+			parent="report_analytic_planning.next_id_85" />
+		
+<!--		Task Form -->
+
+        <record id="view_task_planning_form" model="ir.ui.view">
+            <field name="name">planning.task.form</field>
+            <field name="model">project.task</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Planning statistics">
-                    <field name="planning_id" select="1"/>
-                    <field name="user_id" select="1"/>
-                    <field name="account_id" select="1"/>
-                </form>
-            </field>
-        </record>
-        
-        
-        <record id="account_analytic_planning_stat_view_tree" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.tree</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-                <tree string="Planning statistics">
-                    <field name="planning_id"/>
-                    <field name="user_id"/>
-                    <field name="manager_id"/>
-                    <field name="account_id"/>
-                    <field name="sum_amount"/>
-                    <field name="sum_amount_real"/>
-                    <field name="sum_amount_tasks"/>
-                </tree>
-            </field>
-        </record>
-        
-        <record id="account_analytic_planning_stat_view_graph" model="ir.ui.view">
-            <field name="name">report.account.analytic.planning.stat.graph</field>
-            <field name="model">report_account_analytic.planning.stat</field>
-            <field name="type">graph</field>
-            <field name="arch" type="xml">
-                <graph string="Planning statistics" type="bar">
-                    <field name="account_id"/>
-                    <field name="sum_amount" operator="+"/>
-                    <field name="sum_amount_real" operator="+"/>
-                    <field name="sum_amount_tasks" operator="+"/>
-                </graph>
-            </field>
-        </record>
-        
-        
-        
-        <record id="action_account_analytic_planning_stat_form" model="ir.actions.act_window">
-            <field name="name">Planning Statistics</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-        <menuitem id="next_id_85" name="Planning" parent="hr.menu_hr_reporting"/><menuitem action="action_account_analytic_planning_stat_form" id="menu_report_account_analytic_planning_stat" parent="next_id_85"/>
-        
-        <record id="action_account_analytic_planning_stat_my_form" model="ir.actions.act_window">
-            <field name="name">My Planning Statistics</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('user_id','=',uid),('planning_id.state','=','open')]</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_stat_my_form" id="menu_report_account_analytic_planning_stat_my" parent="report_analytic_planning.next_id_85"/>
-        
-        <record id="action_account_analytic_planning_stat_my_manager_form" model="ir.actions.act_window">
-            <field name="name">Planning Statistics of My Projects</field>
-            <field name="res_model">report_account_analytic.planning.stat</field>
-            <field name="view_type">form</field>
-            <field name="domain">[('manager_id','=',uid),('planning_id.state','=','open')]</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-        <menuitem action="action_account_analytic_planning_stat_my_manager_form" id="menu_report_account_analytic_planning_stat_my_manager" parent="report_analytic_planning.next_id_85"/>
-        
-        
-        
-        
-    </data>
+            <field name="inherit_id" ref="project.view_task_form2"/>
+            <field name="arch" type="xml">
+                <field name="progress" position="after">
+                	<field name="planning_id" select="1"/>
+                </field>
+            </field>
+        </record>
+
+	</data>
 </openerp>