Better Timesheet By Project

bzr revid: fp@tinyerp.com-9a65db77a230ff8586de767f978deac1f71cc9f1

diff --git a/addons/hr_timesheet_project/hr_timesheet_project_view.xml b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
index 11849da..266afb8 100644 (file)
--- a/addons/hr_timesheet_project/hr_timesheet_project_view.xml
+++ b/addons/hr_timesheet_project/hr_timesheet_project_view.xml
@@ -3,7 +3,7 @@
        <data>
 
                <wizard
-                       string="Hours from tasks"
+                       string="Hours From Tasks"
                        model="hr.employee"
                        name="hr_timesheet_project.encode.hour"
                        id="encode_hour"/>
@@ -13,5 +13,11 @@
                        action="encode_hour"
                        type="wizard"/>
 
+               <wizard
+                       string="Timesheet From Tasks"
+                       model="hr_timesheet_sheet.sheet"
+                       name="hr_timesheet_project.encode.hour.noopen"
+                       id="encode_hour_tss"/>
+
        </data>
 </terp>

diff --git a/addons/hr_timesheet_project/wizard/timesheet_hour_encode.py b/addons/hr_timesheet_project/wizard/timesheet_hour_encode.py
index a3d36d1..13bdd7d 100644 (file)
--- a/addons/hr_timesheet_project/wizard/timesheet_hour_encode.py
+++ b/addons/hr_timesheet_project/wizard/timesheet_hour_encode.py
@@ -40,7 +40,14 @@ def _action_line_create(self, cr, uid, data, context):
        ts =  pooler.get_pool(cr.dbname).get('hr.analytic.timesheet')
 
        for work in tw.browse(cr, uid, ids, context):
-               if work.task_id.project_id.category_id:
+               if not work.task_id.project_id:
+                       continue
+               proj = work.task_id.project_id
+               aa = proj.category_id
+               while proj and not aa:
+                       proj = proj.parent_id
+                       aa = proj.category_id
+               if aa:
                        unit_id = ts._getEmployeeUnit(cr, uid, context)
                        product_id = ts._getEmployeeProduct(cr, uid, context)
                        res = {
@@ -50,13 +57,13 @@ def _action_line_create(self, cr, uid, data, context):
                                'product_uom_id': unit_id,
                                'product_id': product_id,
                                'amount': work.hours or 0.0,
-                               'account_id': work.task_id.project_id.category_id.id
+                               'account_id': aa.id
                        }
                        res2 = ts.on_change_unit_amount(cr, uid, False, product_id, work.hours or 0.0,unit_id, context)
                        if res2:
                                res.update(res2['value'])
                        if hasattr(ts, 'on_change_account_id'):
-                               res2 = ts.on_change_account_id(cr, uid, False, work.task_id.project_id.category_id.id)
+                               res2 = ts.on_change_account_id(cr, uid, False, aa.id)
                                if res2:
                                        res.update(res2['value'])
                        id = ts.create(cr, uid, res, context)
@@ -81,3 +88,12 @@ class wiz_hr_timesheet_project(wizard.interface):
        }
 wiz_hr_timesheet_project('hr_timesheet_project.encode.hour')
 
+class wiz_hr_timesheet_project_noopen(wizard.interface):
+       states = {
+               'init': {
+                       'actions': [_action_line_create],
+                       'result': {'type': 'state', 'state':'end'}
+               }
+       }
+wiz_hr_timesheet_project_noopen('hr_timesheet_project.encode.hour.noopen')
+