Odoo Addons (MOVED TO GITHUB)

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

  1. trunk-bug-1095586-hip
  2. Merge into trunk
Proposed by Hiral Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1095586-hip
Merge into: lp:openobject-addons
Diff against target: 37 lines (+8/-1)
2 files modified
account/project/analytic_account_demo.xml (+5/-0)
account_analytic_analysis/analytic_account_demo.xml (+3/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1095586-hip
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+142650@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hiral Patel (OpenERP) (hip-openerp) wrote :

Hello,

     Add the demo data for project template.

Thanks.

Reply

Unmerged revisions

8497. By Hiral Patel (OpenERP)

Remove space

8496. By Hiral Patel (OpenERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account/project/analytic_account_demo.xml'
2--- account/project/analytic_account_demo.xml 2012-12-21 16:48:08 +0000
3+++ account/project/analytic_account_demo.xml 2013-01-10 09:15:29 +0000
4@@ -80,6 +80,11 @@
5 <field name="type">contract</field>
6 <field name="parent_id" ref="analytic_our_super_product"/>
7 </record>
8+ <record id="analytic_template" model="account.analytic.account">
9+ <field name="name">Template</field>
10+ <field name="type">template</field>
11+ <field name="parent_id" ref="analytic_our_super_product"/>
12+ </record>
13 <record id="analytic_seagate_p1" model="account.analytic.account">
14 <field name="name">Seagate P1</field>
15 <field name="parent_id" ref="analytic_integration"/>
16
17=== modified file 'account_analytic_analysis/analytic_account_demo.xml'
18--- account_analytic_analysis/analytic_account_demo.xml 2012-11-26 12:25:50 +0000
19+++ account_analytic_analysis/analytic_account_demo.xml 2013-01-10 09:15:29 +0000
20@@ -6,6 +6,7 @@
21 <field name="invoice_on_timesheets">True</field>
22 <field name="hours_qtt_est">1200</field>
23 <field name="fix_price_invoices">True</field>
24+ <field name="template_id" ref="account.analytic_template"/>
25 <field name="to_invoice" ref="hr_timesheet_invoice.timesheet_invoice_factor1"/>
26 <field name="pricelist_id" ref="product.list0"/>
27 <field name="amount_max">100000</field>
28@@ -26,8 +27,9 @@
29 <field name="invoice_on_timesheets">True</field>
30 <field name="hours_qtt_est">500</field>
31 <field name="fix_price_invoices">True</field>
32+ <field name="template_id" ref="account.analytic_template"/>
33 <field name="pricelist_id" ref="product.list0"/>
34- <field name="amount_max">50000</field>
35+ <field name="amount_max">50000</field>
36 <field name="to_invoice" ref="hr_timesheet_invoice.timesheet_invoice_factor1"/>
37 </record>
38

Subscribers

People subscribed via source and target branches

to all changes: