[MERGE] merged with main server

bzr revid: bde@tinyerp.com-20121023111122-tg9ve8pfwidqi5x2
This commit is contained in:
Bharat Devnani (OpenERP) 2012-10-23 16:41:22 +05:30
commit 1c0b768ec6
86 changed files with 248 additions and 192 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

@ -766,7 +766,7 @@ class ir_actions_todo(osv.osv):
'action_id': fields.many2one(
'ir.actions.actions', 'Action', select=True, required=True),
'sequence': fields.integer('Sequence'),
'state': fields.selection(TODO_STATES, string='State', required=True),
'state': fields.selection(TODO_STATES, string='Status', required=True),
'name': fields.char('Name', size=64),
'type': fields.selection(TODO_TYPES, 'Type', required=True,
help="""Manual: Launched manually.

View File

@ -167,7 +167,7 @@ class ir_translation(osv.osv):
[('to_translate','To Translate'),
('inprogress','Translation in Progress'),
('translated','Translated')],
string="State",
string="Status",
help="Automatically set to let administators find new terms that might need to be translated"),
# aka gettext extracted-comments - we use them to flag openerp-web translation
@ -408,7 +408,7 @@ class ir_translation(osv.osv):
if trans_file:
_logger.info('module %s: loading translation file (%s) for language %s', module_name, lang_code, lang)
tools.trans_load(cr, trans_file, lang, verbose=False, module_name=module_name, context=context)
elif lang_code != 'en':
elif lang_code != 'en_US':
_logger.warning('module %s: no translation for language %s', module_name, lang_code)
return True

View File

@ -136,7 +136,7 @@ class wkf_instance(osv.osv):
'wkf_id': fields.many2one('workflow', 'Workflow', ondelete='cascade', select=True),
'res_id': fields.integer('Resource ID'),
'res_type': fields.char('Resource Object', size=64),
'state': fields.char('State', size=32),
'state': fields.char('Status', size=32),
}
def _auto_init(self, cr, context=None):
super(wkf_instance, self)._auto_init(cr, context)
@ -159,7 +159,7 @@ class wkf_workitem(osv.osv):
'wkf_id': fields.related('act_id','wkf_id', type='many2one', relation='workflow', string='Workflow'),
'subflow_id': fields.many2one('workflow.instance', 'Subflow', ondelete="cascade", select=True),
'inst_id': fields.many2one('workflow.instance', 'Instance', required=True, ondelete="cascade", select=True),
'state': fields.char('State', size=64, select=True),
'state': fields.char('Status', size=64, select=True),
}
wkf_workitem()

View File

@ -344,7 +344,7 @@
<field name="model">workflow.workitem</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
<field name="state" string="Status"/>
<filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
<field name="wkf_id"/>
<field name="act_id"/>

View File

@ -223,7 +223,7 @@ class module(osv.osv):
('to upgrade','To be upgraded'),
('to remove','To be removed'),
('to install','To be installed')
], string='State', readonly=True, select=True),
], string='Status', readonly=True, select=True),
'demo': fields.boolean('Demo Data', readonly=True),
'license': fields.selection([
('GPL-2', 'GPL Version 2'),
@ -671,7 +671,7 @@ class module_dependency(osv.osv):
('to remove','To be removed'),
('to install','To be installed'),
('unknown', 'Unknown'),
], string='State', readonly=True, select=True),
], string='Status', readonly=True, select=True),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

View File

@ -31,7 +31,7 @@ class base_language_install(osv.osv_memory):
_columns = {
'lang': fields.selection(tools.scan_languages(),'Language', required=True),
'overwrite': fields.boolean('Overwrite Existing Terms', help="If you check this box, your customized translations will be overwritten and replaced by the official ones."),
'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
}
_defaults = {
'state': 'init',

View File

@ -38,7 +38,7 @@ class base_module_import(osv.osv_memory):
_columns = {
'module_file': fields.binary('Module .ZIP file', required=True),
'state':fields.selection([('init','init'),('done','done')],
'state', readonly=True),
'Status', readonly=True),
'module_name': fields.char('Module Name', size=128),
}

View File

@ -29,7 +29,7 @@ class base_module_update(osv.osv_memory):
_columns = {
'update': fields.integer('Number of modules updated', readonly=True),
'add': fields.integer('Number of modules added', readonly=True),
'state':fields.selection([('init','init'),('done','done')], 'state', readonly=True),
'state':fields.selection([('init','init'),('done','done')], 'Status', readonly=True),
}
_defaults = {

View File

@ -45,7 +45,7 @@
<field name="help">Display and manage the list of all countries that can be assigned to your partner records. You can create or delete countries to make sure the ones you are working on will be maintained.</field>
</record>
<menuitem id="menu_localisation" name="Localisation" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
<menuitem id="menu_localisation" name="Localization" parent="menu_config_address_book" sequence="1" groups="base.group_no_one"/>
<menuitem action="action_country" id="menu_country_partner" parent="menu_localisation" sequence="0" groups="base.group_no_one"/>

View File

@ -157,7 +157,7 @@ def _lang_get(self, cr, uid, context=None):
lang_pool = self.pool.get('res.lang')
ids = lang_pool.search(cr, uid, [], context=context)
res = lang_pool.read(cr, uid, ids, ['code', 'name'], context)
return [(r['code'], r['name']) for r in res] + [('','')]
return [(r['code'], r['name']) for r in res]
POSTAL_ADDRESS_FIELDS = ('street', 'street2', 'zip', 'city', 'state_id', 'country_id')
ADDRESS_FIELDS = POSTAL_ADDRESS_FIELDS + ('email', 'phone', 'fax', 'mobile', 'website', 'ref', 'lang')

View File

@ -116,7 +116,7 @@
<field eval="1" name="supplier"/>
<field name="is_company">1</field>
<field name="city">Fremont</field>
<field name="zip">CA 94538</field>
<field name="zip">94538</field>
<field name="country_id" ref="base.us"/>
<field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
<field name="street">3661 Station Street</field>
@ -148,7 +148,7 @@
<field eval="0" name="customer"/>
<field name="is_company">1</field>
<field name="city">Chicago</field>
<field name="zip">IL 60623</field>
<field name="zip">60623</field>
<field name="country_id" ref="base.us"/>
<field model="res.country.state" name="state_id" search="[('code','ilike','il')]"/>
<field name="street">23 Rockwell Lane</field>
@ -206,7 +206,7 @@
<field eval="[(6, 0, [ref('res_partner_category_4'), ref('res_partner_category_7')])]" name="category_id"/>
<field name="is_company">1</field>
<field name="city">Miami</field>
<field name="zip">FL 33169</field>
<field name="zip">33169</field>
<field name="country_id" ref="base.us"/>
<field model="res.country.state" name="state_id" search="[('code','=','FL')]"/>
<field name="email">contact@jackson.com</field>
@ -270,7 +270,7 @@
<field eval="[(6, 0, [ref('res_partner_category_7'), ref('res_partner_category_9')])]" name="category_id"/>
<field name="is_company">1</field>
<field name="city">Detroit</field>
<field name="zip">MI 48212</field>
<field name="zip">48212</field>
<field name="country_id" ref="base.us"/>
<field model="res.country.state" name="state_id" search="[('code','ilike','mi')]"/>
<field name="street">60, Rosewood Court</field>
@ -327,7 +327,7 @@
<field name="is_company">1</field>
<field eval="[(6, 0, [ref('res_partner_category_5')])]" name="category_id"/>
<field name="city">Boston</field>
<field name="zip">MA 02203</field>
<field name="zip">02203</field>
<field name="email">info@thinkbig.com</field>
<field name="phone">+1 857 349 3049</field>
<field name="country_id" ref="base.us"/>
@ -343,7 +343,7 @@
<field eval="1" name="supplier"/>
<field name="is_company">1</field>
<field name="city">Cupertino</field>
<field name="zip">CA 95014</field>
<field name="zip">95014</field>
<field name="country_id" ref="base.us"/>
<field model="res.country.state" name="state_id" search="[('code','ilike','ca')]"/>
<field name="street">10200 S. De Anza Blvd</field>
@ -403,7 +403,7 @@
<field name="street">3rd Floor, Room 3-C,</field>
<field name="street2">Carretera Panamericana, Km 1, Urb. Delgado Chalbaud</field>
<field name="city">Caracas</field>
<field name="zip">CP 1090</field>
<field name="zip">1090</field>
<field name="email">info@vauxoo.com</field>
<field name="phone">+58 212 681 0538</field>
<field name="country_id" ref="base.ve"/>

View File

@ -85,6 +85,7 @@
<field name="is_company" invisible="1"/>
<field name="country" invisible="1"/>
<field name="country_id" invisible="1"/>
<field name="parent_id" invisible="1"/>
</tree>
</field>
</record>

View File

@ -73,7 +73,7 @@ class res_request(osv.osv):
'ref_partner_id':fields.many2one('res.partner', 'Partner Ref.', states={'closed':[('readonly',True)]}),
'ref_doc1':fields.reference('Document Ref 1', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
'ref_doc2':fields.reference('Document Ref 2', selection=_links_get, size=128, states={'closed':[('readonly',True)]}),
'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'State', required=True, readonly=True),
'state': fields.selection([('draft','draft'),('waiting','waiting'),('active','active'),('closed','closed')], 'Status', required=True, readonly=True),
'history': fields.one2many('res.request.history','req_id', 'History')
}
_defaults = {

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]
@ -486,13 +486,6 @@ class res_users(osv.osv):
'tag': 'reload',
}
def preference_change_password(self, cr, uid, ids, context=None):
return {
'type': 'ir.actions.client',
'tag': 'change_password',
'target': 'new',
}
def has_group(self, cr, uid, group_ext_id):
"""Checks whether user belongs to given group.

View File

@ -213,8 +213,7 @@
<field name="signature" readonly="0"/>
</group>
<footer>
<button name="preference_change_password" type="object" string="Change password"/>
<button name="preference_save" type="object" string="Save"/>
<button name="preference_save" type="object" class="oe_highlight" string="Save"/>
or
<button name="preference_cancel" string="Cancel" special="cancel" class="oe_link"/>
</footer>

View File

@ -77,6 +77,16 @@
<field name="domain_force">[('user_id','=',user.id)]</field>
</record>
<record id="res_partner_bank_rule" model="ir.rule">
<field name="name">Partner bank company rule</field>
<field name="model_id" ref="model_res_partner_bank"/>
<field name="global" eval="True"/>
<!--
Same as res_partner above.
-->
<field name="domain_force">['|','|',('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id]),('company_id','=',False)]</field>
</record>
</data>
</openerp>

View File

@ -6,6 +6,7 @@
"access_ir_default_group_system","ir_default group_system","model_ir_default",,1,1,1,1
"access_ir_exports_group_system","ir_exports group_system","model_ir_exports","base.group_user",1,1,1,1
"access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
"access_ir_fields_converter_group_system","ir_fields_converter","model_ir_fields_converter","base.group_user",1,1,1,1
"access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
"access_ir_model_constraint_group_erp_manager","ir_model_constraint group_erp_manager","model_ir_model_constraint","group_erp_manager",1,1,1,1
"access_ir_model_relation_group_erp_manager","ir_model_relation group_erp_manager","model_ir_model_relation","group_erp_manager",1,1,1,1

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
6 access_ir_default_group_system ir_default group_system model_ir_default 1 1 1 1
7 access_ir_exports_group_system ir_exports group_system model_ir_exports base.group_user 1 1 1 1
8 access_ir_exports_line_group_system ir_exports_line group_system model_ir_exports_line base.group_user 1 1 1 1
9 access_ir_fields_converter_group_system ir_fields_converter model_ir_fields_converter base.group_user 1 1 1 1
10 access_ir_model_group_erp_manager ir_model group_erp_manager model_ir_model group_erp_manager 1 1 1 1
11 access_ir_model_constraint_group_erp_manager ir_model_constraint group_erp_manager model_ir_model_constraint group_erp_manager 1 1 1 1
12 access_ir_model_relation_group_erp_manager ir_model_relation group_erp_manager model_ir_model_relation group_erp_manager 1 1 1 1

View File

@ -83,7 +83,7 @@
Test one2many operator with False
-
!assert {model: res.partner, search: "[('child_ids', '=', False)]"}:
- address in (False, None, [])
- child_ids in (False, None, [])
-
Test many2many operator with empty search list
-

View File

@ -4357,7 +4357,20 @@ class BaseModel(object):
upd0 = upd0 + ',"' + field + '"'
upd1 = upd1 + ',' + self._columns[field]._symbol_set[0]
upd2.append(self._columns[field]._symbol_set[1](vals[field]))
#for the function fields that receive a value, we set them directly in the database
#(they may be required), but we also need to trigger the _fct_inv()
if (hasattr(self._columns[field], '_fnct_inv')) and not isinstance(self._columns[field], fields.related):
#TODO: this way to special case the related fields is really creepy but it shouldn't be changed at
#one week of the release candidate. It seems the only good way to handle correctly this is to add an
#attribute to make a field `really readonly´ and thus totally ignored by the create()... otherwise
#if, for example, the related has a default value (for usability) then the fct_inv is called and it
#may raise some access rights error. Changing this is a too big change for now, and is thus postponed
#after the release but, definitively, the behavior shouldn't be different for related and function
#fields.
upd_todo.append(field)
else:
#TODO: this `if´ statement should be removed because there is no good reason to special case the fields
#related. See the above TODO comment for further explanations.
if not isinstance(self._columns[field], fields.related):
upd_todo.append(field)
if field in self._columns \

View File

@ -1088,7 +1088,7 @@ class test_datetime(ImporterCase):
['value'], [['2012-02-03 11:11:11']])
self.assertFalse(result['messages'])
self.assertEqual(
values(self.read(domain=[('id', '=', result['ids'])])),
values(self.read(domain=[('id', 'in', result['ids'])])),
['2012-02-03 01:11:11'])
def test_notz(self):
@ -1098,5 +1098,5 @@ class test_datetime(ImporterCase):
result = self.import_(['value'], [['2012-02-03 11:11:11']])
self.assertFalse(result['messages'])
self.assertEqual(
values(self.read(domain=[('id', '=', result['ids'])])),
values(self.read(domain=[('id', 'in', result['ids'])])),
['2012-02-03 11:11:11'])

View File

@ -27,12 +27,11 @@ Miscellaneous tools used by OpenERP.
"""
from functools import wraps
import inspect
import subprocess
import logging
import os
import random
import re
import smtplib
import socket
import sys
import threading
@ -40,13 +39,6 @@ import time
import zipfile
from collections import defaultdict
from datetime import datetime
from email.MIMEText import MIMEText
from email.MIMEBase import MIMEBase
from email.MIMEMultipart import MIMEMultipart
from email.Header import Header
from email.Utils import formatdate, COMMASPACE
from email import Utils
from email import Encoders
from itertools import islice, izip
from lxml import etree
from which import which
@ -363,7 +355,12 @@ def generate_tracking_message_id(res_id):
Used to track the replies related to a given object thanks to the "In-Reply-To"
or "References" fields that Mail User Agents will set.
"""
return "<%s-openerp-%s@%s>" % (time.time(), res_id, socket.gethostname())
try:
rnd = random.SystemRandom().random()
except NotImplementedError:
rnd = random.random()
rndstr = ("%.15f" % rnd)[2:]
return "<%.15f.%s-openerp-%s@%s>" % (time.time(), rndstr, res_id, socket.gethostname())
def email_send(email_from, email_to, subject, body, email_cc=None, email_bcc=None, reply_to=False,
attachments=None, message_id=None, references=None, openobject_id=False, debug=False, subtype='plain', headers=None,

View File

@ -330,7 +330,7 @@ class YamlInterpreter(object):
def _create_record(self, model, fields, view_info=False, parent={}, default=True):
"""This function processes the !record tag in yalm files. It simulates the record creation through an xml
view (either specified on the !record tag or the default one for this object), including the calls to
on_change() functions.
on_change() functions, and sending only values for fields that aren't set as readonly.
:param model: model instance
:param fields: dictonary mapping the field names and their values
:param view_info: result of fields_view_get() called on the object
@ -339,6 +339,13 @@ class YamlInterpreter(object):
:return: dictionary mapping the field names and their values, ready to use when calling the create() function
:rtype: dict
"""
def _get_right_one2many_view(fg, field_name, view_type):
one2many_view = fg[field_name]['views'].get(view_type)
# if the view is not defined inline, we call fields_view_get()
if not one2many_view:
one2many_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, view_type, self.context)
return one2many_view
def process_val(key, val):
if fg[key]['type']=='many2one':
if type(val) in (tuple,list):
@ -347,7 +354,28 @@ class YamlInterpreter(object):
if val is False:
val = []
if len(val) and type(val[0]) == dict:
#we want to return only the fields that aren't readonly
#For that, we need to first get the right tree view to consider for the field `key´
one2many_tree_view = _get_right_one2many_view(fg, key, 'tree')
for rec in val:
#make a copy for the iteration, as we will alterate the size of `rec´ dictionary
rec_copy = rec.copy()
for field_key in rec_copy:
#seek in the view for the field `field_key´ and removing it from `key´ values, as this column is readonly in the tree view
subfield_obj = etree.fromstring(one2many_tree_view['arch'].encode('utf-8')).xpath("//field[@name='%s']"%(field_key))
if subfield_obj and (subfield_obj[0].get('modifiers', '{}').find('"readonly": true') >= 0):
#TODO: currently we only support if readonly is True in the modifiers. Some improvement may be done in
#order to support also modifiers that look like {"readonly": [["state", "not in", ["draft", "confirm"]]]}
del(rec[field_key])
#now that unwanted values have been removed from val, we can encapsulate it in a tuple as returned value
val = map(lambda x: (0,0,x), val)
#we want to return only the fields that aren't readonly
if el.get('modifiers', '{}').find('"readonly": true') >= 0:
#TODO: currently we only support if readonly is True in the modifiers. Some improvement may be done in
#order to support also modifiers that look like {"readonly": [["state", "not in", ["draft", "confirm"]]]}
return False
return val
view = view_info and etree.fromstring(view_info['arch'].encode('utf-8')) or False
@ -373,13 +401,14 @@ class YamlInterpreter(object):
one2many_form_view = None
if (view is not False) and (fg[field_name]['type']=='one2many'):
# for one2many fields, we want to eval them using the inline form view defined on the parent
one2many_form_view = view_info['fields'][field_name]['views'].get('form')
# if the form view is not defined inline, we call fields_view_get()
if not one2many_form_view:
one2many_form_view = self.pool.get(fg[field_name]['relation']).fields_view_get(self.cr, SUPERUSER_ID, False, 'form', self.context)
one2many_form_view = _get_right_one2many_view(fg, field_name, 'form')
field_value = self._eval_field(model, field_name, fields[field_name], one2many_form_view or view_info, parent=record_dict, default=default)
record_dict[field_name] = field_value
#call process_val to not update record_dict if values were given for readonly fields
val = process_val(field_name, field_value)
if val:
record_dict[field_name] = val
#if (field_name in defaults) and defaults[field_name] == field_value:
# print '*** You can remove these lines:', field_name, field_value
@ -405,7 +434,7 @@ class YamlInterpreter(object):
ctx['parent'] = parent2(parent)
for a in fg:
if a not in ctx:
ctx[a]=process_val(a, defaults.get(a, False))
ctx[a] = process_val(a, defaults.get(a, False))
# Evaluation args
args = map(lambda x: eval(x, ctx), match.group(2).split(','))
@ -425,7 +454,6 @@ class YamlInterpreter(object):
continue
field_value = self._eval_field(model, field_name, expression, default=False)
record_dict[field_name] = field_value
return record_dict
def process_ref(self, node, column=None):