pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] trunk

Browse Source 
bzr revid: vmt@openerp.com-20120620122005-2rghps6qjjkozt3n
bzr revid: al@openerp.com-20120627103900-0kgtskgipdazmgy9
This commit is contained in:
Antony Lesuisse
2012-06-27 12:39:00 +02:00
parent 5edca89903 1624d47aeb
commit 453a1350fe
88 changed files with 1969 additions and 737 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/base_menu.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<menuitem id="menu_management" name="Modules" parent="menu_administration" sequence="0"/>
<menuitem id="menu_config" name="Configuration" parent="menu_administration" sequence="1"/>
<menuitem id="menu_administration_shortcut" parent="menu_administration" name="Custom Shortcuts" sequence="50"/>
<menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4"/>
<menuitem id="menu_users" name="Users" parent="menu_administration" sequence="4" groups="base.group_no_one"/>
<menuitem id="menu_translation" name="Translations" parent="menu_administration" sequence="7"/>
<menuitem id="menu_translation_app" name="Application Terms" parent="menu_translation" sequence="4" groups="base.group_no_one"/>
<menuitem id="menu_translation_export" name="Import / Export" groups="base.group_no_one" parent="menu_translation" sequence="3"/>
openerp/addons/base/i18n/ab.po
+2 -2
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-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:18+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/af.po
+28 -9
View File
@@ -14,13 +14,13 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
msgid "Saint Helena"
msgstr ""
msgstr "St. Helena"
#. module: base
#: view:ir.actions.report.xml:0
@@ -35,7 +35,7 @@ msgstr "DagTyd"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_mailgate
msgid "Tasks-Mail Integration"
msgstr ""
msgstr "Take - Vonkpos Integrasie"
#. module: base
#: code:addons/fields.py:582
@@ -44,6 +44,8 @@ msgid ""
"The second argument of the many2many field %s must be a SQL table !You used "
"%s, which is not a valid SQL table name."
msgstr ""
"Die tweede argument van die baie2baie veld %s moet 'n SQL-tabel wees! U "
"gebruik %s, wat nie 'n geldige SQL tabel naam is nie."
#. module: base
#: field:ir.ui.view,arch:0
@@ -70,11 +72,26 @@ msgid ""
" * Graph of My Remaining Hours by Project\n"
" "
msgstr ""
"\n"
"Projek bestuur module volg multi-vlak projekte, take, werk wat gedoen is aan "
"take, esm.\n"
"================================================== "
"====================================\n"
"\n"
"Dit is in staat om beplanning te lewer, take te sorteer, . eso\n"
"\n"
"Bedieningspaneel vir die projek lede wat insluit:\n"
"--------------------------------------------\n"
"* Lys van my oop take\n"
"* Lys van my gedelegeerde take\n"
"* Grafiek van my projekte: Beplande vs Totale ure\n"
"* Grafiek van my Oorblywende ure per Projek\n"
" "
#. module: base
#: field:base.language.import,code:0
msgid "Code (eg:en__US)"
msgstr ""
msgstr "Kode (bv.: en__US)"
#. module: base
#: view:workflow:0
@@ -84,7 +101,7 @@ msgstr ""
#: field:workflow.transition,wkf_id:0
#: field:workflow.workitem,wkf_id:0
msgid "Workflow"
msgstr ""
msgstr "Werksvloei"
#. module: base
#: selection:ir.sequence,implementation:0
@@ -94,12 +111,12 @@ msgstr ""
#. module: base
#: selection:base.language.install,lang:0
msgid "Hungarian / Magyar"
msgstr ""
msgstr "Hongaars / Magyar"
#. module: base
#: selection:base.language.install,lang:0
msgid "Spanish (PY) / Español (PY)"
msgstr ""
msgstr "Spaans (PY) / Español (PY)"
#. module: base
#: model:ir.module.category,description:base.module_category_project_management
@@ -107,11 +124,13 @@ msgid ""
"Helps you manage your projects and tasks by tracking them, generating "
"plannings, etc..."
msgstr ""
"Help om jou projekte en take te bestuur deur dit na te volg, planne te maak, "
"ens .."
#. module: base
#: field:ir.actions.act_window,display_menu_tip:0
msgid "Display Menu Tips"
msgstr ""
msgstr "Vertoon Kieslys Wenke"
#. module: base
#: help:ir.cron,model:0
openerp/addons/base/i18n/am.po
+2 -2
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-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ar.po
+2 -2
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-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/bg.po
+2 -2
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-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/bs.po
+2 -2
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-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ca.po
+2 -2
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-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/cs.po
+2 -2
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-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Poedit-Language: Czech\n"
#. module: base
openerp/addons/base/i18n/da.po
+2 -2
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-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/de.po
+2 -2
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-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/el.po
+2 -2
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-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
openerp/addons/base/i18n/en_GB.po
+2 -2
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-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es.po
+2 -2
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-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es_AR.po
+2 -2
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-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/es_CL.po
+4 -4
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -3801,7 +3801,7 @@ msgstr "IVA"
#. module: base
#: field:res.users,new_password:0
msgid "Set password"
msgstr ""
msgstr "Establecer contraseña"
#. module: base
#: view:res.lang:0
@@ -14477,7 +14477,7 @@ msgstr "No puede suprimir el campo '%s' !"
#. module: base
#: view:res.users:0
msgid "Allowed Companies"
msgstr ""
msgstr "Compañias permitidas"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_de
openerp/addons/base/i18n/es_CR.po
+2 -2
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"Language: \n"
#. module: base
openerp/addons/base/i18n/es_EC.po
+2 -2
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/et.po
+2 -2
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-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/eu.po
+2 -2
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-06-19 04:45+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fa.po
+2 -2
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-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
"X-Poedit-Language: Persian\n"
openerp/addons/base/i18n/fa_AF.po
+2 -2
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fi.po
+2 -2
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-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/fr.po
+2 -2
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-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/gl.po
+2 -2
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-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/gu.po
+2 -2
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-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/he.po
+2 -2
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-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/hr.po
+7 -7
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-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
"Language: hr\n"
#. module: base
@@ -182,7 +182,7 @@ msgstr ""
#. module: base
#: field:res.partner,ref:0
msgid "Reference"
msgstr "Referenca"
msgstr "Šifra"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
@@ -3689,8 +3689,8 @@ msgid ""
"Value Added Tax number. Check the box if the partner is subjected to the "
"VAT. Used by the VAT legal statement."
msgstr ""
"PDV broj. Označite ako je partner podvrgnut PDV-u. Korišteno pri zakonskim "
"PDV izvještajima."
"PDV broj. Označite ako je partner obveznik PDV-a. Koristi se u nekim "
"izvještajima."
#. module: base
#: selection:ir.sequence,implementation:0
@@ -3785,7 +3785,7 @@ msgstr "Provjera Ean"
#. module: base
#: field:res.partner,vat:0
msgid "VAT"
msgstr "VAT"
msgstr "PDV"
#. module: base
#: field:res.users,new_password:0
@@ -10051,7 +10051,7 @@ msgstr "Tjedni"
#: code:addons/base/res/res_company.py:157
#, python-format
msgid "VAT: "
msgstr ""
msgstr "PDV "
#. module: base
#: model:res.country,name:base.af
openerp/addons/base/i18n/hu.po
+2 -2
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-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/hy.po
+2 -2
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-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/id.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/is.po
+2 -2
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-06-19 04:47+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/it.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ja.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ka.po
+2 -2
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-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:21+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/kk.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:22+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ko.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/lt.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/lv.po
+2 -2
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-06-19 04:48+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/mk.po
+2 -2
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-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/mn.po
+1359 -284
View File
File diff suppressed because it is too large Load Diff
openerp/addons/base/i18n/nb.po
+2 -2
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-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:23+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/nl.po
+12 -9
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-06-19 04:46+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:20+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -4920,8 +4920,9 @@ msgid ""
"You can not create this document (%s) ! Be sure your user belongs to one of "
"these groups: %s."
msgstr ""
"U kunt dit document (%s) niet maken ! Controleer of uw gebruiker behoort tot "
"één van deze groepen: %s."
"U kunt dit document (%s) niet maken ! Controleer of u voldoende rechten "
"heeft. Om dit document te kunnen maken dient u rechten te hebben tot één van "
"deze groepen: %s."
#. module: base
#: model:ir.module.module,shortdesc:base.module_web_chat
@@ -10687,8 +10688,9 @@ msgid ""
"You can not read this document (%s) ! Be sure your user belongs to one of "
"these groups: %s."
msgstr ""
"U kunt dit document (%s) niet lezen ! Controleer dat uw gebruiker behoort "
"tot één van deze groepen: %s."
"U kunt dit document (%s) niet lezen! Controleer of u voldoende rechten "
"heeft. Om dit document te kunnen lezen dient u rechten te hebben tot één van "
"deze groepen: %s."
#. module: base
#: view:res.bank:0
@@ -11637,7 +11639,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_hr
msgid "Employee Directory"
msgstr "Werknemers map"
msgstr "Personeelsbeheer"
#. module: base
#: view:ir.cron:0
@@ -14675,8 +14677,9 @@ msgid ""
"You can not delete this document (%s) ! Be sure your user belongs to one of "
"these groups: %s."
msgstr ""
"U kunt dit document (%s) niet verwijderen ! Controleer dat uw gebruiker "
"behoort tot één van deze groepen: %s."
"U kunt dit document (%s) niet verwijderen! Controleer of u voldoende rechten "
"heeft. Om dit document te kunnen verwijderen dient u rechten te hebben tot "
"één van deze groepen: %s."
#. module: base
#: model:ir.module.module,description:base.module_web_livechat
openerp/addons/base/i18n/nl_BE.po
+2 -2
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pl.po
+2 -2
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-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pt.po
+2 -2
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-06-19 04:49+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/pt_BR.po
+2 -2
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-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ro.po
+2 -2
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-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ru.po
+2 -2
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-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sk.po
+2 -2
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-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sl.po
+2 -2
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-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sq.po
+2 -2
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-06-19 04:44+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:19+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sr.po
+2 -2
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-06-19 04:50+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:24+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sr@latin.po
+2 -2
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-06-19 04:54+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:28+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/sv.po
+115 -9
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-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -1197,6 +1197,21 @@ msgid ""
"At the end of the month, the planning manager can also check if the encoded "
"timesheets are respecting the planned time on each analytic account.\n"
msgstr ""
"Håll koll på din planering\n"
"Denna modul hjälper dig att hantera dina projektplaner.\n"
"============================================\n"
"\n"
"Den här modulen är baserad på objektbokföringen och är helt integrerad med\n"
"* Tidrapporteringen\n"
"* Semesterplaneringen\n"
"* Projektledningen\n"
"\n"
"Varje avdelningschef har full kontroll över all allokerad tid för all "
"personer inom ansvarsområdet, inklusive godkänd ledighet eller om det "
"fortfarande finns lediga resurser för aktiviteter.\n"
"\n"
"Vid månadsslut kan planeringen jämföras med inrapporterad tid och "
"planeringen gjord för varje objektkonto.\n"
#. module: base
#: selection:ir.property,type:0
@@ -2292,6 +2307,21 @@ msgid ""
"re-invoice your customer's expenses if your work by project.\n"
" "
msgstr ""
"\n"
"Denna moduls uppgift är att hantera anställdas utlägg\n"
"==========================================\n"
"\n"
"Hela arbetsflödet genomförs:\n"
"* Preliminära kostnader\n"
"* Bekräftelse av tidrapporten genom den anställde\n"
"* Validering av sin chef\n"
"* Validering av bokförare och faktureringen\n"
"* Betalning av fakturan till den anställde\n"
"\n"
"Denna modul använder också objektredovisning och är kompatibel med\n"
"tidrapport-modulen så att du kommer att automatiskt kunna\n"
"återfaktura kundens kostnader om du använder projektmodulen.\n"
" "
#. module: base
#: field:ir.values,action_id:0
@@ -2929,6 +2959,10 @@ msgid ""
"==================================================\n"
" "
msgstr ""
"\n"
"Denna modul ger en PAD i alla projekt-kanbanvyer\n"
"=======================================\n"
" "
#. module: base
#: model:ir.actions.act_window,help:base.action_country
@@ -2975,7 +3009,7 @@ msgstr "Bangladesh"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_retro_planning
msgid "Project Retro-planning"
msgstr "Projekt retro-plannering"
msgstr "Projekt-retroplannering"
#. module: base
#: model:ir.module.module,shortdesc:base.module_stock_planning
@@ -4130,7 +4164,7 @@ msgstr ""
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_issue_sheet
msgid "Timesheet on Issues"
msgstr ""
msgstr "Tidrapporter på ärenden"
#. module: base
#: model:res.partner.title,name:base.res_partner_title_ltd
@@ -5394,7 +5428,7 @@ msgstr "Fält"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_long_term
msgid "Long Term Projects"
msgstr "Långsiktiga projekt"
msgstr "Långtidsprojekt"
#. module: base
#: model:res.country,name:base.ve
@@ -5619,6 +5653,31 @@ msgid ""
"Budgets per Budgets.\n"
"\n"
msgstr ""
"\n"
"Denna modul gör det möjligt för bokförare att hantera objekt- och "
"tvärbudgetar.\n"
"================================================================\n"
"\n"
"När huvudbudget och budgetarna definieras (i bokföring/budgetar/),\n"
"kan projektledarna sätta planerade belopp på varje objektkonto.\n"
"\n"
"Bokförare har möjlighet att se den totala planerade beloppet för varje\n"
"budget och huvudbudget för att säkerställa att totalen inte\n"
"över-/understiger än vad han planen. Kontoplanen kan också kopplas till\n"
"till en grafisk vy.\n"
"\n"
"Tre rapporter finns tillgängliga:\n"
"1. Den första är tillgänglig från en lista med budgetutskottet. Det ger "
"spridning för dessa budgetutskottet av den analytiska konton per master "
"budgetutskottet.\n"
"\n"
"2. Den andra är en sammanfattning av den tidigare, ger endast "
"spridningskoden, för de valda budgetutskottet av den analytiska konton.\n"
"\n"
"3. Den sista är tillgänglig från den analytiska kontoplanen. Det ger att "
"sprida, för de valda analytiska konton, de master budgetutskottet per "
"budgetutskottet.\n"
"\n"
#. module: base
#: help:res.lang,iso_code:0
@@ -7035,7 +7094,7 @@ msgstr ""
#. module: base
#: model:ir.ui.menu,name:base.menu_project_long_term
msgid "Long Term Planning"
msgstr "Långsiktig planering"
msgstr "Långtidsplanering"
#. module: base
#: field:ir.actions.server,message:0
@@ -7616,6 +7675,13 @@ msgid ""
"all the tasks will change accordingly.\n"
" "
msgstr ""
"\n"
"Ändringsdatum i enlighet med projektets slutdatum.\n"
"=========================================\n"
"\n"
"Om slutdatum för projektet ändras så korrigeras tidsfrister och startdatum "
"för alla aktiviteter i enlighet med detta.\n"
" "
#. module: base
#: help:res.users,view:0
@@ -11258,7 +11324,7 @@ msgstr "Åtgärd"
#. module: base
#: model:ir.module.module,shortdesc:base.module_event_project
msgid "Retro-Planning on Events"
msgstr ""
msgstr "Retroplannering av evenemang"
#. module: base
#: code:addons/custom.py:555
@@ -11480,6 +11546,13 @@ msgid ""
"handle an issue.\n"
" "
msgstr ""
"\n"
"Denna modul tillför tidrapporter på ärenden/bugghantering i projekt\n"
"======================================================\n"
"\n"
"Arbetsloggar kan administreras för att ge underlag till de timmar ägnade åt "
"ett visst ärende.\n"
" "
#. module: base
#: model:ir.actions.act_window,name:base.ir_sequence_form
@@ -13804,6 +13877,25 @@ msgid ""
"state are scheduled with taking the phase's start date\n"
" "
msgstr ""
"\n"
"Longtidsplanerings-modul som spårar planering, schemaläggning och "
"resursfördelning.\n"
"====================================================================\n"
"\n"
"egenskaper\n"
"--------\n"
"* Hantera stora projekt.\n"
"* Definiera olika faser av projekt.\n"
"* Beräkna Fasschemaläggning: Beräkna startdatum och slutdatum för de faser "
"som är i preliminär, öppen och i vilande tillstånd för givna projekt.\n"
" Om ingen projekt anges så alla i anspråktas utkastet, öppen och "
"pågående faserna.\n"
"* Beräkna schemaläggning: Det här fungerar samma som schemaläggaren knappen "
"på project.phase. Det tar projektet som argument och beräknar alla öppna, "
"preliminära och pågående aktiviteter.\n"
"* Schemalägg aktivieteter: Alla preliminära, vilande och öppna planeras med "
"fasens startdatum\n"
" "
#. module: base
#: model:ir.actions.act_window,name:base.action_workflow_activity_form
@@ -14788,6 +14880,18 @@ msgid ""
"and decide on their status as they evolve.\n"
" "
msgstr ""
"\n"
"Denna modul tillför ärendehantering och buggadministration till Projekt.\n"
"=========================================================\n"
"\n"
"OpenERP tillåter dig hantera ärenden och problem som kan uppstå i ett "
"projekt\n"
"såsom buggar i ett system, klagomål eller materialproblem, En listvy ger en "
"snabb \n"
"överblick över ärendestocken, tilldela enskilda ärenden till handläggare och "
"ge \n"
"dem status i den takt de utvecklas.\n"
" "
#. module: base
#: field:res.groups,full_name:0
@@ -15218,7 +15322,7 @@ msgstr "Land"
#. module: base
#: model:ir.module.module,shortdesc:base.module_project_messages
msgid "In-Project Messaging System"
msgstr ""
msgstr "Projektinternt meddelandesystem"
#. module: base
#: model:res.country,name:base.pn
@@ -15550,7 +15654,7 @@ msgstr "Turks and Caicos Islands"
#. module: base
#: model:ir.module.module,shortdesc:base.module_fetchmail_project_issue
msgid "eMail Gateway for Project Issues"
msgstr "E-postbrygga för projektproblem"
msgstr "E-postbrygga för projektärenden"
#. module: base
#: field:res.partner.bank,partner_id:0
@@ -15603,6 +15707,8 @@ msgid ""
"Manage relations with prospects and customers using leads, opportunities, "
"requests or issues."
msgstr ""
"Administrera relationen mellan prospektiva kunder och kunder med kundämnen, "
"affärsmöjligheter, önskemål eller ärenden."
#. module: base
#: selection:res.partner.address,type:0
openerp/addons/base/i18n/th.po
+2 -2
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-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/tlh.po
+2 -2
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-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/tr.po
+2 -2
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-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:25+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/uk.po
+2 -2
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-06-19 04:51+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/ur.po
+2 -2
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-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/vi.po
+2 -2
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-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_CN.po
+7 -6
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
@@ -170,7 +170,7 @@ msgstr "过滤条件这个字段是可选输入的，用于在输入关系型字
#. module: base
#: field:res.partner,ref:0
msgid "Reference"
msgstr "关联单号"
msgstr "编号"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_be_invoice_bba
@@ -9137,6 +9137,7 @@ msgid ""
"use the same timezone that is otherwise used to pick and render date and "
"time values: your computer's timezone."
msgstr ""
"用户的时区为打印报表配置正确的日期时间输出格式。设置这个值是很重要的。你应该根据你的计算机时区来选取相同的时区，因为它也影响系统中日期的选取和呈现。"
#. module: base
#: help:res.country,name:0
@@ -13964,7 +13965,7 @@ msgid ""
"The default language used in the graphical user interface, when translations "
"are available. To add a new language, you can use the 'Load an Official "
"Translation' wizard available from the 'Administration' menu."
msgstr ""
msgstr "选可用的翻译作为图形界面的默认语言。你可以通过设置菜单的载入一个官方翻译来添加一个新翻译"
#. module: base
#: model:ir.module.module,description:base.module_l10n_es
@@ -14978,7 +14979,7 @@ msgstr "您不能删除字段 '%s' !"
#. module: base
#: view:res.users:0
msgid "Allowed Companies"
msgstr ""
msgstr "允许的公司"
#. module: base
#: model:ir.module.module,shortdesc:base.module_l10n_de
@@ -15864,7 +15865,7 @@ msgstr "%r 错误的浏览记录标识符，其应该为一个整数。"
#: field:res.partner.address,function:0
#: selection:workflow.activity,kind:0
msgid "Function"
msgstr "功能"
msgstr "职能"
#. module: base
#: view:res.widget:0
openerp/addons/base/i18n/zh_HK.po
+2 -2
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-06-19 04:52+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:26+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/i18n/zh_TW.po
+2 -2
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-06-19 04:53+0000\n"
"X-Generator: Launchpad (build 15435)\n"
"X-Launchpad-Export-Date: 2012-06-27 05:27+0000\n"
"X-Generator: Launchpad (build 15482)\n"
#. module: base
#: model:res.country,name:base.sh
openerp/addons/base/ir/ir.xml
+74 -85
View File
@@ -35,7 +35,7 @@
<field name="arch" type="xml">
<form string="User-defined Defaults" version="7.0">
<sheet>
<label for="name" class="oe_form_readonly_hidden"/>
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group>
<group string="Model">
@@ -75,9 +75,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Client Actions">
<field name="name"/>
<field name="model"/>
<field name="key2"/>
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('key2','ilike',self)]"
string="Client Action"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Model" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -208,7 +208,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sequences">
<field name="name"/>
<field name="name" string="Sequence"/>
<field name="code"/>
<separator orientation="vertical"/>
<field name="company_id" groups="base.group_multi_company"/>
@@ -263,8 +263,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Sequences Type">
<field name="name"/>
<field name="code"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('code','ilike',self)]" string="Sequence Type"/>
</search>
</field>
</record>
@@ -316,8 +315,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Action">
<field name="name"/>
<field name="type"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('type','ilike',self)]" string="Action"/>
</search>
</field>
</record>
@@ -402,13 +400,11 @@
<field name="model">ir.actions.report.xml</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Report xml">
<search string="Report Xml">
<group col="10" colspan="4">
<field name="name"/>
<field name="model"/>
<field name="type"/>
<field name="report_name"/>
<field name="report_type"/>
<field name="name"
filter_domain="['|', '|', '|', '|', ('name','ilike',self), ('model','ilike',self), ('type','ilike',self), ('report_name','ilike',self), ('report_type','ilike',self)]"
string="Report"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4">
@@ -511,8 +507,7 @@
<field name="arch" type="xml">
<search string="Open a Window">
<group col="10" colspan="4">
<field name="name"/>
<field name="res_model"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('res_model','ilike',self)]" string="Action"/>
<field name="view_type"/>
</group>
<newline/>
@@ -581,9 +576,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Wizards">
<field name="name"/>
<field name="type"/>
<field name="wiz_name"/>
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('type','ilike',self), ('wiz_name','ilike',self)]"
string="Wizard"/>
</search>
</field>
</record>
@@ -672,6 +667,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Views">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="View"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_zoom"
string="Search"
domain="[('type', '=', 'search')]"/>
@@ -682,10 +679,8 @@
string="Form"
domain="[('type', '=','form')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="type"/>
<field name="model"/>
<field name="inherit_id"/>
<field name="type"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model'}"/>
@@ -815,29 +810,28 @@
<field name="arch" type="xml">
<search string="Attachments">
<group colspan="4" col="10">
<field name="name" filter_domain="['|', ('name','ilike',self), ('datas_fname','ilike',self)]" string="Attachment"/>
<field name="create_date"/>
<separator orientation="vertical"/>
<filter icon="terp-stage"
string="URL"
domain="[('type','=','url')]"/>
<filter icon="terp-stock_align_left_24"
string="Binary"
domain="[('type','=','binary')]"/>
<filter name="my_documents_filter"
string="My Document(s)"
icon="terp-personal"
domain="[('create_uid','=',uid)]"
help="Filter on my documents"/>
<separator orientation="vertical"/>
<filter icon="terp-go-month" string="Month"
domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-%%m-01'))]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="create_uid"/>
<field name="type"/>
<field name="datas_fname"/>
<field name="create_uid">
<filter icon="terp-personal"
domain="[('create_uid','=',uid)]"
help="Filter on my documents" />
</field>
</group>
<newline/>
<group expand="0" string="Group By...">
<filter string="Owner" icon="terp-personal" domain="[]" context="{'group_by':'create_uid'}"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}" groups="base.group_no_one"/>
<filter string="Company" icon="terp-gtk-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<separator orientation="vertical"/>
<filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}"/>
@@ -963,26 +957,17 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Model Description">
<field name="name" filter_domain="['|', ('name','ilike',self), ('model','ilike',self)]" string="Model"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="In Memory"
domain="[('osv_memory', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-stock_align_left_24"
string="Custom"
domain="[('state', '=', 'manual')]"/>
<separator orientation="vertical"/>
<filter icon="terp-translate"
string="Base"
domain="[('state', '=', 'base')]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="model"/>
<newline/>
</search>
</field>
</record>
@@ -1053,20 +1038,18 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Fields">
<field name="name" filter_domain="['|', ('name','ilike',self), ('field_description','ilike',self)]" string="Field"/>
<separator orientation="vertical"/>
<filter icon="terp-gnome-cpu-frequency-applet+"
string="Required"
domain="[('required', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-dialog-close"
string="Readonly"
domain="[('readonly', '=', True)]"/>
<separator orientation="vertical"/>
<filter icon="terp-translate"
string="Translate"
domain="[('translate', '=', True)]"/>
<newline/>
<field name="name"/>
<field name="field_description"/>
<field name="model_id"/>
<field name="ttype"/>
<field name="required"/>
@@ -1075,7 +1058,6 @@
<group expand="0" string="Group By...">
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</search>
</field>
</record>
@@ -1086,18 +1068,23 @@
<field name="type">form</field>
<field name="arch" type="xml">
<form string="External Identifiers" version="7.0">
<sheet>
<group col="4">
<field name="name"/>
<group>
<group>
<field name="complete_name"/>
<field name="module"/>
<field name="name"/>
</group>
<group>
<field name="display_name"/>
<field name="model"/>
<field name="res_id"/>
</group>
<group>
<field name="noupdate"/>
<newline/>
<field name="date_update" />
<field name="date_init" />
</group>
</sheet>
</group>
</form>
</field>
</record>
@@ -1108,10 +1095,9 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="External Identifiers">
<field name="module"/>
<field name="name"/>
<field name="model"/>
<field name="res_id"/>
<field name="complete_name"/>
<field name="display_name"/>
<field name="model" groups="base.group_no_one"/>
</tree>
</field>
</record>
@@ -1122,13 +1108,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="External Identifiers">
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('model','ilike',self), ('module','ilike',self)]"
string="External Identifier"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test"
string="Updatable"
domain="[('noupdate', '=', False)]"/>
<separator orientation="vertical"/>
<field name="module"/>
<field name="name"/>
<field name="model"/>
<field name="res_id"/>
<field name="noupdate"/>
<newline/>
@@ -1405,7 +1392,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Menu">
<field name="name" string="Menu" />
<field name="name" string="Menu"/>
<field name="parent_id"/>
</search>
</field>
@@ -1485,7 +1472,8 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Scheduled Actions">
<field name="name"/>
<field name="name" string="Scheduled Action"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection"/>
<field name="nextcall"/>
<field name="active"/>
@@ -1570,22 +1558,22 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Access Controls">
<group>
<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
<group>
<field name="name" string="Access Control"/>
<separator orientation="vertical"/>
<filter string="Global" icon="terp-stage" domain="[('group_id','=',False)]"/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="model_id"/>
<field name="model_id"/>
<field name="group_id"/>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
<filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</group>
<newline/>
<group expand="0" string="Group By..." colspan="11" col="11" groups="base.group_no_one">
<filter string="Group" icon="terp-personal" domain="[]" context="{'group_by':'group_id'}"/>
<filter string="Object" icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'model_id'}"/>
</group>
</search>
</field>
</record>
@@ -1666,16 +1654,16 @@
<field name="model">ir.rule</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Record rules">
<search string="Record Rules">
<group>
<filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
<field name="name" string="Record Rule"/>
<separator orientation="vertical"/>
<filter string="Global" icon="terp-stage" domain="[('global','=',True)]"/>
<filter string="Full Access" icon="terp-gtk-select-all" domain="[('perm_read','=',True),('perm_write','=',True),('perm_create','=',True),('perm_unlink','=',True)]"/>
<filter string="Read Access" icon="terp-stock_align_left_24" domain="[('perm_read','=',True)]"/>
<filter string="Write Access" icon="terp-tools" domain="[('perm_write','=',True)]"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="name"/>
<field name="groups"/>
</group>
</search>
@@ -1721,7 +1709,7 @@
<page string="Trigger" attrs="{'invisible':[('state','!=','trigger')]}">
<group string="Trigger Configuration" col="4">
<field name="wkf_model_id" attrs="{'required':[('state','=','trigger')]}"/>
<field name="trigger_obj_id" context="{'key':''}"
<field name="trigger_obj_id" context="{'key':''}"
domain="[('model_id','=',model_id),('ttype','in',['many2one','int'])]"
attrs="{'required':[('state','=','trigger')]}"/>
<field name="trigger_name" attrs="{'required':[('state','=','trigger')]}"/>
@@ -1809,13 +1797,14 @@
<field name="arch" type="xml">
<search string="Server Actions">
<group col="10" colspan="4">
<field name="name"/>
<field name="state"/>
<field name="name" string="Server Action"/>
<separator orientation="vertical"/>
<field name="model_id"/>
<field name="state"/>
</group>
<newline/>
<group expand="0" string="Group By" colspan="4" col="4">
<filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
<filter string="Action Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'state'}"/>
</group>
</search>
</field>
@@ -1913,7 +1902,7 @@
<field name="view_type">form</field>
<field name="help">The configuration wizards are used to help you configure a new instance of OpenERP. They are launched during the installation of new modules, but you can choose to restart some wizards manually from this menu.</field>
</record>
<menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_no_one"/>
<menuitem id="menu_ir_actions_todo" name="Configuration Wizards" parent="menu_custom" sequence="20" groups="base.group_no_one"/>
<menuitem id="menu_ir_actions_todo_form" action="act_ir_actions_todo_form" parent="menu_ir_actions_todo"/>
<record model="ir.cron" id="cronjob_osv_memory_autovacuum">
@@ -2021,9 +2010,9 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Outgoing Mail Servers">
<field name="name"/>
<field name="smtp_host"/>
<field name="smtp_user"/>
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('smtp_host','ilike',self), ('smtp_user','ilike',self)]"
string="Outgoing Mail Server"/>
<field name="smtp_encryption"/>
</search>
</field>
openerp/addons/base/ir/ir_config_parameter_view.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="System Properties">
<field name="key"/>
<field name="key" string="Key"/>
<field name="value"/>
</search>
</field>
openerp/addons/base/ir/ir_filters.xml
+6 -6
View File
@@ -53,16 +53,16 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Filters">
<field name="name" string="Filter Name"/>
<separator orientation="vertical"/>
<filter string="Personal" domain="[('user_id','!=',False)]" help="Filters visible only for one user"/>
<filter string="Shared" domain="[('user_id','=',False)]" help="Filters shared with all users"/>
<filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
name="my_filters"
string="My Filters"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="model_id"/>
<field name="user_id">
<filter icon="terp-personal" domain="[('user_id','in',(uid, False))]"
name="my_filters"
string="My Filters" />
</field>
<field name="user_id"/>
</search>
</field>
</record>
openerp/addons/base/ir/ir_model.py
+27
View File
@@ -641,10 +641,37 @@ class ir_model_data(osv.osv):
"""
_name = 'ir.model.data'
_order = 'module,model,name'
def _display_name_get(self, cr, uid, ids, prop, unknow_none, context=None):
result = {}
result2 = {}
for res in self.browse(cr, uid, ids, context=context):
if res.id:
result.setdefault(res.model, {})
result[res.model][res.res_id] = res.id
result2[res.id] = False
for model in result:
try:
r = dict(self.pool.get(model).name_get(cr, uid, result[model].keys(), context=context))
for key,val in result[model].items():
result2[val] = r.get(key, False)
except:
# some object have no valid name_get implemented, we accept this
pass
return result2
def _complete_name_get(self, cr, uid, ids, prop, unknow_none, context=None):
result = {}
for res in self.browse(cr, uid, ids, context=context):
result[res.id] = (res.module and (res.module + '.') or '')+res.name
return result
_columns = {
'name': fields.char('External Identifier', required=True, size=128, select=1,
help="External Key/Identifier that can be used for "
"data integration with third-party systems"),
'complete_name': fields.function(_complete_name_get, type='char', string='Complete ID'),
'display_name': fields.function(_display_name_get, type='char', string='Record Name'),
'model': fields.char('Model Name', required=True, size=64, select=1),
'module': fields.char('Module', required=True, size=64, select=1),
'res_id': fields.integer('Record ID', select=1,
openerp/addons/base/ir/workflow/workflow_view.xml
+68 -67
View File
@@ -28,15 +28,14 @@
</record>
<record id="view_workflow_search" model="ir.ui.view">
<field name="name">workflow.search</field>
<field name="model">workflow</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow">
<field name="name"/>
<field name="osv"/>
</search>
</field>
<field name="name">workflow.search</field>
<field name="model">workflow</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow">
<field name="name" filter_domain="['|', ('name','ilike',self), ('osv','ilike',self)]" string="Workflow"/>
</search>
</field>
</record>
<record id="view_workflow_diagram" model="ir.ui.view">
@@ -161,27 +160,27 @@
</record>
<record id="view_workflow_activity_search" model="ir.ui.view">
<field name="name">workflow.activity.search</field>
<field name="model">workflow.activity</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Activity">
<filter icon="terp-camera_test" string="Flow Start"
domain="[('flow_start', '=',True)]" />
<filter icon="terp-gtk-stop" string="Flow Stop"
domain="[('flow_stop', '=',True)]" />
<separator orientation="vertical"/>
<field name="name"/>
<field name="wkf_id"/>
<field name="kind"/>
<field name="action_id"/>
<field name="action"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
</group>
</search>
</field>
<field name="name">workflow.activity.search</field>
<field name="model">workflow.activity</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Activity">
<field name="name" string="Workflow Activity"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Flow Start"
domain="[('flow_start', '=',True)]" />
<filter icon="terp-gtk-stop" string="Flow Stop"
domain="[('flow_stop', '=',True)]" />
<separator orientation="vertical"/>
<field name="wkf_id"/>
<field name="action_id"/>
<field name="kind"/>
<newline/>
<group expand="0" string="Group By...">
<filter string="Workflow" icon="terp-stage" domain="[]" context="{'group_by':'wkf_id'}"/>
</group>
</search>
</field>
</record>
<record id="action_workflow_activity_form" model="ir.actions.act_window">
@@ -235,17 +234,17 @@
</record>
<record id="view_workflow_transition_search" model="ir.ui.view">
<field name="name">workflow.transition.search</field>
<field name="model">workflow.transition</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Transition">
<field name="act_from"/>
<field name="act_to"/>
<field name="signal"/>
<field name="condition"/>
</search>
</field>
<field name="name">workflow.transition.search</field>
<field name="model">workflow.transition</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Transition">
<field name="signal" filter_domain="['|', ('signal','ilike',self), ('condition','ilike',self)]" string="Workflow Transition"/>
<separator orientation="vertical"/>
<field name="act_from"/>
<field name="act_to"/>
</search>
</field>
</record>
<record id="action_workflow_transition_form" model="ir.actions.act_window">
@@ -294,17 +293,18 @@
</field>
</record>
<record id="view_workflow_instance_search" model="ir.ui.view">
<field name="name">workflow.instance.search</field>
<field name="model">workflow.instance</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Instances">
<filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
<separator orientation="vertical"/>
<field name="wkf_id" widget="selection"/>
<field name="res_id"/>
<field name="res_type"/>
<field name="state"/>
<field name="name">workflow.instance.search</field>
<field name="model">workflow.instance</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Instances">
<field name="res_type" string="Resource Object"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Active" domain="[('state','=','active')]" name="active"/>
<separator orientation="vertical"/>
<field name="wkf_id" widget="selection"/>
<field name="res_id"/>
<field name="state"/>
</search>
</field>
</record>
@@ -349,7 +349,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Workflow Workitems">
<field name="wkf_id"/>
<field name="wkf_id"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
@@ -358,20 +358,21 @@
</field>
</record>
<record id="view_workflow_workitem_search" model="ir.ui.view">
<field name="name">workflow.workitem.search</field>
<field name="model">workflow.workitem</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
<filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
<separator orientation="vertical"/>
<field name="wkf_id" widget="selection"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
<field name="state"/>
</search>
</field>
<field name="name">workflow.workitem.search</field>
<field name="model">workflow.workitem</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Workflow Workitems">
<field name="state" string="State"/>
<separator orientation="vertical"/>
<filter icon="terp-camera_test" string="Active" name="active" domain="[('state','=','active')]"/>
<separator orientation="vertical"/>
<field name="wkf_id" widget="selection"/>
<field name="act_id"/>
<field name="subflow_id"/>
<field name="inst_id"/>
</search>
</field>
</record>
<record id="action_workflow_workitem_form" model="ir.actions.act_window">
openerp/addons/base/module/module_view.xml
+18 -24
View File
@@ -42,17 +42,14 @@
<field name="arch" type="xml">
<search string="Search modules">
<group col='10' colspan='4'>
<field name="name" filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]" string="Module"/>
<field name="description" string="Keywords"/>
<separator orientation="vertical"/>
<filter name="app" icon="terp-check" string="Apps" domain="[('application', '=', 1)]"/>
<filter name="extra" icon="terp-check" string="Extra" domain="[('application', '=', 0)]"/>
<separator orientation="vertical"/>
<filter icon="terp-check" string="Installed" domain="[('state', 'in', ['installed', 'to upgrade', 'to remove'])]"/>
<filter icon="terp-dialog-close" string="Not Installed" domain="[('state', 'in', ['uninstalled', 'uninstallable', 'to install'])]"/>
<separator orientation="vertical"/>
<field name="name"
filter_domain="['|', ('name','ilike',self), ('shortdesc','ilike',self)]"
string="Name"/>
<field name="description" string="Keywords"/>
<field name="category_id"/>
<newline/>
<group expand="0" string="Group By...">
@@ -69,8 +66,7 @@
<field name="model">ir.module.module</field>
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban create="false">
<kanban create="false">
<field name="icon"/>
<field name="name"/>
<field name="state"/>
@@ -78,22 +74,19 @@
<t t-name="kanban-box">
<div class="oe_module_vignette oe_kanban_auto_height">
<t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
<a type="edit">
<img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
</a>
<img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
<div class="oe_module_desc">
<h4><a type="edit"><field name="shortdesc"/></a></h4>
<p class="oe_module_name">
<field name="name"/><br/>
</p>
<button type="object" name="button_immediate_install" states="uninstalled" class="oe_button">Install</button>
<button t-if="installed" class="oe_button" disabled="disabled">Installed</button>
<button type="object" name="button_immediate_install" states="uninstalled">Install</button>
<button t-if="installed" disabled="disabled">Installed</button>
</div>
</div>
</t>
</templates>
</kanban>
</kanban>
</field>
</record>
@@ -121,8 +114,8 @@
<field name="arch" type="xml">
<form string="Module" version="7.0">
<header>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_form_button_hi"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_form_button_hi"/>
<button name="button_install" states="uninstalled" string="Install" icon="terp-gtk-jump-to-ltr" type="object" class="oe_highlight"/>
<button name="button_upgrade" states="installed" string="Upgrade" icon="terp-gtk-go-back-rtl" type="object" class="oe_highlight"/>
<button name="button_uninstall" states="installed" string="Uninstall (beta)" icon="terp-dialog-close" type="object"
confirm="Do you confirm the uninstallation of this module? This will permanently erase all data currently stored by the module!"/>
<button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" icon="gtk-cancel" type="object"/>
@@ -131,14 +124,14 @@
<field name="state" widget="statusbar" statusbar_visible="uninstalled"/>
</header>
<sheet>
<div class="oe_right oe_form_button_box">
<div class="oe_right oe_button_box">
<field name="icon_image" widget="image"/>
</div>
<div class="oe_form_title">
<label for="shortdesc" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="shortdesc" class="oe_edit_only"/>
<h1><field name="shortdesc"/></h1>
<label for="category_id" class="oe_form_readonly_hidden"/>
<h2><field name="category_id" class="oe_form_inline"/></h2>
<label for="category_id" class="oe_edit_only"/>
<h2><field name="category_id" class="oe_inline"/></h2>
</div>
<group>
<group>
@@ -195,7 +188,7 @@
</field>
</record>
<record id="open_module_tree" model="ir.actions.act_window">
<field name="name">Modules</field>
<field name="name">Install a Module</field>
<field name="res_model">ir.module.module</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
@@ -203,7 +196,8 @@
<field name="search_view_id" ref="view_module_filter"/>
<field name="help">You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade".</field>
</record>
<menuitem action="open_module_tree" id="menu_module_tree" parent="base.menu_management" sequence="1"/>
<menuitem id="menu_module_tree" parent="base.menu_management" name="Modules"
sequence="1" action="open_module_tree"/>
</data>
</openerp>
openerp/addons/base/module/wizard/base_language_install_view.xml
+5 -5
View File
@@ -3,11 +3,11 @@
<data>
<record id="view_base_language_install" model="ir.ui.view">
<field name="name">Load Official Translation</field>
<field name="name">Load a Translation</field>
<field name="model">base.language.install</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Load Official Translation">
<form string="Load a Translation">
<group colspan="4" col="8">
<group colspan="1">
<field name="config_logo" widget="image" width="220" height="130" nolabel="1" colspan="1"/>
@@ -19,7 +19,7 @@
</group>
<separator orientation="vertical" colspan="1" rowspan="12"/>
<group colspan="6">
<separator string="Load an Official Translation" colspan="4"/>
<separator string="Load a Translation" colspan="4"/>
<group states="init" colspan="4">
<field name="lang" colspan="4"/>
<field name="overwrite" colspan="4" groups="base.group_no_one"/>
@@ -46,7 +46,7 @@ You must change the preferences of the user and open a new menu to view the chan
</record>
<record id="action_view_base_language_install" model="ir.actions.act_window">
<field name="name">Load Official Translation</field>
<field name="name">Load a Translation</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">base.language.install</field>
<field name="view_type">form</field>
@@ -55,7 +55,7 @@ You must change the preferences of the user and open a new menu to view the chan
</record>
<menuitem
name="Load an Official Translation"
name="Load a Translation"
action="action_view_base_language_install"
id="menu_view_base_language_install"
parent="menu_translation" sequence="2"/>
openerp/addons/base/publisher_warranty/publisher_warranty_view.xml
+3 -2
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"/>
<menuitem id="menu_publisher_warranty" name="OpenERP Entreprise" parent="base.menu_administration" sequence="5"
groups="base.group_no_one"/>
<record id="publisher_warranty_contract_tree_view" model="ir.ui.view">
<field name="name">publisher_warranty.contract.tree</field>
@@ -57,7 +58,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Publisher Warranty Contract">
<field name="name"/>
<field name="name" string="Serial Key"/>
<field name="date_start"/>
<field name="date_stop"/>
</search>
openerp/addons/base/res/ir_property_view.xml
+3 -2
View File
@@ -8,13 +8,14 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Parameters">
<field name="name" string="Name"/>
<separator orientation="vertical"/>
<filter icon="terp-project"
string="Generic"
help="Parameters that are used by all resources."
domain="[('res_id','=',False)]"/>
<separator orientation="vertical"/>
<field name="fields_id" />
<field name="name"/>
<field name="fields_id"/>
<field name="company_id" groups="base.group_multi_company"/>
</search>
</field>
openerp/addons/base/res/res_bank_view.xml
+4 -4
View File
@@ -20,8 +20,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state" placeholder="State"/>
<field name="country" placeholder="Country"/>
@@ -140,12 +140,12 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Bank Accounts">
<field name="bank_name" filter_domain="['|', ('bank_name','ilike',self), ('acc_number','ilike',self)]" string="Bank Name"/>
<separator orientation="vertical"/>
<filter name="my_bank" icon="terp-check" string="My Banks" domain="[('company_id','&lt;&gt;',False)]" help="Bank accounts belonging to one of your companies"/>
<separator orientation="vertical"/>
<field name="acc_number"/>
<field name="company_id" invisible="context.get('company_hide', True)"/>
<field name="partner_id"/>
<field name="bank_name"/>
</search>
</field>
</record>
openerp/addons/base/res/res_company_view.xml
+9 -8
View File
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<openerp>
<data>
<menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"/>
<menuitem id="menu_res_company_global" parent="base.menu_administration" name="Companies" sequence="2"
groups="base.group_no_one"/>
<menuitem id="menu_custom_multicompany" parent="base.menu_custom" name="Multi-Companies" sequence="50"/>
@@ -20,14 +21,14 @@
<field name="arch" type="xml">
<form string="Company" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
<div class="oe_right oe_avatar">
<field name="logo" nolabel="1" widget="image"/>
</div>
<div class="oe_right oe_form_button_box">
<div class="oe_right oe_button_box">
<button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<group col="4">
<field name="partner_id" readonly="1" required="0" groups="base.group_no_one"/>
@@ -43,8 +44,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
@@ -172,7 +173,7 @@
<field name="priority" eval="8"/>
<field name="arch" type="xml">
<search string="Multi Company">
<field name="name"/>
<field name="name" string="Name"/>
<field name="company_id" widget="selection"/>
<field name="company_dest_id" widget="selection"/>
<field name="object_id"/>
openerp/addons/base/res/res_config.py
+18 -14
View File
@@ -496,15 +496,6 @@ class res_config_settings(osv.osv_memory):
return res
def fields_get(self, cr, uid, allfields=None, context=None, write_access=True):
# overridden to make fields of installed modules readonly
res = super(res_config_settings, self).fields_get(cr, uid, allfields, context, write_access)
classified = self._get_classified_fields(cr, uid, context)
for name, module in classified['module']:
if name in res and module.state in ('installed', 'to install', 'to upgrade'):
res[name]['readonly'] = True
return res
def execute(self, cr, uid, ids, context=None):
ir_values = self.pool.get('ir.values')
ir_model_data = self.pool.get('ir.model.data')
@@ -531,13 +522,18 @@ class res_config_settings(osv.osv_memory):
if method.startswith('set_'):
getattr(self, method)(cr, uid, ids, context)
# module fields: install immediately the selected modules
# module fields: install/uninstall the selected modules
to_install_ids = []
to_uninstall_ids = []
for name, module in classified['module']:
if config[name] and module.state == 'uninstalled':
to_install_ids.append(module.id)
if to_install_ids:
ir_module.button_immediate_install(cr, uid, to_install_ids, context)
if config[name]:
if module.state == 'uninstalled': to_install_ids.append(module.id)
else:
if module.state in ('installed','upgrade'): to_uninstall_ids.append(module.id)
if to_install_ids or to_uninstall_ids:
ir_module.button_uninstall(cr, uid, to_uninstall_ids, context=context)
ir_module.button_immediate_install(cr, uid, to_install_ids, context=context)
# force client-side reload (update user menu and current view)
return {
@@ -545,4 +541,12 @@ class res_config_settings(osv.osv_memory):
'tag': 'reload',
}
def cancel(self, cr, uid, ids, context=None):
# ignore the current record, and send the action to reopen the view
act_window = self.pool.get('ir.actions.act_window')
action_ids = act_window.search(cr, uid, [('res_model', '=', self._name)])
if action_ids:
return act_window.read(cr, uid, action_ids[0], [], context=context)
return {}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
openerp/addons/base/res/res_config.xml
+11 -11
View File
@@ -7,12 +7,12 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Cancel" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Apply" colspan="1"/>
<button name="action_next" type="object"
string="Apply" icon="gtk-go-forward" class="oe_highlight"/>
<button name="action_skip" type="object" special="cancel"
string="Cancel" icon="gtk-jump-to"/>
</header>
<group string="res_config_contents" col="4"/>
<group string="res_config_contents"/>
</form>
</field>
</record>
@@ -24,8 +24,8 @@
<field name="arch" type="xml">
<form string="Next Configuration Step" version="7.0">
<header>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Continue"/>
<button name="action_next" type="object"
string="Continue" icon="gtk-go-forward" class="oe_highlight"/>
</header>
<field name="note"/>
</form>
@@ -39,10 +39,10 @@
<field name="arch" type="xml">
<form version="7.0">
<header>
<button name="action_skip" icon="gtk-jump-to" special="cancel"
type="object" string="Cancel" colspan="1"/>
<button name="action_next" icon="gtk-go-forward"
type="object" string="Install Modules" colspan="1"/>
<button name="action_next" type="object"
string="Install Modules" icon="gtk-go-forward" class="oe_highlight"/>
<button name="action_skip" type="object" special="cancel"
string="Cancel" icon="gtk-jump-to"/>
</header>
<separator string="title" colspan="4"/>
</form>
openerp/addons/base/res/res_currency_view.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Currencies">
<field name="name"/>
<field name="name" string="Currency"/>
<field name="active"/>
</search>
</field>
@@ -109,7 +109,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Currency Rate Type">
<field name="name"/>
<field name="name" string="Name"/>
</search>
</field>
</record>
openerp/addons/base/res/res_lang_view.xml
+4 -3
View File
@@ -109,11 +109,12 @@
<field name="arch" type="xml">
<search string="Languages">
<group>
<field name="name"
filter_domain="['|', '|', ('name','ilike',self), ('code','ilike',self), ('iso_code','ilike',self)]"
string="Language"/>
<separator orientation="vertical"/>
<filter string="Translatable" icon="terp-tools" domain="[('translatable','=',True)]"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="code"/>
<field name="iso_code"/>
<field name="direction"/>
</group>
</search>
openerp/addons/base/res/res_partner.py
+16 -14
View File
@@ -50,6 +50,8 @@ class res_partner_category(osv.osv):
context = {}
if context.get('partner_category_display') == 'short':
return super(res_partner_category, self).name_get(cr, uid, ids, context=context)
if isinstance(ids, (int, long)):
ids = [ids]
reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
res = []
for record in reads:
@@ -285,19 +287,18 @@ class res_partner(osv.osv):
def name_get(self, cr, uid, ids, context=None):
if context is None:
context = {}
if not len(ids):
return []
if context.get('show_ref'):
rec_name = 'ref'
else:
rec_name = 'name'
reads = self.read(cr, uid, ids, [rec_name,'parent_id'], context=context)
if isinstance(ids, (int, long)):
ids = [ids]
res = []
for record in reads:
name = record.get('name', '/')
if record['parent_id']:
name = "%s (%s)"%(name, record['parent_id'][1])
res.append((record['id'], name))
for record in self.browse(cr, uid, ids, context=context):
name = record.name
if record.parent_id:
name = "%s (%s)" % (name, record.parent_id.name)
if context.get('show_address'):
name = name + "\n" + self._display_address(cr, uid, record, without_company=True, context=context)
name = name.replace('\n\n','\n')
name = name.replace('\n\n','\n')
res.append((record.id, name))
return res
def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
@@ -395,7 +396,7 @@ class res_partner(osv.osv):
('name','=','main_partner')])[0],
).res_id
def _display_address(self, cr, uid, address, context=None):
def _display_address(self, cr, uid, address, without_company=False, context=None):
'''
The purpose of this function is to build and return an address formatted accordingly to the
@@ -421,7 +422,8 @@ class res_partner(osv.osv):
address_field = ['title', 'street', 'street2', 'zip', 'city']
for field in address_field :
args[field] = getattr(address, field) or ''
if without_company:
args['company_name'] = ''
return address_format % args
openerp/addons/base/res/res_partner_view.xml
+24 -19
View File
@@ -101,33 +101,33 @@
<field name="arch" type="xml">
<form string="Partners" version="7.0">
<sheet>
<field name="photo" widget='image' class="oe_form_avatar oe_right" height="70"/>
<div class="oe_right oe_form_button_box" name="buttons">
<field name="photo" widget='image' class="oe_avatar oe_right" height="70"/>
<div class="oe_right oe_button_box" name="buttons">
</div>
<div class="oe_form_title">
<div class="oe_form_readonly_hidden">
<div class="oe_title">
<div class="oe_edit_only">
<label for="name" string="Customer Name"/>
(<field name="is_company" on_change="onchange_type(is_company)" class="oe_form_inline"/> <label for="is_company" string="Is a Company?"/>)
(<field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
</div>
<h1>
<field name="name"/>
</h1>
<div attrs="{'invisible': [('is_company','=', True)]}">
<label for="parent_id" class="oe_form_readonly_hidden"/>
<label for="parent_id" class="oe_edit_only"/>
</div>
<h2 attrs="{'invisible': [('is_company','=', True)]}">
<field name="parent_id"
domain="[('is_company', '=', True)]" context="{'default_is_company': True}"
class="oe_form_inline"
class="oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>,
</h2>
<div attrs="{'invisible' : [('is_company', '=', True)]}">
<label for="function" class="oe_form_readonly_hidden" />
<label for="function" class="oe_edit_only" />
</div>
<h2 attrs="{'invisible' : [('is_company', '=', True)]}">
<field name="function" class="oe_form_inline" placeholder="Job Position"/>
<field name="function" class="oe_inline" placeholder="Job Position"/>
</h2>
<field name="category_id" widget="many2many_tags" placeholder="Tags..."/>
</div>
@@ -136,11 +136,11 @@
<group>
<label for="type" attrs="{'invisible': [('parent_id','=', False)]}"/>
<div attrs="{'invisible': [('parent_id','=', False)]}">
<field class="oe_form_inline"
<field class="oe_inline"
name="type"/>
<label for="use_parent_address"/>
<field name="use_parent_address"
class="oe_form_inline"
class="oe_inline"
on_change="onchange_address(use_parent_address, parent_id)"/>
</div>
@@ -149,8 +149,8 @@
<field name="street" placeholder="Street..."/>
<field name="street2"/>
<div>
<field name="zip" class="oe_form_inline" placeholder="ZIP"/>
<field name="city" class="oe_form_inline" placeholder="City"/>
<field name="zip" class="oe_inline" placeholder="ZIP"/>
<field name="city" class="oe_inline" placeholder="City"/>
</div>
<field name="state_id" placeholder="State"/>
<field name="country_id" placeholder="Country"/>
@@ -193,7 +193,7 @@
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
<div class="oe_module_vignette">
<a type="edit">
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_form_avatar oe_kanban_avatar_toto"/>
<img t-att-src="kanban_image('res.partner', 'photo', record.id.value)" class="oe_avatar oe_kanban_avatar_toto"/>
</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">
@@ -254,14 +254,19 @@
<field name="arch" type="xml">
<search string="Search Partner">
<group col='10' colspan='4'>
<field name="name" filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"/>
<field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
<field name="category_id"/>
<field name="user_id"/>
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
<field name="name"
filter_domain="['|','|',('name','ilike',self),('parent_id','ilike',self),('ref','=',self)]"
string="Partner"/>
<separator orientation="vertical"/>
<filter help="My Partners" icon="terp-personal+" domain="[('user_id','=',uid)]"/>
<filter string="Persons" name="type_person" icon="terp-personal" domain="[('is_company','=',0)]"/>
<filter string="Companies" name="type_company" icon="terp-partner" domain="[('is_company','=',1)]"/>
<filter string="Customers" name="customer" icon="terp-personal" domain="[('customer','=',1)]" help="Customer Partners"/>
<filter string="Suppliers" name="supplier" icon="terp-personal" domain="[('supplier','=',1)]" help="Supplier Partners"/>
<separator orientation="vertical"/>
<field name="category_id"/>
<field name="user_id"/>
<field name="parent_id" filter_domain="[('parent_id','child_of',[self])]"/>
</group>
<newline />
<group expand="0" string="Group By...">
openerp/addons/base/res/res_request_view.xml
+1 -2
View File
@@ -34,8 +34,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Request Link">
<field name="name"/>
<field name="object"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('object','ilike',self)]" string="Subject"/>
</search>
</field>
</record>
openerp/addons/base/res/res_users.py
+1 -1
View File
@@ -226,7 +226,7 @@ class users(osv.osv):
'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'),
'context_lang': fields.selection(_lang_get, 'Language', required=True,
help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load an Official Translation' wizard available from the 'Administration' menu."),
help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load a Translation' wizard available from the 'Administration' menu."),
'context_tz': fields.selection(_tz_get, 'Timezone', size=64,
help="The user's timezone, used to output proper date and time values inside printed reports. "
"It is important to set a value for this field. You should use the same timezone "
openerp/addons/base/res/res_users_view.xml
+10 -11
View File
@@ -82,12 +82,12 @@
<field name="id" invisible="1"/>
<sheet>
<div class="oe_right">
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_form_avatar"/>
<field name="avatar" widget='image' nolabel="1" on_change="onchange_avatar(avatar)" class="oe_avatar"/>
</div>
<div class="oe_form_title">
<label for="name" class="oe_form_readonly_hidden"/>
<div class="oe_title">
<label for="name" class="oe_edit_only"/>
<h1><field name="name"/></h1>
<label for="company_id" class="oe_form_readonly_hidden"/>
<label for="company_id" class="oe_edit_only"/>
<h2><field name="company_id" context="{'user_preference': 0}"/></h2>
</div>
<group>
@@ -150,8 +150,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Users">
<field name="name"/>
<field name="login"/>
<field name="name" filter_domain="['|', ('name','ilike',self), ('login','ilike',self)]" string="User"/>
<field name="company_ids" string="Company" groups="base.group_multi_company"/>
</search>
</field>
@@ -196,15 +195,15 @@
<field name="arch" type="xml">
<form string="Users" version="7.0">
<sheet>
<div class="oe_right oe_form_avatar">
<div class="oe_right oe_avatar">
<field name="avatar" widget='image' on_change="onchange_avatar(avatar)"/>
</div>
<div class="oe_form_title">
<div class="oe_title">
<h1>
<field name="name" readonly="1" class="oe_form_readonly_hidden"/>
(<field name="login" readonly="1" class="oe_form_readonly_hidden"/>)
<field name="name" readonly="1" class="oe_edit_only"/>
(<field name="login" readonly="1" class="oe_edit_only"/>)
</h1>
<label for="company_id" class="oe_form_readonly_hidden"/>
<label for="company_id" class="oe_edit_only"/>
<h2>
<field name="company_id" widget="selection" readonly="0"
groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
openerp/addons/base/res/res_widget.py
+1
View File
@@ -35,6 +35,7 @@ res_widget()
class res_widget_user(osv.osv):
_name="res.widget.user"
_rec_name="user_id"
_order = "sequence"
_columns = {
'sequence': fields.integer('Sequence'),
openerp/addons/base/res/res_widget_view.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Search Widget">
<field name="title" />
<field name="title" string="Widget"/>
</search>
</field>
</record>
openerp/osv/orm.py
+4
View File
@@ -1757,6 +1757,10 @@ class BaseModel(object):
trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('help'))
if trans:
node.set('help', trans)
if node.get('placeholder'):
trans = self.pool.get('ir.translation')._get_source(cr, user, self._name, 'view', context['lang'], node.get('placeholder'))
if trans:
node.set('placeholder', trans)
for f in node:
if children or (node.tag == 'field' and f.tag in ('filter','separator')):
openerp/tests/test_orm.py
+13 -14
View File
@@ -20,7 +20,6 @@ class TestO2MSerialization(common.TransactionCase):
def setUp(self):
super(TestO2MSerialization, self).setUp()
self.partner = self.registry('res.partner')
self.address = self.registry('res.partner.address')
def test_no_command(self):
" empty list of commands yields an empty list of records "
@@ -43,9 +42,9 @@ class TestO2MSerialization(common.TransactionCase):
def test_LINK_TO_command(self):
" reads the records from the database, records are returned with their ids. "
ids = [
self.address.create(self.cr, UID, {'name': 'foo'}),
self.address.create(self.cr, UID, {'name': 'bar'}),
self.address.create(self.cr, UID, {'name': 'baz'})
self.partner.create(self.cr, UID, {'name': 'foo'}),
self.partner.create(self.cr, UID, {'name': 'bar'}),
self.partner.create(self.cr, UID, {'name': 'baz'})
]
commands = map(LINK_TO, ids)
@@ -61,9 +60,9 @@ class TestO2MSerialization(common.TransactionCase):
def test_bare_ids_command(self):
" same as the equivalent LINK_TO commands "
ids = [
self.address.create(self.cr, UID, {'name': 'foo'}),
self.address.create(self.cr, UID, {'name': 'bar'}),
self.address.create(self.cr, UID, {'name': 'baz'})
self.partner.create(self.cr, UID, {'name': 'foo'}),
self.partner.create(self.cr, UID, {'name': 'bar'}),
self.partner.create(self.cr, UID, {'name': 'baz'})
]
results = self.partner.resolve_o2m_commands_to_record_dicts(
@@ -77,9 +76,9 @@ class TestO2MSerialization(common.TransactionCase):
def test_UPDATE_command(self):
" take the in-db records and merge the provided information in "
id_foo = self.address.create(self.cr, UID, {'name': 'foo'})
id_bar = self.address.create(self.cr, UID, {'name': 'bar'})
id_baz = self.address.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
id_foo = self.partner.create(self.cr, UID, {'name': 'foo'})
id_bar = self.partner.create(self.cr, UID, {'name': 'bar'})
id_baz = self.partner.create(self.cr, UID, {'name': 'baz', 'city': 'tag'})
results = self.partner.resolve_o2m_commands_to_record_dicts(
self.cr, UID, 'address', [
@@ -96,7 +95,7 @@ class TestO2MSerialization(common.TransactionCase):
def test_mixed_commands(self):
ids = [
self.address.create(self.cr, UID, {'name': name})
self.partner.create(self.cr, UID, {'name': name})
for name in ['NObar', 'baz', 'qux', 'NOquux', 'NOcorge', 'garply']
]
@@ -126,9 +125,9 @@ class TestO2MSerialization(common.TransactionCase):
def test_LINK_TO_pairs(self):
"LINK_TO commands can be written as pairs, instead of triplets"
ids = [
self.address.create(self.cr, UID, {'name': 'foo'}),
self.address.create(self.cr, UID, {'name': 'bar'}),
self.address.create(self.cr, UID, {'name': 'baz'})
self.partner.create(self.cr, UID, {'name': 'foo'}),
self.partner.create(self.cr, UID, {'name': 'bar'}),
self.partner.create(self.cr, UID, {'name': 'baz'})
]
commands = map(lambda id: (4, id), ids)