pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix]Improve code

Browse Source 
bzr revid: vja@tinyerp.com-20130214133320-5ce378028he51jds
This commit is contained in:
Vishmita
2013-02-14 19:03:20 +05:30
parent e6b5ec6061
commit b1e5352939
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+4 -3
View File
@@ -253,7 +253,7 @@ class account_analytic_line(osv.osv):
class hr_timesheet_line(osv.osv):
_inherit = "hr.analytic.timesheet"
def create(self, cr, uid, vals, *args, **argv):
def create_timesheet(self, cr, uid, vals,context=None):
sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
print"this >>>>>>>>>>>>>>>>>>>>>>>>",vals,sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
idss = sheet_obj.search(cr, uid,[('date_to', '>=', vals['date']), ('date_from', '<=', vals['date'])])
@@ -272,9 +272,10 @@ class hr_timesheet_line(osv.osv):
[('date_to', '>=', ts_line.date), ('date_from', '<=', ts_line.date),
('employee_id.user_id', '=', ts_line.user_id.id)],
context=context)
if sheet_ids:
if not sheet_ids:
sheet_ids = self.create_timesheet(cursor,user,ts_line,context=context)
# [0] because only one sheet possible for an employee between 2 dates
res[ts_line.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
res[ts_line.id] = sheet_obj.name_get(cursor, user, sheet_ids, context=context)[0]
return res
def _get_hr_timesheet_sheet(self, cr, uid, ids, context=None):