Added Report for Timesheet/Task hours Per month

bzr revid: jvo@tinyerp.com-20090317140237-7jqzmpajqgzqxahf

diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 6a4c3ae..3afbf8c 100644 (file)
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -482,7 +482,10 @@ class purchase_order_line(osv.osv):
             seller_delay = s.delay
             if s.name.id == partner_id:
                 seller_delay = s.delay
-#                qty = s.qty
+                temp_qty = s.qty # supplier _qty assigned to temp
+                if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
+                    qty = temp_qty
+                
         dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
         prod_name = prod.partner_ref
 

diff --git a/addons/report_task/__terp__.py b/addons/report_task/__terp__.py
index 2554f26..17ce448 100644 (file)
--- a/addons/report_task/__terp__.py
+++ b/addons/report_task/__terp__.py
@@ -27,7 +27,7 @@
     'category': 'Generic Modules/Projects & Services',
     'description': """Gives statistics on tasks by user on projects to check the pipeline of users.""",
     'author': 'Tiny',
-    'depends': ['base', 'project'],
+    'depends': ['base', 'project','hr_timesheet_sheet'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'report_task_view.xml'],
     'installable': True,

diff --git a/addons/report_task/report_task.py b/addons/report_task/report_task.py
index 0e68cd1..6006f3f 100644 (file)
--- a/addons/report_task/report_task.py
+++ b/addons/report_task/report_task.py
@@ -21,6 +21,7 @@
 ##############################################################################
 
 from osv import fields,osv
+import mx.DateTime
 
 class  report_task_user_pipeline_open (osv.osv):
     _name = "report.task.user.pipeline.open"
@@ -95,44 +96,64 @@ class  report_closed_task(osv.osv):
         ''')
 report_closed_task()
 
-#class report_timesheet_task(osv.osv):
-#    _name = "report.timesheet.task"
-#    _description = "Report on Timesheets and Tasks per User Per Month"
-#    _auto = False
-#   
-#    def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
-#        result = {}
-#        
-#        for record in self.browse(cr, uid, ids, context):
-#            last_date = mx.DateTime.strptime(record.month, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
-#            obj=self.pool.get('hr_timesheet_sheet.sheet')
-#            sheet_ids = obj.search(cr,uid,[('user_id','=',record.user_id.id),('date_current','>=',record.month),('date_current','<=',last_date.strftime('%Y-%m-%d'))])
-#            data_days = obj.read(cr,uid,sheet_ids,['total_attendance_day','date_current','user_id'])
-#            total = 0.0
-#            for day_attendance in data_days:
-#                total += day_attendance['total_attendance_day']
-#            result[record.id] = total
-#        
-#        return result
-#        
-#    _columns = {
-#        'month': fields.date('Month', required=True,readonly=True),
-#        'user_id': fields.many2one('res.users', 'User' ,readonly=True, required=True),
-#        'timesheet_hrs': fields.function(get_hrs_timesheet,method=True, string="Timesheet Hrs" ),
-#        'task_hrs': fields.float('Task Hrs', readonly=True, required=True),
-#      }
-#    
-#    
-#    def init(self, cr): 
-#        cr.execute("""create or replace view report_timesheet_task as (
-#         select min(p.id) as id, to_char(p.date, 'YYYY-MM-01') as  month, min(r.id) as user_id, sum(p.hours) as task_hrs,0.0 as timesheet_hrs 
-#        from project_task_work p,res_users r 
-#        where (r.id=p.user_id) 
-#        group by  to_char(p.date, 'YYYY-MM-01'))""")
-#        
-#        
-#
-#report_timesheet_task()
+class report_timesheet_task_user(osv.osv):
+    _name = "report.timesheet.task.user"
+    _auto = False
+    _order = "name"
+    
+    def _get_task_hours(self, cr, uid, ids, name,args,context):
+        result = {}
+        for record in self.browse(cr, uid, ids,context):
+            last_date = mx.DateTime.strptime(record.name, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
+            task_obj=self.pool.get('project.task.work')
+            task_ids = task_obj.search(cr,uid,[('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))])
+            tsk_hrs = task_obj.read(cr,uid,task_ids,['hours','date','user_id'])
+            total = 0.0
+            for hrs in tsk_hrs:
+                total += hrs['hours']
+            result[record.id] = total
+        return result
+    
+    def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
+        result = {}
+        sum = 0.0
+        for record in self.browse(cr, uid, ids, context):
+            last_date = mx.DateTime.strptime(record.name, '%Y-%m-%d') + mx.DateTime.RelativeDateTime(months=1) - 1
+            obj=self.pool.get('hr_timesheet_sheet.sheet.day')
+            sheet_ids = obj.search(cr,uid,[('sheet_id.user_id','=',record.user_id.id),('name','>=',record.name),('name','<=',last_date.strftime('%Y-%m-%d'))])
+            data_days = obj.read(cr,uid,sheet_ids,['name','sheet_id.user_id','total_attendance'])
+            total = 0.0
+            for day_attendance in data_days:
+                total += day_attendance['total_attendance']
+            result[record.id] = total
+        return result
+        
+    _columns = {
+        'name': fields.date('Month',readonly=True),
+        'user_id': fields.many2one('res.users', 'User',readonly=True),
+        'timesheet_hrs': fields.function(get_hrs_timesheet, method=True, string="Timesheet Hours"),
+        'task_hrs': fields.function(_get_task_hours, method=True, string="Task Hours"),
+      }
+    
+    
+    def init(self, cr):   
+       cr.execute(""" create or replace view report_timesheet_task_user as (
+        select  
+         ((r.id*12)+to_number(months.m_id,'99'))::integer as id,
+               months.name as name,
+               r.id as user_id
+        from res_users r,
+                (select to_char(p.date,'YYYY-MM-01') as name,
+            to_char(p.date,'MM') as m_id
+                from project_task_work p 
+    
+            union 
+                select to_char(h.name,'YYYY-MM-01') as name,
+                to_char(h.name,'MM') as m_id
+                from hr_timesheet_sheet_sheet_day h) as months) """)
+     
+
+report_timesheet_task_user()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

diff --git a/addons/report_task/report_task_view.xml b/addons/report_task/report_task_view.xml
index c45685a..72da41d 100644 (file)
--- a/addons/report_task/report_task_view.xml
+++ b/addons/report_task/report_task_view.xml
@@ -90,5 +90,29 @@
             <field name="view_id" ref="view_task_closed_board_tree"/>
         </record>
         
+        <!-- Report for Users' Timesheet and Task Hours per Month -->
+               
+               <record id="view_report_timesheet_task_user_tree" model="ir.ui.view">
+            <field name="name">report.timesheet.task.user.tree</field>
+            <field name="model">report.timesheet.task.user</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Timesheet/Task hours Report Per Month" >
+                    <field name="name" select="1"/>
+                    <field name="user_id" select="1"/>
+                    <field name="timesheet_hrs" widget="float_time" />
+                    <field name="task_hrs"  widget="float_time"/>
+                </tree>
+            </field>
+        </record>
+         
+        <record id="action_report_timesheet_task_user" model="ir.actions.act_window">
+            <field name="name">Timesheet / Task Hours Per Month</field>
+            <field name="res_model">report.timesheet.task.user</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+        </record>
+        <menuitem id="menu_timesheet_task_user" parent="hr.menu_hr_reporting" action="action_report_timesheet_task_user"/>    
+        
     </data>
 </openerp>

diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 624b759..ae127fd 100644 (file)
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -296,7 +296,6 @@
        </record>
        
                <record model="ir.actions.act_window" id="action_random_timesheet_board">
-            <field name="type">ir.actions.act_window</field>
             <field name="name">Random Timesheet</field>
             <field name="res_model">report.random.timesheet</field>
             <field name="view_type">form</field>