openerp-dev-web team mailing list archive

["Meera Trambadia \(OpenERP\)" <mtr@xxxxxxxxxxx>]

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

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #751411 in OpenERP Addons: "[PS] Irrelevant demo data for analytic entries"
  https://bugs.launchpad.net/openobject-addons/+bug/751411

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

->hr_timesheet,hr_attendance: corrected demo data for analytic entries --fixes lp:751411 
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-751411-mtr/+merge/61698
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-751411-mtr.

=== modified file 'hr_attendance/hr_attendance_demo.xml'
--- hr_attendance/hr_attendance_demo.xml	2011-01-14 00:11:01 +0000
+++ hr_attendance/hr_attendance_demo.xml	2011-05-20 05:52:28 +0000
@@ -121,6 +121,18 @@
             <field name="action">sign_out</field>
             <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>

=== modified file 'hr_timesheet/hr_timesheet_demo.xml'
--- hr_timesheet/hr_timesheet_demo.xml	2011-01-14 00:11:01 +0000
+++ hr_timesheet/hr_timesheet_demo.xml	2011-05-20 05:52:28 +0000
@@ -27,11 +27,11 @@
             <field name="name">Requirements analysis and specification</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="2.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-60.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -40,11 +40,11 @@
             <field name="name">Design and specification</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="1.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -53,11 +53,11 @@
             <field name="name">Coding and module testing</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="03.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-90.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -66,11 +66,11 @@
             <field name="name">Integration and system testing</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>
@@ -79,11 +79,11 @@
             <field name="name">Delivery and maintenance</field>
             <field name="user_id" ref="base.user_root"/>
             <field eval="time.strftime('%Y-%m-%d')" name="date"/>
-            <field eval="0.00" name="unit_amount"/>
+            <field eval="01.00" name="unit_amount"/>
             <field name="product_id" ref="product_consultant"/>
             <field name="product_uom_id" ref="product.uom_hour"/>
             <field name="account_id" model="account.analytic.account" search="[('code','=','1')]"></field>
-            <field eval="0.00" name="amount"/>
+            <field eval="-30.00" name="amount"/>
             <field name="general_account_id" model="account.account" ref="account.a_expense"/>
             <field name="journal_id" ref="analytic_journal"/>
         </record>