[MERGE] : Merged from lp:~openerp-report/openobject-server/report-server-rch
bzr revid: jni@tinyerp.com-20101122131518-siwjrzmlk21yermz
This commit is contained in:
Jni (Open ERP)
@@ -1044,7 +1044,7 @@
|
||||
</record>
|
||||
|
||||
<assert id="main_company" model="res.company">
|
||||
<test expr="currency_id.code == 'eur'.upper()"/>
|
||||
<test expr="currency_id.name == 'eur'.upper()"/>
|
||||
<test expr="name">OpenERP S.A.</test>
|
||||
</assert>
|
||||
|
||||
@@ -1170,7 +1170,7 @@
|
||||
<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">Kč</field>
|
||||
<field name="code">CZK</field>
|
||||
@@ -1213,7 +1213,7 @@
|
||||
<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">Rs</field>
|
||||
<field name="code">IDR</field>
|
||||
@@ -1290,7 +1290,7 @@
|
||||
<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">kr</field>
|
||||
<field name="code">SEK</field>
|
||||
@@ -1304,7 +1304,7 @@
|
||||
<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="code">GBP</field>
|
||||
@@ -1326,7 +1326,7 @@
|
||||
<field name="rounding">0.01</field>
|
||||
<field name="accuracy">4</field>
|
||||
<field name="company_id" ref="main_company"/>
|
||||
</record>
|
||||
</record>
|
||||
<record id="rateARS" model="res.currency.rate">
|
||||
<field name="rate">5.0881</field>
|
||||
<field name="currency_id" ref="ARS"/>
|
||||
|
||||
@@ -8,13 +8,13 @@ msgstr ""
|
||||
"Project-Id-Version: openobject-server\n"
|
||||
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"POT-Creation-Date: 2010-11-18 16:11+0000\n"
|
||||
"PO-Revision-Date: 2010-11-20 23:09+0000\n"
|
||||
"PO-Revision-Date: 2010-11-21 07:32+0000\n"
|
||||
"Last-Translator: Jacobus Erasmus <jacobus@kewlconcepts.co.za>\n"
|
||||
"Language-Team: Afrikaans <af@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-11-21 04:48+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-11-22 04:49+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base
|
||||
|
||||
@@ -7,13 +7,13 @@ msgstr ""
|
||||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2010-11-18 16:11+0000\n"
|
||||
"PO-Revision-Date: 2010-11-20 19:53+0000\n"
|
||||
"Last-Translator: Grzegorz Grzelak (Cirrus.pl) <Unknown>\n"
|
||||
"PO-Revision-Date: 2010-11-21 07:28+0000\n"
|
||||
"Last-Translator: OpenERP Administrators <Unknown>\n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"X-Launchpad-Export-Date: 2010-11-21 04:48+0000\n"
|
||||
"X-Launchpad-Export-Date: 2010-11-22 04:49+0000\n"
|
||||
"X-Generator: Launchpad (build Unknown)\n"
|
||||
|
||||
#. module: base
|
||||
|
||||
@@ -48,7 +48,6 @@ class res_currency(osv.osv):
|
||||
_description = "Currency"
|
||||
_columns = {
|
||||
'name': fields.char('Currency', size=32, required=True),
|
||||
'code': fields.char('Code', size=3),
|
||||
'symbol': fields.char('Symbol', size=3),
|
||||
'rate': fields.function(_current_rate, method=True, string='Current Rate', digits=(12,6),
|
||||
help='The rate of the currency to the currency of rate 1'),
|
||||
@@ -65,7 +64,7 @@ class res_currency(osv.osv):
|
||||
'active': lambda *a: 1,
|
||||
'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'res.currency', context=c)
|
||||
}
|
||||
_order = "code"
|
||||
_order = "name"
|
||||
|
||||
def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
|
||||
res=super(osv.osv, self).read(cr, user, ids, fields, context, load)
|
||||
@@ -102,12 +101,12 @@ class res_currency(osv.osv):
|
||||
if from_currency['rate'] == 0 or to_currency['rate'] == 0:
|
||||
date = context.get('date', time.strftime('%Y-%m-%d'))
|
||||
if from_currency['rate'] == 0:
|
||||
code = from_currency.code
|
||||
currency_symbol = from_currency.symbol
|
||||
else:
|
||||
code = to_currency.code
|
||||
currency_symbol = to_currency.symbol
|
||||
raise osv.except_osv(_('Error'), _('No rate found \n' \
|
||||
'for the currency: %s \n' \
|
||||
'at the date: %s') % (code, date))
|
||||
'at the date: %s') % (currency_symbol, date))
|
||||
rate = to_currency.rate/from_currency.rate
|
||||
if account and (account.currency_mode=='average') and account.currency_id:
|
||||
q = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
|
||||
@@ -133,9 +132,7 @@ class res_currency(osv.osv):
|
||||
args2 = args[:]
|
||||
if name:
|
||||
args += [('name', operator, name)]
|
||||
args2 += [('code', operator, name)]
|
||||
ids = self.search(cr, uid, args, limit=limit)
|
||||
ids += self.search(cr, uid, args2, limit=limit)
|
||||
res = self.name_get(cr, uid, ids, context)
|
||||
return res
|
||||
res_currency()
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Currencies">
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="company_id" select="2" />
|
||||
<field name="rate_ids" invisible="1"/>
|
||||
<field name="date"/>
|
||||
@@ -28,7 +27,6 @@
|
||||
<form string="Currency">
|
||||
<group col="6" colspan="6">
|
||||
<field name="name" select="1"/>
|
||||
<field name="code" select="1"/>
|
||||
<field name="rate"/>
|
||||
<field name="company_id" select="2" groups="base.group_multi_company" />
|
||||
<field name="symbol"/>
|
||||
|
||||
Reference in New Issue
Block a user