Meera Trambadia (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr into 
lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #791087 in OpenERP Addons: "[Trunk] hr_attendance can not install"
  https://bugs.launchpad.net/openobject-addons/+bug/791087

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-791087-mtr/+merge/63661

hr_attendance:removed conflicting demo data" --fixes lp:791087
Note:-The demo data which has been removed was added for the bug-751411, but 
its removal doesn't affect the fixes of bug-751411
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-791087-mtr/+merge/63661
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr.
=== modified file 'hr_attendance/hr_attendance_demo.xml'
--- hr_attendance/hr_attendance_demo.xml	2011-05-20 05:37:30 +0000
+++ hr_attendance/hr_attendance_demo.xml	2011-06-07 08:46:35 +0000
@@ -122,17 +122,5 @@
             <field name="employee_id" ref="hr.employee1"/>
         </record>
         
-        <record id="attendance21" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-%d 10:00')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-        
-        <record id="attendance22" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-%d 18:00')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
     </data>
 </openerp>

_______________________________________________
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

Reply via email to