Merge lp:~openerp-dev/openobject-server/6.0-case-4492-jma into lp:openobject-server/6.0

Proposed by JMA(Open ERP)
Status: Merged
Merged at revision: 3368
Proposed branch: lp:~openerp-dev/openobject-server/6.0-case-4492-jma
Merge into: lp:openobject-server/6.0
Diff against target: 21 lines (+12/-0)
1 file modified
bin/addons/base/base_data.xml (+12/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/6.0-case-4492-jma
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Review via email: mp+53621@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bin/addons/base/base_data.xml'
--- bin/addons/base/base_data.xml 2011-02-21 10:15:49 +0000
+++ bin/addons/base/base_data.xml 2011-03-16 12:47:47 +0000
@@ -1605,5 +1605,17 @@
1605 <field eval="time.strftime('%Y-01-01')" name="name"/>1605 <field eval="time.strftime('%Y-01-01')" name="name"/>
1606 </record>1606 </record>
16071607
1608 <record id="MUR" model="res.currency">
1609 <field name="name">MUR</field>
1610 <field name="symbol">Rs</field>
1611 <field name="rounding">0.01</field>
1612 <field name="accuracy">4</field>
1613 <field name="company_id" ref="main_company"/>
1614 </record>
1615 <record id="rateMUR" model="res.currency.rate">
1616 <field name="rate">40.28</field>
1617 <field name="currency_id" ref="MUR"/>
1618 <field eval="time.strftime('%Y-01-01')" name="name"/>
1619 </record>
1608 </data>1620 </data>
1609</openerp>1621</openerp>