Unifield Addons

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

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

Subscribers

People subscribed via source and target branches

to all changes: