Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/trunk-bug-1085775-hip into lp:openobject-server

  1. trunk-bug-1085775-hip
  2. Merge into trunk
Proposed by Hiral Patel (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/trunk-bug-1085775-hip
Merge into: lp:openobject-server
Diff against target: 36 lines (+5/-5)
2 files modified
openerp/addons/base/currency_data.xml (+4/-4)
openerp/addons/base/res/res_country_data.xml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/trunk-bug-1085775-hip
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+144891@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

4770. By Hiral Patel (OpenERP)

[trunk] Change the string from VUB to VB

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/currency_data.xml'
2--- openerp/addons/base/currency_data.xml 2013-01-11 11:40:12 +0000
3+++ openerp/addons/base/currency_data.xml 2013-01-25 10:52:22 +0000
4@@ -1679,15 +1679,15 @@
5 <field name="rate">264.784483</field>
6 </record>
7
8- <record id="VUB" model="res.currency">
9- <field name="name">VUB</field>
10+ <record id="VEB" model="res.currency">
11+ <field name="name">VEB</field>
12 <field name="symbol">Bs</field>
13 <field name="rounding">0.01</field>
14 <field name="accuracy">4</field>
15 <field name="company_id" ref="main_company"/>
16 </record>
17- <record id="rateVUB" model="res.currency.rate">
18- <field name="currency_id" ref="VUB" />
19+ <record id="rateVEB" model="res.currency.rate">
20+ <field name="currency_id" ref="VEB" />
21 <field eval="time.strftime('%Y-01-01')" name="name"/>
22 <field name="rate">5.3821</field>
23 </record>
24
25=== modified file 'openerp/addons/base/res/res_country_data.xml'
26--- openerp/addons/base/res/res_country_data.xml 2012-12-17 13:02:49 +0000
27+++ openerp/addons/base/res/res_country_data.xml 2013-01-25 10:52:22 +0000
28@@ -1212,7 +1212,7 @@
29 <record id="ve" model="res.country">
30 <field name="name">Venezuela</field>
31 <field name="code">ve</field>
32- <field name="currency_id" ref="VUB"/>
33+ <field name="currency_id" ref="VEB"/>
34 </record>
35 <record id="vg" model="res.country">
36 <field name="name">Virgin Islands (British)</field>