[MERGE]:Merged from trunk

bzr revid: apa@tinyerp.com-20100908043355-ory8og9usd2himx4
This commit is contained in:
apa-tiny 2010-09-08 10:03:55 +05:30
commit f553e9d25d
10 changed files with 35 additions and 28 deletions

View File

@ -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: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 08:19+0000\n"
"PO-Revision-Date: 2010-09-06 09:38+0000\n"
"Last-Translator: nafterburner <nafterburner@gmail.com>\n"
"Language-Team: openerp-translators\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2010-09-06 04:58+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"

View File

@ -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: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 08:28+0000\n"
"PO-Revision-Date: 2010-09-06 09:29+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-09-06 04:58+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-server\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 08:17+0000\n"
"PO-Revision-Date: 2010-09-06 09:42+0000\n"
"Last-Translator: Harry (Open ERP) <hmo@tinyerp.com>\n"
"Language-Team: Japanese <ja@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-09-06 04:58+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

View File

@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 08:31+0000\n"
"PO-Revision-Date: 2010-09-06 09:13+0000\n"
"Last-Translator: ub121 <ubs121@gmail.com>\n"
"Language-Team: Mongolian <mn@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-09-06 04:58+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 23:00+0000\n"
"PO-Revision-Date: 2010-09-06 10:38+0000\n"
"Last-Translator: Luiz Fernando M.França <Unknown>\n"
"Language-Team: <pt@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-09-06 04:59+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base
@ -3977,7 +3977,7 @@ msgstr "Aplicar atualizações agendadas"
#. module: base
#: model:ir.ui.menu,name:base.maintenance
msgid "Maintenance"
msgstr ""
msgstr "Manutenção"
#. module: base
#: model:res.country,name:base.mp
@ -4117,7 +4117,7 @@ msgstr "Itens de trabalho do workflow"
#. module: base
#: model:res.country,name:base.vc
msgid "Saint Vincent & Grenadines"
msgstr ""
msgstr "Saint Vincent & Grenadines"
#. module: base
#: field:ir.model.config,password:0
@ -4236,7 +4236,7 @@ msgstr "Nome do modelo inválido na definição da ação."
#. module: base
#: wizard_field:res.partner.sms_send,init,text:0
msgid "SMS Message"
msgstr ""
msgstr "Mensagem SMS"
#. module: base
#: selection:ir.ui.menu,icon:0
@ -4348,7 +4348,7 @@ msgstr "E-mail do Remetente"
#. module: base
#: field:ir.default,field_name:0
msgid "Object Field"
msgstr ""
msgstr "Campo de objeto"
#. module: base
#: selection:module.lang.install,init,lang:0
@ -4602,7 +4602,7 @@ msgstr "iCal id"
#. module: base
#: wizard_view:res.partner.sms_send,init:0
msgid "Bulk SMS send"
msgstr ""
msgstr "Enviar SMS em massa"
#. module: base
#: view:res.lang:0
@ -4636,6 +4636,8 @@ msgid ""
"Can not create the module file:\n"
" %s"
msgstr ""
"Não posso criar o arquivo de módulo:\n"
" %s"
#. module: base
#: model:ir.actions.wizard,name:base.wizard_update
@ -4794,7 +4796,7 @@ msgstr "Reunião"
#. module: base
#: field:ir.rule.group,global:0
msgid "Global"
msgstr ""
msgstr "Global"
#. module: base
#: model:res.country,name:base.cz
@ -4900,7 +4902,7 @@ msgstr "Tipo de visão"
#. module: base
#: model:ir.ui.menu,name:base.next_id_2
msgid "User Interface"
msgstr ""
msgstr "Interface de Usuário"
#. module: base
#: selection:ir.ui.menu,icon:0
@ -5593,7 +5595,7 @@ msgstr "Versão instalada"
#. module: base
#: model:ir.ui.menu,name:base.menu_workflow_root
msgid "Workflow Definitions"
msgstr ""
msgstr "Definição de workflow"
#. module: base
#: model:res.country,name:base.mr
@ -5937,6 +5939,9 @@ msgid ""
"' \\n 'for the currency: %s \n"
"' \\n 'at the date: %s"
msgstr ""
"Nenhuma valor encontrado \n"
"'\\n 'para a taxa escolhida: %s \n"
"'\\n 'na data: %s"
#. module: base
#: view:ir.actions.act_window:0
@ -6501,7 +6506,7 @@ msgstr "Holanda"
#. module: base
#: model:ir.ui.menu,name:base.next_id_4
msgid "Low Level Objects"
msgstr ""
msgstr "Objetos de baixo nível"
#. module: base
#: model:ir.model,name:base.model_ir_report_custom
@ -7173,7 +7178,7 @@ msgstr "Adicionar ou não um cabeçalho RML corporativo"
#. module: base
#: field:res.partner.event,document:0
msgid "Document"
msgstr ""
msgstr "Documento"
#. module: base
#: selection:ir.ui.menu,icon:0
@ -7560,7 +7565,7 @@ msgstr "Correspondendo a"
#. module: base
#: field:ir.actions.configuration.wizard,name:0
msgid "Next Wizard"
msgstr ""
msgstr "Próximo assistente"
#. module: base
#: field:ir.attachment,datas_fname:0

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 08:14+0000\n"
"PO-Revision-Date: 2010-09-06 09:46+0000\n"
"Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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-09-06 04:58+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

View File

@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-12-18 08:39+0000\n"
"PO-Revision-Date: 2010-09-05 08:24+0000\n"
"PO-Revision-Date: 2010-09-06 09:33+0000\n"
"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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-09-06 04:59+0000\n"
"X-Launchpad-Export-Date: 2010-09-07 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base

View File

@ -26,11 +26,11 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Currency">
<group col="6" colspan="4">
<field name="name" select="1" colspan="4"/>
<group col="6" colspan="6">
<field name="name" select="1"/>
<field name="code" select="1"/>
<field name="company_id" select="2" groups="base.group_multi_company" />
<field name="rate"/>
<field name="company_id" select="2" groups="base.group_multi_company" />
<field name="symbol"/>
</group>

View File

@ -29,6 +29,7 @@ from graph import graph
from amount_to_text import *
from amount_to_text_en import *
from pdf_utils import *
from yaml_import import *
from sql import *
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -264,6 +264,7 @@ def safe_eval(expr, globals_dict=None, locals_dict=None, mode="eval", nocopy=Fal
'reduce': reduce,
'filter': filter,
'round': round,
'len': len
}
)
return eval(test_expr(expr,_SAFE_OPCODES, mode=mode), globals_dict, locals_dict)