Merge lp:~unifield-team/unifield-addons/UF_533 into lp:unifield-addons

Proposed by jftempo
Status: Merged
Merged at revision: 4517
Proposed branch: lp:~unifield-team/unifield-addons/UF_533
Merge into: lp:unifield-addons
Diff against target: 277 lines (+47/-47)
1 file modified
account/project/analytic_account_demo.xml (+47/-47)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/UF_533
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+88180@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'account/project/analytic_account_demo.xml'
--- account/project/analytic_account_demo.xml 2011-05-25 11:30:55 +0000
+++ account/project/analytic_account_demo.xml 2012-01-11 11:12:35 +0000
@@ -7,103 +7,103 @@
7 </record>7 </record>
8 <record id="analytic_absences" model="account.analytic.account">8 <record id="analytic_absences" model="account.analytic.account">
9 <field name="name">Leaves</field>9 <field name="name">Leaves</field>
10 <field name="code">1</field>10 <field name="code">LEAVES</field>
11 <field name="parent_id" ref="analytic_root"/>11 <field name="parent_id" ref="analytic_root"/>
12 </record>12 </record>
13 <record id="analytic_internal" model="account.analytic.account">13 <record id="analytic_internal" model="account.analytic.account">
14 <field name="name">Internal</field>14 <field name="name">Internal</field>
15 <field name="code">2</field>15 <field name="code">INTERNAL</field>
16 <field name="parent_id" ref="analytic_root"/>16 <field name="parent_id" ref="analytic_root"/>
17 </record>17 </record>
18 <record id="analytic_our_super_product" model="account.analytic.account">18 <record id="analytic_our_super_product" model="account.analytic.account">
19 <field name="name">Our Super Product</field>19 <field name="name">Our Super Product</field>
20 <field name="code">100</field>20 <field name="code">SUPERPRODUCT</field>
21 <field name="state">open</field>21 <field name="state">open</field>
22 <field name="parent_id" ref="analytic_root"/>22 <field name="parent_id" ref="analytic_root"/>
23 </record>23 </record>
24 <record id="analytic_project_1" model="account.analytic.account">24 <record id="analytic_project_1" model="account.analytic.account">
25 <field name="name">Project 1</field>25 <field name="name">Project 1</field>
26 <field name="code">101</field>26 <field name="code">PROJ1</field>
27 <field name="parent_id" ref="analytic_root"/>27 <field name="parent_id" ref="analytic_root"/>
28 </record>28 </record>
29 <record id="analytic_project_2" model="account.analytic.account">29 <record id="analytic_project_2" model="account.analytic.account">
30 <field name="name">Project 2</field>30 <field name="name">Project 2</field>
31 <field name="code">102</field>31 <field name="code">PROJ2</field>
32 <field name="parent_id" ref="analytic_root"/>32 <field name="parent_id" ref="analytic_root"/>
33 </record>33 </record>
34 <record id="analytic_journal_trainings" model="account.analytic.account">34 <record id="analytic_journal_trainings" model="account.analytic.account">
35 <field name="name">Training</field>35 <field name="name">Int. Training</field>
36 <field name="code">4</field>36 <field name="code">INT_TRAINING</field>
37 <field name="parent_id" ref="analytic_internal"/>37 <field name="parent_id" ref="analytic_internal"/>
38 </record>38 </record>
39 <record id="analytic_in_house" model="account.analytic.account">39 <record id="analytic_in_house" model="account.analytic.account">
40 <field name="name">In House</field>40 <field name="name">In House</field>
41 <field name="code">1</field>41 <field name="code">INHOUSE</field>
42 <field name="parent_id" ref="analytic_journal_trainings"/>42 <field name="parent_id" ref="analytic_journal_trainings"/>
43 </record>43 </record>
44 <record id="analytic_online" model="account.analytic.account">44 <record id="analytic_online" model="account.analytic.account">
45 <field name="name">Online</field>45 <field name="name">Online</field>
46 <field name="code">2</field>46 <field name="code">ONLINE</field>
47 <field name="parent_id" ref="analytic_journal_trainings"/>47 <field name="parent_id" ref="analytic_journal_trainings"/>
48 </record>48 </record>
49 <record id="analytic_support" model="account.analytic.account">49 <record id="analytic_support" model="account.analytic.account">
50 <field name="name">Support</field>50 <field name="name">Super Product Support</field>
51 <field name="code">support</field>51 <field name="code">SUPERPROD_SUPPORT</field>
52 <field name="parent_id" ref="analytic_our_super_product"/>52 <field name="parent_id" ref="analytic_our_super_product"/>
53 </record>53 </record>
54 <record id="analytic_partners" model="account.analytic.account">54 <record id="analytic_partners" model="account.analytic.account">
55 <field name="name">Partners</field>55 <field name="name">Partners</field>
56 <field name="code">partners</field>56 <field name="code">PARTNERS</field>
57 <field name="parent_id" ref="analytic_support"/>57 <field name="parent_id" ref="analytic_support"/>
58 </record>58 </record>
59 <record id="analytic_customers" model="account.analytic.account">59 <record id="analytic_customers" model="account.analytic.account">
60 <field name="name">Customers</field>60 <field name="name">Customers</field>
61 <field name="code">customers</field>61 <field name="code">CUSTOMERS</field>
62 <field name="parent_id" ref="analytic_support"/>62 <field name="parent_id" ref="analytic_support"/>
63 </record>63 </record>
64 <record id="analytic_support_internal" model="account.analytic.account">64 <record id="analytic_support_internal" model="account.analytic.account">
65 <field name="name">Internal</field>65 <field name="name">Internal Support</field>
66 <field name="code">3</field>66 <field name="code">INT_SUPPORT</field>
67 <field name="parent_id" ref="analytic_support"/>67 <field name="parent_id" ref="analytic_support"/>
68 </record>68 </record>
69 <record id="analytic_integration" model="account.analytic.account">69 <record id="analytic_integration" model="account.analytic.account">
70 <field name="name">Integration</field>70 <field name="name">Integration</field>
71 <field name="code">integration</field>71 <field name="code">INTEGRATION</field>
72 <field name="parent_id" ref="analytic_our_super_product"/>72 <field name="parent_id" ref="analytic_our_super_product"/>
73 </record>73 </record>
74 <record id="analytic_consultancy" model="account.analytic.account">74 <record id="analytic_consultancy" model="account.analytic.account">
75 <field name="name">Consultancy</field>75 <field name="name">Consultancy</field>
76 <field name="code">4</field>76 <field name="code">CONSULTANCY</field>
77 <field name="parent_id" ref="analytic_our_super_product"/>77 <field name="parent_id" ref="analytic_our_super_product"/>
78 </record>78 </record>
79 <record id="analytic_super_product_trainings" model="account.analytic.account">79 <record id="analytic_super_product_trainings" model="account.analytic.account">
80 <field name="name">Training</field>80 <field name="name">Training</field>
81 <field name="code">5</field>81 <field name="code">TRAINING</field>
82 <field name="parent_id" ref="analytic_our_super_product"/>82 <field name="parent_id" ref="analytic_our_super_product"/>
83 </record>83 </record>
84 <record id="analytic_seagate_p1" model="account.analytic.account">84 <record id="analytic_seagate_p1" model="account.analytic.account">
85 <field name="name">Seagate P1</field>85 <field name="name">Seagate P1</field>
86 <field name="code">1</field>86 <field name="code">SEAGATE_P1</field>
87 <field name="parent_id" ref="analytic_integration"/>87 <field name="parent_id" ref="analytic_integration"/>
88 <field name="state">open</field>88 <field name="state">open</field>
89 <field name="partner_id" ref="base.res_partner_seagate"/>89 <field name="partner_id" ref="base.res_partner_seagate"/>
90 </record>90 </record>
91 <record id="analytic_seagate_p2" model="account.analytic.account">91 <record id="analytic_seagate_p2" model="account.analytic.account">
92 <field name="name">Seagate P2</field>92 <field name="name">Seagate P2</field>
93 <field name="code">2</field>93 <field name="code">SEAGATE_P2</field>
94 <field name="parent_id" ref="analytic_integration"/>94 <field name="parent_id" ref="analytic_integration"/>
95 <field name="state">open</field>95 <field name="state">open</field>
96 <field name="partner_id" ref="base.res_partner_seagate"/>96 <field name="partner_id" ref="base.res_partner_seagate"/>
97 </record>97 </record>
98 <record id="analytic_magasin_bml_1" model="account.analytic.account">98 <record id="analytic_magasin_bml_1" model="account.analytic.account">
99 <field name="name">Magasin BML 1</field>99 <field name="name">Magasin BML 1</field>
100 <field name="code">3</field>100 <field name="code">BML_1</field>
101 <field name="parent_id" ref="analytic_integration"/>101 <field name="parent_id" ref="analytic_integration"/>
102 <field name="partner_id" ref="base.res_partner_15"/>102 <field name="partner_id" ref="base.res_partner_15"/>
103 </record>103 </record>
104 <record id="analytic_integration_c2c" model="account.analytic.account">104 <record id="analytic_integration_c2c" model="account.analytic.account">
105 <field name="name">CampToCamp</field>105 <field name="name">CampToCamp</field>
106 <field name="code">7</field>106 <field name="code">CAMP</field>
107 <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>107 <field eval="str(time.localtime()[0] - 1) + '-08-07'" name="date_start"/>
108 <field eval="time.strftime('%Y-12-31')" name="date"/>108 <field eval="time.strftime('%Y-12-31')" name="date"/>
109 <field name="parent_id" ref="analytic_integration"/>109 <field name="parent_id" ref="analytic_integration"/>
@@ -112,25 +112,25 @@
112 </record>112 </record>
113 <record id="analytic_agrolait" model="account.analytic.account">113 <record id="analytic_agrolait" model="account.analytic.account">
114 <field name="name">Agrolait</field>114 <field name="name">Agrolait</field>
115 <field name="code">3</field>115 <field name="code">AGRO</field>
116 <field name="parent_id" ref="analytic_customers"/>116 <field name="parent_id" ref="analytic_customers"/>
117 <field name="partner_id" ref="base.res_partner_agrolait"/>117 <field name="partner_id" ref="base.res_partner_agrolait"/>
118 </record>118 </record>
119 <record id="analytic_asustek" model="account.analytic.account">119 <record id="analytic_asustek" model="account.analytic.account">
120 <field name="name">Asustek</field>120 <field name="name">Asustek</field>
121 <field name="code">4</field>121 <field name="code">ASUS</field>
122 <field name="parent_id" ref="analytic_customers"/>122 <field name="parent_id" ref="analytic_customers"/>
123 <field name="partner_id" ref="base.res_partner_asus"/>123 <field name="partner_id" ref="base.res_partner_asus"/>
124 </record>124 </record>
125 <record id="analytic_distripc" model="account.analytic.account">125 <record id="analytic_distripc" model="account.analytic.account">
126 <field name="name">DistriPC</field>126 <field name="name">DistriPC</field>
127 <field name="code">7</field>127 <field name="code">DISTRIPC</field>
128 <field name="parent_id" ref="analytic_customers"/>128 <field name="parent_id" ref="analytic_customers"/>
129 <field name="partner_id" ref="base.res_partner_4"/>129 <field name="partner_id" ref="base.res_partner_4"/>
130 </record>130 </record>
131 <record id="analytic_sednacom" model="account.analytic.account">131 <record id="analytic_sednacom" model="account.analytic.account">
132 <field name="name">Sednacom</field>132 <field name="name">Sednacom</field>
133 <field name="code">2</field>133 <field name="code">SEDNA</field>
134 <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>134 <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
135 <field eval="time.strftime('%Y-12-31')" name="date"/>135 <field eval="time.strftime('%Y-12-31')" name="date"/>
136 <field name="parent_id" ref="analytic_partners"/>136 <field name="parent_id" ref="analytic_partners"/>
@@ -139,7 +139,7 @@
139 </record>139 </record>
140 <record id="analytic_thymbra" model="account.analytic.account">140 <record id="analytic_thymbra" model="account.analytic.account">
141 <field name="name">Thymbra</field>141 <field name="name">Thymbra</field>
142 <field name="code">3</field>142 <field name="code">THYM</field>
143 <field eval="time.strftime('%Y-02-01')" name="date_start"/>143 <field eval="time.strftime('%Y-02-01')" name="date_start"/>
144 <field eval="time.strftime('%Y-12-31')" name="date"/>144 <field eval="time.strftime('%Y-12-31')" name="date"/>
145 <field name="parent_id" ref="analytic_partners"/>145 <field name="parent_id" ref="analytic_partners"/>
@@ -148,7 +148,7 @@
148 </record>148 </record>
149 <record id="analytic_leclerc" model="account.analytic.account">149 <record id="analytic_leclerc" model="account.analytic.account">
150 <field name="name">Leclerc</field>150 <field name="name">Leclerc</field>
151 <field name="code">10</field>151 <field name="code">LECL</field>
152 <field eval="time.strftime('%Y-04-24')" name="date_start"/>152 <field eval="time.strftime('%Y-04-24')" name="date_start"/>
153 <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>153 <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
154 <field name="parent_id" ref="analytic_partners"/>154 <field name="parent_id" ref="analytic_partners"/>
@@ -156,7 +156,7 @@
156 </record>156 </record>
157 <record id="analytic_desertic_hispafuentes" model="account.analytic.account">157 <record id="analytic_desertic_hispafuentes" model="account.analytic.account">
158 <field name="name">Desertic - Hispafuentes</field>158 <field name="name">Desertic - Hispafuentes</field>
159 <field name="code">12</field>159 <field name="code">DESERT</field>
160 <field eval="time.strftime('%Y-02-01')" name="date_start"/>160 <field eval="time.strftime('%Y-02-01')" name="date_start"/>
161 <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>161 <field eval="str(time.localtime()[0] + 1) + '-02-01'" name="date"/>
162 <field name="parent_id" ref="analytic_partners"/>162 <field name="parent_id" ref="analytic_partners"/>
@@ -164,13 +164,13 @@
164 </record>164 </record>
165 <record id="analytic_tiny_at_work" model="account.analytic.account">165 <record id="analytic_tiny_at_work" model="account.analytic.account">
166 <field name="name">OpenERP SA AT Work</field>166 <field name="name">OpenERP SA AT Work</field>
167 <field name="code">15</field>167 <field name="code">OPENERP</field>
168 <field name="parent_id" ref="analytic_partners"/>168 <field name="parent_id" ref="analytic_partners"/>
169 <field name="partner_id" ref="base.res_partner_tinyatwork"/>169 <field name="partner_id" ref="base.res_partner_tinyatwork"/>
170 </record>170 </record>
171 <record id="analytic_partners_camp_to_camp" model="account.analytic.account">171 <record id="analytic_partners_camp_to_camp" model="account.analytic.account">
172 <field name="name">Camp to Camp</field>172 <field name="name">Camp to Camp Partner</field>
173 <field name="code">21</field>173 <field name="code">CAMP_PARTNER</field>
174 <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>174 <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
175 <field eval="time.strftime('%Y-12-31')" name="date"/>175 <field eval="time.strftime('%Y-12-31')" name="date"/>
176 <field name="parent_id" ref="analytic_partners"/>176 <field name="parent_id" ref="analytic_partners"/>
@@ -178,58 +178,58 @@
178 <field name="state">open</field>178 <field name="state">open</field>
179 </record>179 </record>
180 <record id="analytic_project_2_support" model="account.analytic.account">180 <record id="analytic_project_2_support" model="account.analytic.account">
181 <field name="name">Support</field>181 <field name="name">Project 2 Support</field>
182 <field name="code">1</field>182 <field name="code">PROJ2_SUPPORT</field>
183 <field name="parent_id" ref="analytic_project_2"/>183 <field name="parent_id" ref="analytic_project_2"/>
184 </record>184 </record>
185 <record id="analytic_project_2_development" model="account.analytic.account">185 <record id="analytic_project_2_development" model="account.analytic.account">
186 <field name="name">Development</field>186 <field name="name">Project 2 Development</field>
187 <field name="code">2</field>187 <field name="code">PROJ2_DEV</field>
188 <field name="parent_id" ref="analytic_project_2"/>188 <field name="parent_id" ref="analytic_project_2"/>
189 </record>189 </record>
190 <record id="analytic_project_1_trainings" model="account.analytic.account">190 <record id="analytic_project_1_trainings" model="account.analytic.account">
191 <field name="name">Training</field>191 <field name="name">Project 2 Training</field>
192 <field name="code">1</field>192 <field name="code">PROJ1_TRAINING</field>
193 <field name="parent_id" ref="analytic_project_1"/>193 <field name="parent_id" ref="analytic_project_1"/>
194 </record>194 </record>
195 <record id="analytic_project_1_development" model="account.analytic.account">195 <record id="analytic_project_1_development" model="account.analytic.account">
196 <field name="name">Development</field>196 <field name="name">Project 1 Development</field>
197 <field name="code">2</field>197 <field name="code">PROJ1_DEV</field>
198 <field name="parent_id" ref="analytic_project_1"/>198 <field name="parent_id" ref="analytic_project_1"/>
199 </record>199 </record>
200 <record id="analytic_administratif" model="account.analytic.account">200 <record id="analytic_administratif" model="account.analytic.account">
201 <field name="name">Administrative</field>201 <field name="name">Administrative</field>
202 <field name="code">1</field>202 <field name="code">ADMIN</field>
203 <field name="parent_id" ref="analytic_internal"/>203 <field name="parent_id" ref="analytic_internal"/>
204 </record>204 </record>
205 <record id="analytic_commercial_marketing" model="account.analytic.account">205 <record id="analytic_commercial_marketing" model="account.analytic.account">
206 <field name="name">Commercial &amp; Marketing</field>206 <field name="name">Commercial &amp; Marketing</field>
207 <field name="code">2</field>207 <field name="code">MKT</field>
208 <field name="parent_id" ref="analytic_internal"/>208 <field name="parent_id" ref="analytic_internal"/>
209 </record>209 </record>
210 <record id="analytic_our_super_product_development" model="account.analytic.account">210 <record id="analytic_our_super_product_development" model="account.analytic.account">
211 <field name="name">Our Super Product Development</field>211 <field name="name">Our Super Product Development</field>
212 <field name="code">3</field>212 <field name="code">SUPERPROD_DEV</field>
213 <field name="parent_id" ref="analytic_internal"/>213 <field name="parent_id" ref="analytic_internal"/>
214 </record>214 </record>
215 <record id="analytic_stable" model="account.analytic.account">215 <record id="analytic_stable" model="account.analytic.account">
216 <field name="name">Stable</field>216 <field name="name">Stable</field>
217 <field name="code">1</field>217 <field name="code">STABLE</field>
218 <field name="parent_id" ref="analytic_our_super_product_development"/>218 <field name="parent_id" ref="analytic_our_super_product_development"/>
219 </record>219 </record>
220 <record id="analytic_trunk" model="account.analytic.account">220 <record id="analytic_trunk" model="account.analytic.account">
221 <field name="name">Trunk</field>221 <field name="name">Trunk</field>
222 <field name="code">2</field>222 <field name="code">TRUNK</field>
223 <field name="parent_id" ref="analytic_our_super_product_development"/>223 <field name="parent_id" ref="analytic_our_super_product_development"/>
224 </record>224 </record>
225 <record id="analytic_paid" model="account.analytic.account">225 <record id="analytic_paid" model="account.analytic.account">
226 <field name="name">Paid</field>226 <field name="name">Paid</field>
227 <field name="code">1</field>227 <field name="code">PAID</field>
228 <field name="parent_id" ref="analytic_absences"/>228 <field name="parent_id" ref="analytic_absences"/>
229 </record>229 </record>
230 <record id="analytic_unpaid" model="account.analytic.account">230 <record id="analytic_unpaid" model="account.analytic.account">
231 <field name="name">Unpaid</field>231 <field name="name">Unpaid</field>
232 <field name="code">2</field>232 <field name="code">UNPAID</field>
233 <field name="parent_id" ref="analytic_absences"/>233 <field name="parent_id" ref="analytic_absences"/>
234 </record>234 </record>
235 </data>235 </data>

Subscribers

People subscribed via source and target branches

to all changes: