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
=== modified file 'account/project/analytic_account_demo.xml'
--- account/project/analytic_account_demo.xml 2011-01-14 00:11:01 +0000
+++ account/project/analytic_account_demo.xml 2011-05-25 12:24:39 +0000
@@ -132,7 +132,7 @@
132 <field name="name">Sednacom</field>132 <field name="name">Sednacom</field>
133 <field name="code">2</field>133 <field name="code">2</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-05-08')" 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"/>
137 <field name="partner_id" ref="base.res_partner_sednacom"/>137 <field name="partner_id" ref="base.res_partner_sednacom"/>
138 <field name="state">open</field>138 <field name="state">open</field>
@@ -141,7 +141,7 @@
141 <field name="name">Thymbra</field>141 <field name="name">Thymbra</field>
142 <field name="code">3</field>142 <field name="code">3</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-07-01')" 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"/>
146 <field name="partner_id" ref="base.res_partner_thymbra"/>146 <field name="partner_id" ref="base.res_partner_thymbra"/>
147 <field name="state">open</field>147 <field name="state">open</field>
@@ -172,7 +172,7 @@
172 <field name="name">Camp to Camp</field>172 <field name="name">Camp to Camp</field>
173 <field name="code">21</field>173 <field name="code">21</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-%m-%d')" 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"/>
177 <field name="partner_id" ref="base.res_partner_c2c"/>177 <field name="partner_id" ref="base.res_partner_c2c"/>
178 <field name="state">open</field>178 <field name="state">open</field>

Subscribers

People subscribed via source and target branches

to all changes: