[MERGE] merged trunk.

bzr revid: mma@tinyerp.com-20121019105411-c616nxo2helwr2l0
bzr revid: vmt@openerp.com-20121022114206-ejyrhnwf4fjfqmox
This commit is contained in:
Vo Minh Thu 2012-10-22 13:42:06 +02:00
commit 09dcb09f8a
73 changed files with 215 additions and 150 deletions

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:57+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:57+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:57+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Language: Czech\n"
#. module: base
@ -25,7 +25,7 @@ msgstr "Svatá Helena"
#. module: base
#: view:ir.actions.report.xml:0
msgid "Other Configuration"
msgstr "Ostatní nastavení"
msgstr "Další nastavení"
#. module: base
#: selection:ir.property,type:0
@ -35,7 +35,7 @@ msgstr "Datum a čas"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mailgate
msgid "Tasks-Mail Integration"
msgstr ""
msgstr "Integrace úkolů a e-mailů"
#. module: base
#: code:addons/fields.py:582
@ -126,7 +126,7 @@ msgstr ""
#. module: base
#: view:ir.module.module:0
msgid "Created Views"
msgstr "Vytvořit pohledy"
msgstr "Vytvořené náhledy"
#. module: base
#: code:addons/base/ir/ir_model.py:532

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:59+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:00+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:00+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"Language: \n"
#. module: base

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:59+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -9,8 +9,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:59+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:59+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:00+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:00+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:00+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:03+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"Language: hr\n"
#. module: base

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:00+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh
@ -35,7 +35,7 @@ msgstr "Dátum/Idő"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mailgate
msgid "Tasks-Mail Integration"
msgstr ""
msgstr "Feladat-levél beillesztés"
#. module: base
#: code:addons/fields.py:582
@ -109,6 +109,8 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
"Segít Önnek a projektjei és feladatai menedzselésében, azok "
"nyomonkövetésével, tervezések készítésével, stb..."
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
@ -145,6 +147,11 @@ msgid ""
"\n"
"This module allows you to create retro planning for managing your events.\n"
msgstr ""
"\n"
"Az események szervezése és menedzselése.\n"
"======================================\n"
"\n"
"Ezzel a modullal átütemezést készíthet az események menedzselésében.\n"
#. module: base
#: help:ir.model.fields,domain:0
@ -175,17 +182,17 @@ msgstr "Cél Ablak"
#. module: base
#: model:ir.module.module,shortdesc:base.module_sale_analytic_plans
msgid "Sales Analytic Distribution"
msgstr ""
msgstr "Eladás elemzés osztályozás"
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_process
msgid "Process"
msgstr ""
msgstr "Folyamat"
#. module: base
#: model:ir.module.module,shortdesc:base.module_analytic_journal_billing_rate
msgid "Billing Rates on Contracts"
msgstr ""
msgstr "Árfolyamok a szerződéseken"
#. module: base
#: code:addons/base/res/res_users.py:558
@ -359,6 +366,11 @@ msgid ""
" complex data from other software\n"
" "
msgstr ""
"\n"
" Ez a modul gondoskodik egy csoport keretmunka_bevitelről ami "
"segítséget nyújt\n"
" más szoftver összetett adatainak betöltéséhez\n"
" "
#. module: base
#: field:ir.actions.wizard,wiz_name:0
@ -378,7 +390,7 @@ msgstr "Ügyfél kapcsolati irányítás"
#. module: base
#: view:ir.module.module:0
msgid "Extra"
msgstr ""
msgstr "Extra"
#. module: base
#: code:addons/orm.py:2526
@ -399,7 +411,7 @@ msgstr "Hitelkeret"
#. module: base
#: model:ir.module.module,description:base.module_web_graph
msgid "Openerp web graph view"
msgstr ""
msgstr "Openerp web grafikus nézet"
#. module: base
#: field:ir.model.data,date_update:0
@ -409,7 +421,7 @@ msgstr "Frissítés Dátuma"
#. module: base
#: model:ir.module.module,shortdesc:base.module_base_action_rule
msgid "Automated Action Rules"
msgstr ""
msgstr "Automata végrehalytási szabályok"
#. module: base
#: view:ir.attachment:0
@ -15451,6 +15463,8 @@ msgid ""
"This field is computed automatically based on bank accounts defined, having "
"the display on footer checkbox set."
msgstr ""
"Ez a mező automatikusan generált a megadott bank számlák alapján, a "
"lábjegyzetben lévő jelölőnégyzet kiválasztásával."
#. module: base
#: model:ir.module.module,description:base.module_mrp_subproduct

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:58+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:01+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:03+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:01+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:01+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:01+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:02+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:59+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:01+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:01+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:04+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:01+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:59+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:03+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:05+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:03+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:03+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:00+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 04:57+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:06+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:03+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:04+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:09+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -14,8 +14,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:07+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:05+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -13,8 +13,8 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-12 05:08+0000\n"
"X-Generator: Launchpad (build 16130)\n"
"X-Launchpad-Export-Date: 2012-10-20 05:06+0000\n"
"X-Generator: Launchpad (build 16165)\n"
#. module: base
#: model:res.country,name:base.sh

View File

@ -211,7 +211,7 @@
<img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
</a>
<div class="oe_module_desc">
<div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger oe_kanban_color_border">
<div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_color_border">
<table class="oe_kanban_table">
<tr>
<td class="oe_kanban_title1" align="left" valign="middle">

View File

@ -334,10 +334,10 @@ class res_users(osv.osv):
context={}
ids = []
if name:
ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit)
ids = self.search(cr, user, [('login','=',name)]+ args, limit=limit, context=context)
if not ids:
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
return self.name_get(cr, user, ids)
ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
return self.name_get(cr, user, ids, context=context)
def copy(self, cr, uid, id, default=None, context=None):
user2copy = self.read(cr, uid, [id], ['login','name'])[0]
@ -409,8 +409,8 @@ class res_users(osv.osv):
# prevent/delay login in that case. It will also have been logged
# as a SQL error, if anyone cares.
try:
cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", str(user_id))
cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", str(user_id))
cr.execute("SELECT id FROM res_users WHERE id=%s FOR UPDATE NOWAIT", (user_id,))
cr.execute("UPDATE res_users SET login_date = now() AT TIME ZONE 'UTC' WHERE id=%s", (user_id,))
except Exception, e:
_logger.exception("Failed to update last_login for db:%s login:%s", db, login)
except openerp.exceptions.AccessDenied:

View File

@ -396,7 +396,7 @@
assert res_8 == [1]
assert res_9 == []
# get the companies referenced by some currency (this is normally the main company)
# get the companies referenced by some currency (this is normally the main company) using a weird negative domain
res_10 = self.search(cr, uid, [('currency_ids', 'not like', 'probably_unexisting_name')])
res_11 = self.search(cr, uid, [('currency_ids', 'not in', [max_currency_id + 1])])
res_12 = self.search(cr, uid, [('currency_ids', '!=', False)])
@ -408,6 +408,20 @@
assert res_10 == res_11
assert res_10 == res_12
assert res_10 == res_13
# try testing real subsets with IN/NOT IN
res_partner = self.pool.get('res.partner')
res_users = self.pool.get('res.users')
p1, _ = res_partner.name_create(cr, uid, "Dédé Boitaclou")
p2, _ = res_partner.name_create(cr, uid, "Raoulette Pizza O'poil")
u1a = res_users.create(cr, uid, {'login': 'dbo', 'partner_id': p1})
u1b = res_users.create(cr, uid, {'login': 'dbo2', 'partner_id': p1})
u2 = res_users.create(cr, uid, {'login': 'rpo', 'partner_id': p2})
assert [p1] == res_partner.search(cr, uid, [('user_ids', 'in', u1a)]), "o2m IN accept single int on right side"
assert [p1,p2] == res_partner.search(cr, uid, [('user_ids', 'in', [u1a,u2])]), "o2m IN matches any on the right side"
all_partners = res_partner.search(cr, uid, [])
assert (set(all_partners) - set([p1])) == set(res_partner.search(cr, uid, [('user_ids', 'not in', u1a)])), "o2m NOT IN matches none on the right side"
assert (set(all_partners) - set([p1,p2])) == set(res_partner.search(cr, uid, [('user_ids', 'not in', [u1b, u2])])), "o2m NOT IN matches none on the right side"
# child_of x returns x and its children (direct or not).
company = self.browse(cr, uid, ref('ymltest_company3'))

View File

@ -540,7 +540,8 @@ class expression(object):
ids2 = select_from_where(cr, field._fields_id, field_obj._table, 'id', ids2, operator)
if ids2:
call_null = False
self.__exp[i] = ('id', 'in', ids2)
o2m_op = 'not in' if operator in NEGATIVE_TERM_OPERATORS else 'in'
self.__exp[i] = ('id', o2m_op, ids2)
if call_null:
o2m_op = 'in' if operator in NEGATIVE_TERM_OPERATORS else 'not in'

View File

@ -215,6 +215,9 @@ class Cursor(object):
_logger.warning(query)
_logger.warning("SQL queries cannot contain %d or %f anymore. "
"Use only %s")
if params and not isinstance(params, (tuple, list, dict)):
_logger.error("SQL query parameters should be a tuple, list or dict; got %r", params)
raise ValueError("SQL query parameters should be a tuple, list or dict; got %r" % (params,))
if self.sql_log:
now = mdt.now()

View File

@ -9,7 +9,7 @@ See the :ref:`test-framework` section in the :ref:`features` list.
"""
from . import test_expression, test_html_sanitize, test_ir_sequence, test_orm,\
test_view_validation, test_uninstall, test_misc
test_view_validation, test_uninstall, test_misc, test_db_cursor
fast_suite = [
test_ir_sequence,
@ -18,6 +18,7 @@ fast_suite = [
checks = [
test_expression,
test_html_sanitize,
test_db_cursor,
test_orm,
test_view_validation,
test_misc,

View File

@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
import unittest2
import openerp
from openerp.tools.misc import mute_logger
import common
DB = common.DB
ADMIN_USER_ID = common.ADMIN_USER_ID
def cursor():
return openerp.modules.registry.RegistryManager.get(DB).db.cursor()
class test_cr_execute(unittest2.TestCase):
""" Try cr.execute with wrong parameters """
@mute_logger('openerp.sql_db')
def test_execute_bad_params(self):
"""
Try to use iterable but non-list or int params in query parameters.
"""
cr = cursor()
with self.assertRaises(ValueError):
cr.execute("SELECT id FROM res_users WHERE login=%s", 'admin')
with self.assertRaises(ValueError):
cr.execute("SELECT id FROM res_users WHERE id=%s", 1)
with self.assertRaises(ValueError):
cr.execute("SELECT id FROM res_users WHERE id=%s", '1')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -43,7 +43,7 @@ class ormcache(object):
return r
except KeyError:
self.stat_miss += 1
value = d[args] = self.method(self2, cr, *args)
value = d[key] = self.method(self2, cr, *args)
return value
except TypeError:
self.stat_err += 1

View File

@ -46,7 +46,7 @@ _ALLOWED_MODULES = ['_strptime', 'time']
_CONST_OPCODES = set(opmap[x] for x in [
'POP_TOP', 'ROT_TWO', 'ROT_THREE', 'ROT_FOUR', 'DUP_TOP', 'DUP_TOPX',
'POP_BLOCK','SETUP_LOOP', 'BUILD_LIST', 'BUILD_MAP', 'BUILD_TUPLE',
'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR'] if x in opmap)
'LOAD_CONST', 'RETURN_VALUE', 'STORE_SUBSCR', 'STORE_MAP'] if x in opmap)
_EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
'UNARY_POSITIVE', 'UNARY_NEGATIVE', 'UNARY_NOT',
@ -61,7 +61,7 @@ _EXPR_OPCODES = _CONST_OPCODES.union(set(opmap[x] for x in [
] if x in opmap))
_SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
'STORE_MAP', 'LOAD_NAME', 'CALL_FUNCTION', 'COMPARE_OP', 'LOAD_ATTR',
'LOAD_NAME', 'CALL_FUNCTION', 'COMPARE_OP', 'LOAD_ATTR',
'STORE_NAME', 'GET_ITER', 'FOR_ITER', 'LIST_APPEND', 'DELETE_NAME',
'JUMP_FORWARD', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE', 'JUMP_ABSOLUTE',
'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3',