minor change
bzr revid: solanki.priyesh@gmail.com-20081211115052-oi8314q6m9kr5v8r
This commit is contained in:
parent
f741d23576
commit
ac68d17cc5
|
@ -71,8 +71,7 @@ class hr_attendance(osv.osv):
|
||||||
''' % (id, id)
|
''' % (id, id)
|
||||||
cr.execute(sql)
|
cr.execute(sql)
|
||||||
atts = cr.fetchall()
|
atts = cr.fetchall()
|
||||||
print "ATTS", atts
|
if not ((len(atts)==1 and atts[0][0] == 'sign_in') or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1])):
|
||||||
if not ((len(atts)==1 and atts[0][0] == 'sign_in')) or (atts[0][0] != atts[1][0] and atts[0][1] != atts[1][1]):
|
|
||||||
return False
|
return False
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
|
@ -635,7 +635,7 @@ class hr_timesheet_sheet_sheet_account(osv.osv):
|
||||||
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True),
|
'sheet_id': fields.many2one('hr_timesheet_sheet.sheet', 'Sheet', readonly=True),
|
||||||
'total': fields.float('Total Time', digits=(16,2), readonly=True),
|
'total': fields.float('Total Time', digits=(16,2), readonly=True),
|
||||||
'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True),
|
'invoice_rate': fields.many2one('hr_timesheet_invoice.factor', 'Invoice rate', readonly=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
def init(self, cr):
|
def init(self, cr):
|
||||||
cr.execute("""create or replace view hr_timesheet_sheet_sheet_account as (
|
cr.execute("""create or replace view hr_timesheet_sheet_sheet_account as (
|
||||||
|
|
Loading…
Reference in New Issue