odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] currency 

bzr revid: fp@tinyerp.com-20120907134010-rql25x6eoj6svoc8
This commit is contained in:
Fabien Pinckaers 2012-09-07 15:40:10 +02:00
parent 2698e6dd27 ecb67b4b81
commit a77988fcd7
9 changed files with 3608 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/__openerp__.py
View File

@ -35,6 +35,8 @@ The kernel of OpenERP, needed for all installation.
'depends': [],
'data': [
'base_data.xml',
'currency_data.xml',
'country_data.xml',
'security/base_security.xml',
'base_menu.xml',
'res/res_security.xml',

637
openerp/addons/base/base_data.xml
View File

@ -1110,644 +1110,9 @@
<field name="company_id" ref="main_company"/>
</record>
<!-- The Following currency rates are considered as on 1st Jan,2010 against EUR. -->
<!-- Currencies -->
<record id="EUR" model="res.currency">
<field name="company_id" ref="main_company"/>
</record>
<record id="USD" model="res.currency">
<field name="name">USD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateUSD" model="res.currency.rate">
<field name="rate">1.2834</field>
<field name="currency_id" ref="USD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<!-- VEF was previously VEB -->
<record id="VEF" model="res.currency">
<field name="name">VEF</field>
<field name="symbol">Bs.F</field>
<field name="rounding">0.0001</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateVEF" model="res.currency.rate">
<field name="rate">5.864</field>
<field name="currency_id" ref="VEF"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="CAD" model="res.currency">
<field name="name">CAD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCAD" model="res.currency.rate">
<field name="rate">1.3388</field>
<field name="currency_id" ref="CAD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="CHF" model="res.currency">
<field name="name">CHF</field>
<field name="symbol">CHF</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCHF" model="res.currency.rate">
<field name="rate">1.3086</field>
<field name="currency_id" ref="CHF"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="BRL" model="res.currency">
<field name="name">BRL</field>
<field name="symbol">R$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateBRL" model="res.currency.rate">
<field name="rate">2.2344</field>
<field name="currency_id" ref="BRL"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="CNY" model="res.currency">
<field name="name">CNY</field>
<field name="symbol">¥</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCNY" model="res.currency.rate">
<field name="rate">8.7556</field>
<field name="currency_id" ref="CNY"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="COP" model="res.currency">
<field name="name">COP</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCOP" model="res.currency.rate">
<field name="rate">2933.8378</field>
<field name="currency_id" ref="COP"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="CZK" model="res.currency">
<field name="name">CZK</field>
<field name="symbol">Kč</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCZK" model="res.currency.rate">
<field name="rate">26.5634</field>
<field name="currency_id" ref="CZK"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="DKK" model="res.currency">
<field name="name">DKK</field>
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateDKK" model="res.currency.rate">
<field name="rate">7.4445</field>
<field name="currency_id" ref="DKK"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="HUF" model="res.currency">
<field name="name">HUF</field>
<field name="symbol">Ft</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateHUF" model="res.currency.rate">
<field name="rate">271.5621</field>
<field name="currency_id" ref="HUF"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="IDR" model="res.currency">
<field name="name">IDR</field>
<field name="symbol">Rp</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateIDR1" model="res.currency.rate">
<field name="rate">14352.00</field>
<field name="currency_id" ref="IDR"/>
<field eval="time.strftime('2009-01-01')" name="name"/>
</record>
<record id="rateIDR" model="res.currency.rate">
<field name="rate">11796.39</field>
<field name="currency_id" ref="IDR"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="LVL" model="res.currency">
<field name="name">LVL</field>
<field name="symbol">Ls</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateLVL" model="res.currency.rate">
<field name="rate">0.7086</field>
<field name="currency_id" ref="LVL"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="NOK" model="res.currency">
<field name="name">NOK</field>
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateNOK" model="res.currency.rate">
<field name="rate">7.8668</field>
<field name="currency_id" ref="NOK"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="XPF" model="res.currency">
<field name="name">XPF</field>
<field name="symbol">XPF</field>
<field name="rounding">1.00</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateXPF" model="res.currency.rate">
<field name="rate">119.331742</field>
<field name="currency_id" ref="XPF"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="PAB" model="res.currency">
<field name="name">PAB</field>
<field name="symbol">B/.</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="ratePAB" model="res.currency.rate">
<field name="rate">1.2676</field>
<field name="currency_id" ref="PAB"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="PLN" model="res.currency">
<field name="name">PLN</field>
<field name="symbol">zł</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="ratePLN" model="res.currency.rate">
<field name="rate">4.1005</field>
<field name="currency_id" ref="PLN"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="SEK" model="res.currency">
<field name="name">SEK</field>
<field name="symbol">kr</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateSEK" model="res.currency.rate">
<field name="rate">10.3004</field>
<field name="currency_id" ref="SEK"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="GBP" model="res.currency">
<field name="name">GBP</field>
<field name="symbol">£</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateGBP" model="res.currency.rate">
<field name="rate">0.8333</field>
<field name="currency_id" ref="GBP"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="ARS" model="res.currency">
<field name="name">ARS</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateARS" model="res.currency.rate">
<field name="rate">5.0881</field>
<field name="currency_id" ref="ARS"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="INR" model="res.currency">
<field name="name">INR</field>
<field name="symbol">₹</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateINR" model="res.currency.rate">
<field name="rate">59.9739</field>
<field name="currency_id" ref="INR"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="AUD" model="res.currency">
<field name="name">AUD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateAUD" model="res.currency.rate">
<field name="rate">1.4070</field>
<field name="currency_id" ref="AUD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="UAH" model="res.currency">
<field name="name">UAH</field>
<field name="symbol">₴</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateUAH" model="res.currency.rate">
<field name="rate">10.1969</field>
<field name="currency_id" ref="UAH"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="VND" model="res.currency">
<field name="name">VND</field>
<field name="symbol">₫</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateVND" model="res.currency.rate">
<field name="rate">26330.01</field>
<field name="currency_id" ref="VND"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="HKD" model="res.currency">
<field name="name">HKD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateHKD" model="res.currency.rate">
<field name="rate">11.1608</field>
<field name="currency_id" ref="HKD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="JPY" model="res.currency">
<field name="name">JPY</field>
<field name="symbol">¥</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateJPY" model="res.currency.rate">
<field name="rate">133.62</field>
<field name="currency_id" ref="JPY"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="BGN" model="res.currency">
<field name="name">BGN</field>
<field name="symbol">лв</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateBGN" model="res.currency.rate">
<field name="rate">1.9558</field>
<field name="currency_id" ref="BGN"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="LTL" model="res.currency">
<field name="name">LTL</field>
<field name="symbol">Lt</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateLTL" model="res.currency.rate">
<field name="rate">3.4528</field>
<field name="currency_id" ref="LTL"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="RON" model="res.currency">
<field name="name">RON</field>
<field name="symbol">lei</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateRON" model="res.currency.rate">
<field name="rate">4.2253</field>
<field name="currency_id" ref="RON"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="HRK" model="res.currency">
<field name="name">HRK</field>
<field name="symbol">kn</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateHRK" model="res.currency.rate">
<field name="rate">7.2936</field>
<field name="currency_id" ref="HRK"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="RUB" model="res.currency">
<field name="name">RUB</field>
<field name="symbol">руб</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateRUB" model="res.currency.rate">
<field name="rate">43.16</field>
<field name="currency_id" ref="RUB"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="TRY" model="res.currency">
<field name="name">TRY</field>
<field name="symbol">TL</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateTRY" model="res.currency.rate">
<field name="rate">2.1411</field>
<field name="currency_id" ref="TRY"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="KRW" model="res.currency">
<field name="name">KRW</field>
<field name="symbol">₩</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateKRW" model="res.currency.rate">
<field name="rate">1662.37</field>
<field name="currency_id" ref="KRW"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="MXN" model="res.currency">
<field name="name">MXN</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateMXN" model="res.currency.rate">
<field name="rate">18.6664</field>
<field name="currency_id" ref="MXN"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="MYR" model="res.currency">
<field name="name">MYR</field>
<field name="symbol">RM</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateMYR" model="res.currency.rate">
<field name="rate">4.8887</field>
<field name="currency_id" ref="MYR"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="NZD" model="res.currency">
<field name="name">NZD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateNZD" model="res.currency.rate">
<field name="rate">1.9764</field>
<field name="currency_id" ref="NZD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="PHP" model="res.currency">
<field name="name">PHP</field>
<field name="symbol">Php</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="ratePHP" model="res.currency.rate">
<field name="rate">66.1</field>
<field name="currency_id" ref="PHP"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="SGD" model="res.currency">
<field name="name">SGD</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateSGD" model="res.currency.rate">
<field name="rate">2.0126</field>
<field name="currency_id" ref="SGD"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="THB" model="res.currency">
<field name="name">THB</field>
<field name="symbol">฿</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateTHB" model="res.currency.rate">
<field name="rate">47.779</field>
<field name="currency_id" ref="THB"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="ZAR" model="res.currency">
<field name="name">ZAR</field>
<field name="symbol">R</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateZAR" model="res.currency.rate">
<field name="rate">10.5618</field>
<field name="currency_id" ref="ZAR"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="res_bank_1" model="res.bank">
<field name="name">International Bank</field>
</record>
<record id="CRC" model="res.currency">
<field name="name">CRC</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="symbol">¢</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCRC" model="res.currency.rate">
<field name="rate">691.3153</field>
<field name="currency_id" ref="CRC"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="ir_mail_server_localhost0" model="ir.mail_server">
<field name="name">localhost</field>
<field name="smtp_host">localhost</field>
<field eval="25" name="smtp_port"/>
<field eval="10" name="sequence"/>
</record>
<record id="MUR" model="res.currency">
<field name="name">MUR</field>
<field name="symbol">Rs</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateMUR" model="res.currency.rate">
<field name="rate">40.28</field>
<field name="currency_id" ref="MUR"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="XOF" model="res.currency">
<field name="name">XOF</field>
<field name="symbol">CFA</field>
<field name="rounding">1</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateXOF" model="res.currency.rate">
<field name="rate">655.957</field>
<field name="currency_id" ref="XOF"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="XAF" model="res.currency">
<field name="name">XAF</field>
<field name="symbol">FCFA</field>
<field name="rounding">1</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateXAF" model="res.currency.rate">
<field name="rate">655.957</field>
<field name="currency_id" ref="XAF"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="UGX" model="res.currency">
<field name="name">UGX</field>
<field name="symbol">USh</field>
<field name="rounding">1</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateUGX" model="res.currency.rate">
<field name="rate">3401.91388</field>
<field name="currency_id" ref="UGX"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<record id="HNL" model="res.currency">
<field name="name">HNL</field>
<field name="symbol">L</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateHNL" model="res.currency.rate">
<field name="rate">25</field>
<field name="currency_id" ref="HNL"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<!-- Chilean peso -->
<record id="CLP" model="res.currency">
<field name="name">CLP</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateCLP" model="res.currency.rate">
<field name="rate">710</field>
<field name="currency_id" ref="CLP"/>
<field eval="time.strftime('%Y-01-01')" name="name"/>
</record>
<!-- Uruguayan peso -->
<record id="UYU" model="res.currency">
<field name="name">UYU</field>
<field name="symbol">$</field>
<field name="rounding">0.01</field>
<field name="accuracy">4</field>
<field name="company_id" ref="main_company"/>
</record>
<record id="rateUYU" model="res.currency.rate">
<field name="currency_id" ref="UYU" />
<field eval="time.strftime('%Y-01-01')" name="name"/>
<field name="rate">28.36</field>
</record>
</data>
</openerp>

1284
openerp/addons/base/country_data.xml Normal file
View File

File diff suppressed because it is too large Load Diff

2299
openerp/addons/base/currency_data.xml Normal file
View File

File diff suppressed because it is too large Load Diff

14
openerp/addons/base/res/res_company.py
View File

@ -146,7 +146,12 @@ class res_company(osv.osv):
if vat: val.append(_('TIN: ')+vat)
if reg: val.append(_('Reg: ')+reg)
return {'value': {'rml_footer1':' | '.join(val)}}
def on_change_country(self, cr, uid, ids, country_id, context=None):
currency_id = self._get_euro(cr, uid, context=context)
if country_id:
currency_id = self.pool.get('res.country').browse(cr, uid, country_id, context=context).currency_id.id
return {'value': {'currency_id': currency_id}}
def _search(self, cr, uid, args, offset=0, limit=None, order=None,
context=None, count=False, access_rights_uid=None):
@ -228,10 +233,9 @@ class res_company(osv.osv):
return super(res_company, self).write(cr, *args, **argv)
def _get_euro(self, cr, uid, context=None):
try:
return self.pool.get('res.currency').search(cr, uid, [])[0]
except:
return False
rate_obj = self.pool.get('res.currency.rate')
rate_id = rate_obj.search(cr, uid, [('rate', '=', 1)], context=context)
return rate_id and rate_obj.browse(cr, uid, rate_id[0], context=context).currency_id.id or False
def _get_logo(self, cr, uid, ids):
return open(os.path.join( tools.config['root_path'], 'addons', 'base', 'res', 'res_company_logo.png'), 'rb') .read().encode('base64')

2
openerp/addons/base/res/res_company_view.xml
View File

@ -53,7 +53,7 @@
<field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%" options='{"no_open": true}'/>
<field name="zip" placeholder="ZIP" style="width: 34%%"/>
</div>
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
<field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}' on_change="on_change_country(country_id)"/>
</div>
<field name="website" widget="url" placeholder="e.g. www.openerp.com"/>
</group>

1
openerp/addons/base/res/res_country.py
View File

@ -55,6 +55,7 @@ addresses belonging to this country.\n\nYou can use the python-style string pate
\n%(state_code)s: the code of the state
\n%(country_name)s: the name of the country
\n%(country_code)s: the code of the country"""),
'currency_id': fields.many2one('res.currency', 'Currency'),
}
_sql_constraints = [
('name_uniq', 'unique (name)',

14
openerp/addons/base/res/res_country_view.xml
View File

@ -22,11 +22,17 @@
<field name="model">res.country</field>
<field name="arch" type="xml">
<form string="Country" version="7.0">
<group col="4">
<field name="name"/>
<field name="code"/>
<field name="address_format" colspan="4" groups="base.group_no_one"/>
<group>
<group>
<field name="name"/>
<field name="currency_id"/>
</group>
<group>
<field name="code"/>
</group>
</group>
<label for="address_format" string="Address Format"/>
<field name="address_format" colspan="4" groups="base.group_no_one"/>
</form>
</field>
</record>

2
openerp/addons/base/res/res_currency.py
View File

@ -56,7 +56,7 @@ class res_currency(osv.osv):
_columns = {
# Note: 'code' column was removed as of v6.0, the 'name' should now hold the ISO code.
'name': fields.char('Currency', size=32, required=True, help="Currency Code (ISO 4217)"),
'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts."),
'symbol': fields.char('Symbol', size=4, help="Currency sign, to be used when printing amounts."),
'rate': fields.function(_current_rate, string='Current Rate', digits=(12,6),
help='The rate of the currency to the currency of rate 1.'),
'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'),