odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Bugfixes 

lp bug: https://launchpad.net/bugs/312847 fixed

bzr revid: jvo@tinyerp.com-20090101121110-t4qhrywujau370w1
This commit is contained in:
Jay (Open ERP) 2009-01-01 17:41:10 +05:30
parent c3ec67cc57
commit cd8281aeed
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/hr/hr.py
View File

@ -47,6 +47,12 @@ class hr_timesheet_group(osv.osv):
while todo>0:
cr.execute("select hour_from,hour_to from hr_timesheet where dayofweek='%s' and tgroup_id=%s order by hour_from", (dt_from.day_of_week,id))
for (hour_from,hour_to) in cr.fetchall():
import math
hour_from = '%02d:%02d' % (math.floor(abs(hour_from)),round(abs(hour_from)%1+0.01,2) * 60)
hour_to = '%02d:%02d' % (math.floor(abs(hour_to)),round(abs(hour_to)%1+0.01,2) * 60)
h1,m1 = map(int,hour_from.split(':'))
h2,m2 = map(int,hour_to.split(':'))
d1 = DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,h1,m1)

4
addons/report_analytic_line/report_analytic_line_view.xml
View File

@ -7,7 +7,7 @@
<field name="model">report.account.analytic.line.to.invoice</field>
<field name="type">form</field>
<field name="arch" type="xml">
<tree string="Analytic Lines to Invoice">
<form string="Analytic Lines to Invoice">
<field name="name" select="1"/>
<field name="account_id" select="1"/>
<newline/>
@ -16,7 +16,7 @@
<newline/>
<field colspan="1" name="amount"/>
<field colspan="1" name="unit_amount"/>
</tree>
</form>
</field>
</record>