Merge lp:~openerp-dev/openobject-addons/trunk-bug-1095586-hip into lp:openobject-addons

[Hiral Patel (OpenERP)]

[Hiral Patel (OpenERP) (hip-openerp)]

Hello,

     Add the demo data for project template.

Thanks.

Unmerged revisions

8497. By Hiral Patel (OpenERP) on 2013-01-09

Remove space

8496. By Hiral Patel (OpenERP) on 2013-01-09

[FIX][Sales] Demo data problems in Sales > Contracts

=== modified file 'account/project/analytic_account_demo.xml'
--- account/project/analytic_account_demo.xml	2012-12-21 16:48:08 +0000
+++ account/project/analytic_account_demo.xml	2013-01-10 09:15:29 +0000
@@ -80,6 +80,11 @@
             <field name="type">contract</field>
             <field name="parent_id" ref="analytic_our_super_product"/>
         </record>
+        <record id="analytic_template" model="account.analytic.account">
+            <field name="name">Template</field>
+            <field name="type">template</field>
+            <field name="parent_id" ref="analytic_our_super_product"/>
+        </record>
         <record id="analytic_seagate_p1" model="account.analytic.account">
             <field name="name">Seagate P1</field>
             <field name="parent_id" ref="analytic_integration"/>
 
=== modified file 'account_analytic_analysis/analytic_account_demo.xml'
--- account_analytic_analysis/analytic_account_demo.xml	2012-11-26 12:25:50 +0000
+++ account_analytic_analysis/analytic_account_demo.xml	2013-01-10 09:15:29 +0000
@@ -6,6 +6,7 @@
             <field name="invoice_on_timesheets">True</field>
             <field name="hours_qtt_est">1200</field>
             <field name="fix_price_invoices">True</field>
+            <field name="template_id" ref="account.analytic_template"/>
             <field name="to_invoice" ref="hr_timesheet_invoice.timesheet_invoice_factor1"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="amount_max">100000</field>
@@ -26,8 +27,9 @@
             <field name="invoice_on_timesheets">True</field>
             <field name="hours_qtt_est">500</field>
             <field name="fix_price_invoices">True</field>
+            <field name="template_id" ref="account.analytic_template"/>
             <field name="pricelist_id" ref="product.list0"/>
-            <field name="amount_max">50000</field>
+            <field name="amount_max">50000</field>            
             <field name="to_invoice" ref="hr_timesheet_invoice.timesheet_invoice_factor1"/>
         </record>