pso (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/pso-dev-addons3 into
lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#669360 hr_timeeshet_sheet : installation fails on 1st (and probably last)
date of the month.
https://bugs.launchpad.net/bugs/669360
Hello,
I have fixed bug of overlapping error of timesheet coming during installation.
https://bugs.launchpad.net/openobject-addons/+bug/669360
Thank you,
pso
--
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/39834
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/pso-dev-addons3.
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_demo.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_demo.xml 2010-10-20 13:29:48 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_demo.xml 2010-11-02 10:21:12 +0000
@@ -1,15 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data noupdate="1">
- <record id="sheet0" model="hr_timesheet_sheet.sheet">
- <field name="name">Sheet 0</field>
- <field name="user_id" ref="base.user_root"/>
- <field name="employee_id" ref="hr.employee1" />
- <field eval="time.strftime('%Y-%m-01', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_from"/>
- <field eval="time.strftime('%Y-%m-15', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_current"/>
- <field eval="time.strftime('%Y-%m-%d', time.localtime(time.mktime(time.localtime()[0:2] + (0,)*7)-1))" name="date_to"/>
- </record>
-
+
<record id="sheet1" model="hr_timesheet_sheet.sheet">
<field name="name">Sheet 1</field>
<field name="user_id" ref="base.user_root"/>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
