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

Proposed by Matthieu Dietrich @ camptocamp
Status: Merged
Merged at revision: 4473
Proposed branch: lp:~unifield-team/unifield-addons/unifield-addons-uf287
Merge into: lp:unifield-addons
Diff against target: 30 lines (+3/-3)
1 file modified
account/project/analytic_account_demo.xml (+3/-3)
To merge this branch: bzr merge lp:~unifield-team/unifield-addons/unifield-addons-uf287
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+62290@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-01-14 00:11:01 +0000
3+++ account/project/analytic_account_demo.xml 2011-05-25 12:24:39 +0000
4@@ -132,7 +132,7 @@
5 <field name="name">Sednacom</field>
6 <field name="code">2</field>
7 <field eval="str(time.localtime()[0] - 1) + '-05-09'" name="date_start"/>
8- <field eval="time.strftime('%Y-05-08')" name="date"/>
9+ <field eval="time.strftime('%Y-12-31')" name="date"/>
10 <field name="parent_id" ref="analytic_partners"/>
11 <field name="partner_id" ref="base.res_partner_sednacom"/>
12 <field name="state">open</field>
13@@ -141,7 +141,7 @@
14 <field name="name">Thymbra</field>
15 <field name="code">3</field>
16 <field eval="time.strftime('%Y-02-01')" name="date_start"/>
17- <field eval="time.strftime('%Y-07-01')" name="date"/>
18+ <field eval="time.strftime('%Y-12-31')" name="date"/>
19 <field name="parent_id" ref="analytic_partners"/>
20 <field name="partner_id" ref="base.res_partner_thymbra"/>
21 <field name="state">open</field>
22@@ -172,7 +172,7 @@
23 <field name="name">Camp to Camp</field>
24 <field name="code">21</field>
25 <field eval="time.strftime('%Y-%m-%d', time.localtime(time.time() - 365 * 86400))" name="date_start"/>
26- <field eval="time.strftime('%Y-%m-%d')" name="date"/>
27+ <field eval="time.strftime('%Y-12-31')" name="date"/>
28 <field name="parent_id" ref="analytic_partners"/>
29 <field name="partner_id" ref="base.res_partner_c2c"/>
30 <field name="state">open</field>

Subscribers

People subscribed via source and target branches

to all changes: