From 68a34fa59b1770218bd11a992a23890d21ed5645 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 13 Jul 2011 04:36:24 +0000 Subject: [PATCH 1/7] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20110713043624-31prq4kedswel384 --- addons/account_asset/i18n/ca.po | 9 +- addons/account_asset/i18n/de.po | 6 +- addons/account_asset/i18n/es.po | 51 +- addons/account_asset/i18n/fr.po | 6 +- addons/account_asset/i18n/pl.po | 9 +- addons/account_asset/i18n/pt.po | 72 +-- addons/account_asset/i18n/ru.po | 529 ++++++++++++++++++ addons/account_asset/i18n/sv.po | 6 +- .../purchase_double_validation/i18n/zh_CN.po | 86 +++ addons/report_webkit_sample/i18n/zh_CN.po | 148 +++++ 10 files changed, 838 insertions(+), 84 deletions(-) create mode 100644 addons/account_asset/i18n/ru.po create mode 100644 addons/purchase_double_validation/i18n/zh_CN.po create mode 100644 addons/report_webkit_sample/i18n/zh_CN.po diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po index 91c5f554b6d..221100a8d25 100755 --- a/addons/account_asset/i18n/ca.po +++ b/addons/account_asset/i18n/ca.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2010-08-19 15:06+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal @@ -535,6 +535,3 @@ msgstr "Família d'actiu" #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree msgid "Asset Hierarchy" msgstr "Jerarquia d'actius" - -#~ msgid "Childs asset" -#~ msgstr "Actius fills" diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po index 15528329003..3b661604428 100755 --- a/addons/account_asset/i18n/de.po +++ b/addons/account_asset/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2010-01-25 22:30+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po index ad9ad60b5ba..242f16b5bee 100755 --- a/addons/account_asset/i18n/es.po +++ b/addons/account_asset/i18n/es.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2010-08-26 15:53+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal @@ -27,7 +27,7 @@ msgstr "Activos abiertos" #: field:account.asset.property,method_end:0 #: field:account.asset.property.history,method_end:0 msgid "Ending date" -msgstr "" +msgstr "Fecha final" #. module: account_asset #: view:account.asset.asset:0 @@ -50,7 +50,7 @@ msgstr "Activo" #. module: account_asset #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Nombre de modelo no válido en la definición de acción." +msgstr "Nombre de modelo inválido en la definición de acción." #. module: account_asset #: selection:account.asset.property,method:0 @@ -60,12 +60,12 @@ msgstr "Lineal" #. module: account_asset #: view:account.asset.asset:0 msgid "Change duration" -msgstr "cambio de duración" +msgstr "Cambiar duración" #. module: account_asset #: field:account.asset.asset,child_ids:0 msgid "Child assets" -msgstr "" +msgstr "Activos hijos" #. module: account_asset #: field:account.asset.board,value_asset:0 @@ -141,7 +141,7 @@ msgstr "Asiento de dotación a la amortización" #. module: account_asset #: view:account.asset.asset:0 msgid "Methods" -msgstr "" +msgstr "Métodos" #. module: account_asset #: wizard_view:account.asset.modify,init:0 @@ -168,12 +168,12 @@ msgstr "Plazo de amortización" #. module: account_asset #: field:account.asset.property,account_analytic_id:0 msgid "Analytic account" -msgstr "" +msgstr "Cuenta analítica" #. module: account_asset #: field:account.asset.property,state:0 msgid "State" -msgstr "" +msgstr "Provincia" #. module: account_asset #: view:account.asset.asset:0 @@ -183,7 +183,7 @@ msgstr "Metodos de drepreciación" #. module: account_asset #: view:account.asset.asset:0 msgid "Other information" -msgstr "" +msgstr "Otra información" #. module: account_asset #: field:account.asset.board,value_asset_cumul:0 @@ -258,7 +258,7 @@ msgstr "" #: field:account.asset.board,value_gross:0 #: field:account.asset.property,value_total:0 msgid "Gross value" -msgstr "" +msgstr "Valor bruto" #. module: account_asset #: selection:account.asset.property,method_time:0 @@ -311,7 +311,7 @@ msgstr "Normal" #. module: account_asset #: field:account.asset.property,method_progress_factor:0 msgid "Progressif factor" -msgstr "" +msgstr "Factor de progresión" #. module: account_asset #: field:account.asset.asset,localisation:0 @@ -326,7 +326,7 @@ msgstr "metodo de computación" #. module: account_asset #: field:account.asset.property,method_time:0 msgid "Time method" -msgstr "" +msgstr "Método temporal" #. module: account_asset #: field:account.asset.asset,active:0 @@ -341,7 +341,7 @@ msgstr "Usuario" #. module: account_asset #: field:account.asset.asset,property_ids:0 msgid "Asset method name" -msgstr "" +msgstr "Nombre de método de asiento" #. module: account_asset #: field:account.asset.asset,date:0 @@ -352,7 +352,7 @@ msgstr "Fecha" #. module: account_asset #: field:account.asset.board,value_net:0 msgid "Net value" -msgstr "" +msgstr "Valor neto" #. module: account_asset #: wizard_view:account.asset.close,init:0 @@ -368,7 +368,7 @@ msgstr "Historia" #. module: account_asset #: field:account.asset.property,account_actif_id:0 msgid "Depreciation account" -msgstr "" +msgstr "Cuenta de amortización" #. module: account_asset #: field:account.asset.asset,period_id:0 @@ -439,7 +439,7 @@ msgstr "Información general" #. module: account_asset #: field:account.asset.property,journal_analytic_id:0 msgid "Analytic journal" -msgstr "" +msgstr "Diario analítico" #. module: account_asset #: field:account.asset.property,name:0 @@ -459,7 +459,7 @@ msgstr "Nombre histórico" #. module: account_asset #: view:account.asset.asset:0 msgid "Close method" -msgstr "" +msgstr "Método cerrado" #. module: account_asset #: field:account.asset.property,entry_asset_ids:0 @@ -477,18 +477,18 @@ msgstr "Categoría de activo" #. module: account_asset #: view:account.asset.asset:0 msgid "Depreciation" -msgstr "" +msgstr "Amortización" #. module: account_asset #: field:account.asset.asset,code:0 #: field:account.asset.category,code:0 msgid "Asset code" -msgstr "" +msgstr "Código de activo" #. module: account_asset #: field:account.asset.asset,value_total:0 msgid "Total value" -msgstr "" +msgstr "Valor total" #. module: account_asset #: selection:account.asset.asset,state:0 @@ -508,7 +508,7 @@ msgstr "Secuencia" #. module: account_asset #: field:account.asset.property,value_residual:0 msgid "Residual value" -msgstr "" +msgstr "Valor residual" #. module: account_asset #: wizard_button:account.asset.close,init,asset_close:0 @@ -528,13 +528,10 @@ msgstr "Indirecto" #. module: account_asset #: field:account.asset.asset,parent_id:0 msgid "Parent asset" -msgstr "" +msgstr "Activo padre" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree msgid "Asset Hierarchy" msgstr "Jerarquía de activos" - -#~ msgid "Childs asset" -#~ msgstr "Activos hijos" diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po index 4b5b40017be..470139e0958 100755 --- a/addons/account_asset/i18n/fr.po +++ b/addons/account_asset/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2011-01-02 14:36+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po index 03fc1678cef..6783d6f0429 100755 --- a/addons/account_asset/i18n/pl.po +++ b/addons/account_asset/i18n/pl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2010-07-06 06:42+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: Kirti Savalia(OpenERP) \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal @@ -535,6 +535,3 @@ msgstr "Środek nadrzędny" #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree msgid "Asset Hierarchy" msgstr "Hierarchia środków" - -#~ msgid "Childs asset" -#~ msgstr "Środki podrzędne" diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po index e0ad3768283..39dfcc6ed55 100755 --- a/addons/account_asset/i18n/pt.po +++ b/addons/account_asset/i18n/pt.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2010-11-18 16:57+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal @@ -55,7 +55,7 @@ msgstr "Nome do modelo inválido na definição da acção." #. module: account_asset #: selection:account.asset.property,method:0 msgid "Linear" -msgstr "" +msgstr "Linear" #. module: account_asset #: view:account.asset.asset:0 @@ -65,12 +65,12 @@ msgstr "" #. module: account_asset #: field:account.asset.asset,child_ids:0 msgid "Child assets" -msgstr "" +msgstr "Activos filho" #. module: account_asset #: field:account.asset.board,value_asset:0 msgid "Asset Value" -msgstr "" +msgstr "Valor do Imobilizado" #. module: account_asset #: wizard_field:account.asset.modify,init,name:0 @@ -87,7 +87,7 @@ msgstr "Movimentos" #. module: account_asset #: wizard_view:account.asset.compute,asset_compute:0 msgid "Generated entries" -msgstr "Gerar movimentos" +msgstr "Movimentos gerados" #. module: account_asset #: wizard_field:account.asset.modify,init,method_delay:0 @@ -131,7 +131,7 @@ msgstr "Notas" #. module: account_asset #: view:account.asset.asset:0 msgid "Change history" -msgstr "" +msgstr "Histórico de alterações" #. module: account_asset #: view:account.asset.asset:0 @@ -141,12 +141,12 @@ msgstr "" #. module: account_asset #: view:account.asset.asset:0 msgid "Methods" -msgstr "" +msgstr "Métodos" #. module: account_asset #: wizard_view:account.asset.modify,init:0 msgid "Asset properties to modify" -msgstr "" +msgstr "Propriedades do activo a modificar" #. module: account_asset #: field:account.asset.asset,partner_id:0 @@ -168,12 +168,12 @@ msgstr "" #. module: account_asset #: field:account.asset.property,account_analytic_id:0 msgid "Analytic account" -msgstr "" +msgstr "Conta analítica" #. module: account_asset #: field:account.asset.property,state:0 msgid "State" -msgstr "" +msgstr "Estado" #. module: account_asset #: view:account.asset.asset:0 @@ -183,7 +183,7 @@ msgstr "" #. module: account_asset #: view:account.asset.asset:0 msgid "Other information" -msgstr "" +msgstr "Outra informação" #. module: account_asset #: field:account.asset.board,value_asset_cumul:0 @@ -212,7 +212,7 @@ msgstr "" #: model:ir.actions.wizard,name:account_asset.wizard_asset_compute #: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute msgid "Compute assets" -msgstr "Processados activos" +msgstr "Processar activos" #. module: account_asset #: wizard_view:account.asset.modify,init:0 @@ -224,7 +224,7 @@ msgstr "Modificar activo" #. module: account_asset #: view:account.asset.asset:0 msgid "Confirm asset" -msgstr "" +msgstr "Confirmar activo" #. module: account_asset #: view:account.asset.property.history:0 @@ -235,7 +235,7 @@ msgstr "Histórico de activos" #. module: account_asset #: field:account.asset.property,date:0 msgid "Date created" -msgstr "" +msgstr "Data de criação" #. module: account_asset #: model:ir.module.module,description:account_asset.module_meta_information @@ -258,17 +258,17 @@ msgstr "" #: field:account.asset.board,value_gross:0 #: field:account.asset.property,value_total:0 msgid "Gross value" -msgstr "" +msgstr "Valor ilíquido" #. module: account_asset #: selection:account.asset.property,method_time:0 msgid "Ending period" -msgstr "" +msgstr "Período final" #. module: account_asset #: field:account.asset.board,name:0 msgid "Asset name" -msgstr "" +msgstr "Nome do activo" #. module: account_asset #: view:account.asset.asset:0 @@ -296,7 +296,7 @@ msgstr "" #. module: account_asset #: field:account.asset.property,account_asset_id:0 msgid "Asset account" -msgstr "" +msgstr "Conta do activo" #. module: account_asset #: field:account.asset.property.history,asset_property_id:0 @@ -321,7 +321,7 @@ msgstr "Localização" #. module: account_asset #: field:account.asset.property,method:0 msgid "Computation method" -msgstr "" +msgstr "Método de cálculo" #. module: account_asset #: field:account.asset.property,method_time:0 @@ -352,7 +352,7 @@ msgstr "Data" #. module: account_asset #: field:account.asset.board,value_net:0 msgid "Net value" -msgstr "" +msgstr "Valor líquido" #. module: account_asset #: wizard_view:account.asset.close,init:0 @@ -374,7 +374,7 @@ msgstr "" #: field:account.asset.asset,period_id:0 #: wizard_field:account.asset.compute,init,period_id:0 msgid "Period" -msgstr "Periodo" +msgstr "Período" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form @@ -434,7 +434,7 @@ msgstr "" #. module: account_asset #: wizard_view:account.asset.close,init:0 msgid "General information" -msgstr "Informação Geral" +msgstr "Informação geral" #. module: account_asset #: field:account.asset.property,journal_analytic_id:0 @@ -444,7 +444,7 @@ msgstr "" #. module: account_asset #: field:account.asset.property,name:0 msgid "Method name" -msgstr "Nome do Método" +msgstr "Nome do método" #. module: account_asset #: field:account.asset.property,journal_id:0 @@ -459,12 +459,12 @@ msgstr "Nome de História" #. module: account_asset #: view:account.asset.asset:0 msgid "Close method" -msgstr "" +msgstr "Método de fecho" #. module: account_asset #: field:account.asset.property,entry_asset_ids:0 msgid "Asset Entries" -msgstr "" +msgstr "Entradas de Activos" #. module: account_asset #: field:account.asset.asset,category_id:0 @@ -483,12 +483,12 @@ msgstr "" #: field:account.asset.asset,code:0 #: field:account.asset.category,code:0 msgid "Asset code" -msgstr "" +msgstr "Código de imobilizado" #. module: account_asset #: field:account.asset.asset,value_total:0 msgid "Total value" -msgstr "" +msgstr "Valor total" #. module: account_asset #: selection:account.asset.asset,state:0 @@ -503,35 +503,35 @@ msgstr "Informações Gerais" #. module: account_asset #: field:account.asset.asset,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sequência" #. module: account_asset #: field:account.asset.property,value_residual:0 msgid "Residual value" -msgstr "" +msgstr "Valor residual" #. module: account_asset #: wizard_button:account.asset.close,init,asset_close:0 msgid "End of asset" -msgstr "" +msgstr "Fim do activo" #. module: account_asset #: selection:account.asset.property,type:0 msgid "Direct" -msgstr "" +msgstr "Directo" #. module: account_asset #: selection:account.asset.property,type:0 msgid "Indirect" -msgstr "" +msgstr "Indirecto" #. module: account_asset #: field:account.asset.asset,parent_id:0 msgid "Parent asset" -msgstr "" +msgstr "Activo pai" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree msgid "Asset Hierarchy" -msgstr "" +msgstr "Hierarquia de Activos" diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po new file mode 100644 index 00000000000..70a3a1b2af5 --- /dev/null +++ b/addons/account_asset/i18n/ru.po @@ -0,0 +1,529 @@ +# Russian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:54+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Open Assets" +msgstr "Открытые основные средства" + +#. module: account_asset +#: field:account.asset.property,method_end:0 +#: field:account.asset.property.history,method_end:0 +msgid "Ending date" +msgstr "Дата окончания" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation board" +msgstr "Панель амортизации" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,name:0 +#: field:account.asset.board,asset_id:0 +#: field:account.asset.property,asset_id:0 +#: field:account.invoice.line,asset_id:0 +#: field:account.move.line,asset_id:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.model,name:account_asset.model_account_asset_asset +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +msgid "Asset" +msgstr "Основное средство" + +#. module: account_asset +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия" + +#. module: account_asset +#: selection:account.asset.property,method:0 +msgid "Linear" +msgstr "Линейный" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change duration" +msgstr "Изменение длительности" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Child assets" +msgstr "Потомок основных средств" + +#. module: account_asset +#: field:account.asset.board,value_asset:0 +msgid "Asset Value" +msgstr "Значение основного средства" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,name:0 +msgid "Reason" +msgstr "Причина" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,entry_ids:0 +#: wizard_field:account.asset.compute,asset_compute,move_ids:0 +msgid "Entries" +msgstr "Записи" + +#. module: account_asset +#: wizard_view:account.asset.compute,asset_compute:0 +msgid "Generated entries" +msgstr "Создано записей" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,method_delay:0 +#: field:account.asset.property,method_delay:0 +#: field:account.asset.property.history,method_delay:0 +msgid "Number of interval" +msgstr "Количество интервала" + +#. module: account_asset +#: wizard_button:account.asset.compute,asset_compute,asset_open:0 +msgid "Open entries" +msgstr "Открытые записи" + +#. module: account_asset +#: view:account.asset.asset:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list +#: model:ir.ui.menu,name:account_asset.menu_finance_Assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_Assets +msgid "Assets" +msgstr "Основные средства" + +#. module: account_asset +#: selection:account.asset.property,method:0 +msgid "Progressive" +msgstr "Прогрессивный" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_draft +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_draft +msgid "Draft Assets" +msgstr "Черновик основного средства" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +#: wizard_field:account.asset.modify,init,note:0 +#: view:account.asset.property.history:0 +msgid "Notes" +msgstr "Примечания" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change history" +msgstr "История изменений" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation entries" +msgstr "Записи амортизации" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Methods" +msgstr "Методы" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +msgid "Asset properties to modify" +msgstr "Изменить свойства основного средства" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +msgid "Partner" +msgstr "Контрагент" + +#. module: account_asset +#: wizard_field:account.asset.modify,init,method_period:0 +#: field:account.asset.property,method_period:0 +#: field:account.asset.property.history,method_period:0 +msgid "Period per interval" +msgstr "Периодов на интервал" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation duration" +msgstr "Длительность амортизации" + +#. module: account_asset +#: field:account.asset.property,account_analytic_id:0 +msgid "Analytic account" +msgstr "Счет аналитики" + +#. module: account_asset +#: field:account.asset.property,state:0 +msgid "State" +msgstr "Область/штат" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation methods" +msgstr "Медот амортизации" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other information" +msgstr "Прочая информация" + +#. module: account_asset +#: field:account.asset.board,value_asset_cumul:0 +msgid "Cumul. value" +msgstr "Значения кумуляции" + +#. module: account_asset +#: view:account.asset.property:0 +msgid "Assets methods" +msgstr "Методы основных средств" + +#. module: account_asset +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_property +msgid "Asset property" +msgstr "Свойство основного средства" + +#. module: account_asset +#: wizard_view:account.asset.compute,asset_compute:0 +#: wizard_view:account.asset.compute,init:0 +#: wizard_button:account.asset.compute,init,asset_compute:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +#: model:ir.ui.menu,name:account_asset.menu_wizard_asset_compute +msgid "Compute assets" +msgstr "Начислить амортизацию" + +#. module: account_asset +#: wizard_view:account.asset.modify,init:0 +#: wizard_button:account.asset.modify,init,asset_modify:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "Изменить основное средство" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm asset" +msgstr "В рабочее состояние" + +#. module: account_asset +#: view:account.asset.property.history:0 +#: model:ir.model,name:account_asset.model_account_asset_property_history +msgid "Asset history" +msgstr "История основного средства" + +#. module: account_asset +#: field:account.asset.property,date:0 +msgid "Date created" +msgstr "Дата создания" + +#. module: account_asset +#: model:ir.module.module,description:account_asset.module_meta_information +msgid "" +"Financial and accounting asset management.\n" +" Allows to define\n" +" * Asset category. \n" +" * Assets.\n" +" *Asset usage period and property.\n" +" " +msgstr "" + +#. module: account_asset +#: field:account.asset.board,value_gross:0 +#: field:account.asset.property,value_total:0 +msgid "Gross value" +msgstr "Первоначальная стоимость" + +#. module: account_asset +#: selection:account.asset.property,method_time:0 +msgid "Ending period" +msgstr "Окончание периода" + +#. module: account_asset +#: field:account.asset.board,name:0 +msgid "Asset name" +msgstr "Наименование основного средства" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Accounts information" +msgstr "Информация счетов" + +#. module: account_asset +#: field:account.asset.asset,note:0 +#: field:account.asset.category,note:0 +#: field:account.asset.property.history,note:0 +msgid "Note" +msgstr "Примечание" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: selection:account.asset.property,state:0 +msgid "Draft" +msgstr "Черновик" + +#. module: account_asset +#: field:account.asset.property,type:0 +msgid "Depr. method type" +msgstr "Метод начисления амортизации" + +#. module: account_asset +#: field:account.asset.property,account_asset_id:0 +msgid "Asset account" +msgstr "Счет основного средства" + +#. module: account_asset +#: field:account.asset.property.history,asset_property_id:0 +msgid "Method" +msgstr "Метод" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +msgid "Normal" +msgstr "Нормально" + +#. module: account_asset +#: field:account.asset.property,method_progress_factor:0 +msgid "Progressif factor" +msgstr "Фактор прогресса" + +#. module: account_asset +#: field:account.asset.asset,localisation:0 +msgid "Localisation" +msgstr "Локализация" + +#. module: account_asset +#: field:account.asset.property,method:0 +msgid "Computation method" +msgstr "Способ расчета" + +#. module: account_asset +#: field:account.asset.property,method_time:0 +msgid "Time method" +msgstr "Временной метод" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "Активное" + +#. module: account_asset +#: field:account.asset.property.history,user_id:0 +msgid "User" +msgstr "Пользователь" + +#. module: account_asset +#: field:account.asset.asset,property_ids:0 +msgid "Asset method name" +msgstr "Имя метода" + +#. module: account_asset +#: field:account.asset.asset,date:0 +#: field:account.asset.property.history,date:0 +msgid "Date" +msgstr "Дата" + +#. module: account_asset +#: field:account.asset.board,value_net:0 +msgid "Net value" +msgstr "Значение нетто" + +#. module: account_asset +#: wizard_view:account.asset.close,init:0 +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "Закрытое основное средство" + +#. module: account_asset +#: field:account.asset.property,history_ids:0 +msgid "History" +msgstr "История" + +#. module: account_asset +#: field:account.asset.property,account_actif_id:0 +msgid "Depreciation account" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,period_id:0 +#: wizard_field:account.asset.compute,init,period_id:0 +msgid "Period" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_category_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_category_form +msgid "Asset Category" +msgstr "" + +#. module: account_asset +#: wizard_button:account.asset.close,init,end:0 +#: wizard_button:account.asset.compute,init,end:0 +#: wizard_button:account.asset.modify,init,end:0 +msgid "Cancel" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +#: wizard_button:account.asset.compute,asset_compute,end:0 +#: selection:account.asset.property,state:0 +msgid "Close" +msgstr "" + +#. module: account_asset +#: selection:account.asset.property,state:0 +msgid "Open" +msgstr "" + +#. module: account_asset +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: account_asset +#: model:ir.module.module,shortdesc:account_asset.module_meta_information +msgid "Asset management" +msgstr "" + +#. module: account_asset +#: view:account.asset.board:0 +#: field:account.asset.property,board_ids:0 +#: model:ir.model,name:account_asset.model_account_asset_board +msgid "Asset board" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,state:0 +msgid "Global state" +msgstr "" + +#. module: account_asset +#: selection:account.asset.property,method_time:0 +msgid "Delay" +msgstr "" + +#. module: account_asset +#: wizard_view:account.asset.close,init:0 +msgid "General information" +msgstr "" + +#. module: account_asset +#: field:account.asset.property,journal_analytic_id:0 +msgid "Analytic journal" +msgstr "" + +#. module: account_asset +#: field:account.asset.property,name:0 +msgid "Method name" +msgstr "" + +#. module: account_asset +#: field:account.asset.property,journal_id:0 +msgid "Journal" +msgstr "" + +#. module: account_asset +#: field:account.asset.property.history,name:0 +msgid "History name" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Close method" +msgstr "" + +#. module: account_asset +#: field:account.asset.property,entry_asset_ids:0 +msgid "Asset Entries" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 +#: view:account.asset.category:0 +#: field:account.asset.category,name:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,code:0 +#: field:account.asset.category,code:0 +msgid "Asset code" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,value_total:0 +msgid "Total value" +msgstr "" + +#. module: account_asset +#: selection:account.asset.asset,state:0 +msgid "View" +msgstr "" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General info" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: account_asset +#: field:account.asset.property,value_residual:0 +msgid "Residual value" +msgstr "" + +#. module: account_asset +#: wizard_button:account.asset.close,init,asset_close:0 +msgid "End of asset" +msgstr "" + +#. module: account_asset +#: selection:account.asset.property,type:0 +msgid "Direct" +msgstr "" + +#. module: account_asset +#: selection:account.asset.property,type:0 +msgid "Indirect" +msgstr "" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent asset" +msgstr "" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "" diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po index b10a911c2bb..1146496a9c4 100755 --- a/addons/account_asset/i18n/sv.po +++ b/addons/account_asset/i18n/sv.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-11-24 12:54+0000\n" -"PO-Revision-Date: 2010-11-22 23:42+0000\n" +"PO-Revision-Date: 2011-07-12 12:04+0000\n" "Last-Translator: Olivier Dony (OpenERP) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-01-18 05:22+0000\n" -"X-Generator: Launchpad (build 12177)\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po new file mode 100644 index 00000000000..91894013962 --- /dev/null +++ b/addons/purchase_double_validation/i18n/zh_CN.po @@ -0,0 +1,86 @@ +# Chinese (Simplified) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-07-12 17:47+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "Purchase Application Configuration" +msgstr "采购应用设置" + +#. module: purchase_double_validation +#: field:purchase.double.validation.installer,progress:0 +msgid "Configuration Progress" +msgstr "设置进度" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "Define minimum amount after which puchase is needed to be validated." +msgstr "定义最低金额后采购需要复核" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "title" +msgstr "标题" + +#. module: purchase_double_validation +#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information +msgid "purchase_double_validation" +msgstr "purchase_double_validation" + +#. module: purchase_double_validation +#: field:purchase.double.validation.installer,config_logo:0 +msgid "Image" +msgstr "图像" + +#. module: purchase_double_validation +#: model:ir.module.module,description:purchase_double_validation.module_meta_information +msgid "" +"\n" +"\tThis module modifies the purchase workflow in order to validate purchases " +"that exceeds minimum amount set by configuration wizard\n" +" " +msgstr "" +"\n" +"\t这模块修改采购的工作流程订单要复核采购超过设定的最低金额\n" +" " + +#. module: purchase_double_validation +#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount +#: view:purchase.double.validation.installer:0 +msgid "Configure Limit Amount for Purchase" +msgstr "设置采购的限定金额" + +#. module: purchase_double_validation +#: view:purchase.double.validation.installer:0 +msgid "res_config_contents" +msgstr "res_config_contents" + +#. module: purchase_double_validation +#: help:purchase.double.validation.installer,limit_amount:0 +msgid "Maximum amount after which validation of purchase is required." +msgstr "在设定最低金额后采购复核是必须的" + +#. module: purchase_double_validation +#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer +msgid "purchase.double.validation.installer" +msgstr "purchase.double.validation.installer" + +#. module: purchase_double_validation +#: field:purchase.double.validation.installer,limit_amount:0 +msgid "Maximum Purchase Amount" +msgstr "最低采购金额" diff --git a/addons/report_webkit_sample/i18n/zh_CN.po b/addons/report_webkit_sample/i18n/zh_CN.po new file mode 100644 index 00000000000..3ff9715435b --- /dev/null +++ b/addons/report_webkit_sample/i18n/zh_CN.po @@ -0,0 +1,148 @@ +# Chinese (Simplified) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:16+0000\n" +"PO-Revision-Date: 2011-07-12 19:36+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Chinese (Simplified) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-07-13 04:36+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: report_webkit_sample +#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html +msgid "WebKit invoice" +msgstr "WebKit 发票" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:35 +msgid "Supplier Invoice" +msgstr "供应商发票" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:49 +msgid "Unit Price" +msgstr "单价" + +#. module: report_webkit_sample +#: model:ir.module.module,description:report_webkit_sample.module_meta_information +msgid "" +"Samples for Webkit Report Engine (report_webkit module).\n" +"\n" +" A sample invoice report is included in this module, as well as a wizard " +"to\n" +" add Webkit Report entries on any Document in the system.\n" +" \n" +" You have to create the print buttons by calling the wizard. For more " +"details see:\n" +" http://files.me.com/nbessi/06n92k.mov \n" +" " +msgstr "" +"Webkit 报表引擎示例( Webkit 模块)\n" +" 在这模块里除包含一个发票报表例子还有一在系统任何文档里加入 Webkit 报表引擎的向导。\n" +" \n" +" 您必须要调用向导创建打印按钮，如更详细的资料请看：http://files.me.com/nbessi/06n92k.mov \n" +" " + +#. module: report_webkit_sample +#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information +msgid "Webkit Report Samples" +msgstr "Webkit报表例子" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:49 +msgid "Disc.(%)" +msgstr "折扣(%)" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:22 +msgid "Fax" +msgstr "传真" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:44 +msgid "Document" +msgstr "单据" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:49 +msgid "Description" +msgstr "说明" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:49 +msgid "Price" +msgstr "价格" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:44 +msgid "Invoice Date" +msgstr "发票日期" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:49 +msgid "QTY" +msgstr "数量" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:64 +msgid "Base" +msgstr "税基" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:44 +msgid "Partner Ref." +msgstr "业务伙伴" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:49 +msgid "Taxes" +msgstr "税" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:64 +msgid "Amount" +msgstr "金额" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:28 +msgid "VAT" +msgstr "增值税" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:37 +msgid "Refund" +msgstr "红字发票" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:19 +msgid "Tel" +msgstr "电话" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:25 +msgid "E-mail" +msgstr "电子邮件" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:33 +msgid "Invoice" +msgstr "发票" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:39 +msgid "Supplier Refund" +msgstr "供应商红字发票" + +#. module: report_webkit_sample +#: report:report.webkitaccount.invoice:76 +msgid "Total" +msgstr "总计" From d45e291329edc2e980650a73bae1515c4a3bd043 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 13 Jul 2011 11:20:03 +0200 Subject: [PATCH 2/7] [FIX] name of ordering param in read_group docstring: it's orderby not order bzr revid: xmo@openerp.com-20110713092003-83ot1xsivziy4p33 --- openerp/osv/orm.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 0c03c3e3f80..ff0d17af47a 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -2496,9 +2496,10 @@ class orm(orm_template): :param int offset: optional number of records to skip :param int limit: optional max number of records to return :param dict context: context arguments, like lang, time zone - :param order: optional ``order by`` specification, for overriding the natural - sort ordering of the groups, see also :py:meth:`~osv.osv.osv.search` - (supported only for many2one fields currently) + :param list orderby: optional ``order by`` specification, for + overriding the natural sort ordering of the + groups, see also :py:meth:`~osv.osv.osv.search` + (supported only for many2one fields currently) :return: list of dictionaries(one dictionary for each record) containing: * the values of fields grouped by the fields in ``groupby`` argument From b29106581fbbcba48b2c7dc49336b1de8cd06b16 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 13 Jul 2011 11:44:11 +0200 Subject: [PATCH 3/7] [imp] added popup to read & modify a record and used it in m2o (also some fix related to relations) bzr revid: nicolas.vanhoren@openerp.com-20110713094411-wrbaa6m4zewm521m --- addons/base/static/src/js/data.js | 4 +- addons/base/static/src/js/form.js | 76 +++++++++++++++++++++++++---- addons/base/static/src/xml/base.xml | 10 +++- 3 files changed, 78 insertions(+), 12 deletions(-) diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index 534fd356f06..a49e6cf901f 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -584,12 +584,12 @@ openerp.base.ReadOnlyDataSetSearch = openerp.base.DataSetSearch.extend({ }, on_create: function(data) {}, write: function (id, data, callback) { - this.on_write(id); + this.on_write(id, data); var to_return = $.Deferred().then(callback); setTimeout(function () {to_return.resolve({"result": true});}, 0); return to_return.promise(); }, - on_write: function(id) {}, + on_write: function(id, data) {}, unlink: function(ids, callback, error_callback) { this.on_unlink(ids); var to_return = $.Deferred().then(callback); diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 7faa942c6b0..d6e9fe35a5a 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1267,14 +1267,8 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ if (!self.value) { return; } - self.session.action_manager.do_action({ - "res_model": self.field.relation, - "views":[[false,"form"]], - "res_id": self.value[0], - "type":"ir.actions.act_window", - "target":"new", - "context": self.build_context() - }); + var pop = new openerp.base.form.FormOpenPopup(null, self.view.session); + pop.show_element(self.field.relation, self.value[0],self.build_context(), {}); }; var cmenu = this.$menu_btn.contextMenu(this.cm_id, {'leftClickToo': true, bindings: bindings, itemStyle: {"color": ""}, @@ -1885,7 +1879,7 @@ openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({ return; var self = this; var wdataset = new openerp.base.DataSetSearch(this.session, this.model, this.context, this.domain); - wdataset = this.options.parent_view; + wdataset.parent_view = this.options.parent_view; wdataset.create(data, function(r) { self.on_select_elements([r.result]); }); @@ -1945,6 +1939,70 @@ openerp.base.form.SelectCreateListView = openerp.base.ListView.extend({ } }); +openerp.base.form.FormOpenPopup = openerp.base.BaseWidget.extend({ + identifier_prefix: "formopenpopup", + template: "FormOpenPopup", + /** + * options: + * - alternative_form_view + * - auto_write (default true) + * - parent_view + */ + show_element: function(model, row_id, context, options) { + this.model = model; + this.row_id = row_id; + this.context = context || {}; + this.options = _.defaults(options || {}, {"auto_write": true}); + jQuery(this.render()).dialog({title: '', + modal: true, + width: 960, + height: 600}); + this.start(); + }, + start: function() { + this._super(); + this.dataset = new openerp.base.ReadOnlyDataSetSearch(this.session, this.model, + this.context); + this.dataset.ids = [this.row_id]; + this.dataset.index = 0; + this.dataset.parent_view = this.options.parent_view; + this.setup_form_view(); + }, + on_write: function(id, data) { + if (!this.options.auto_write) + return; + var self = this; + var wdataset = new openerp.base.DataSetSearch(this.session, this.model, this.context, this.domain); + wdataset.parent_view = this.options.parent_view; + wdataset.write(id, data, function(r) { + self.stop(); + }); + }, + setup_form_view: function() { + var self = this; + this.view_form = new openerp.base.FormView(null, this.session, + this.element_id + "_view_form", this.dataset, false); + if (this.options.alternative_form_view) { + this.view_form.set_embedded_view(this.options.alternative_form_view); + } + this.view_form.start(); + this.view_form.on_loaded.add_last(function() { + var $buttons = self.view_form.$element.find(".oe_form_buttons"); + $buttons.html(QWeb.render("FormOpenPopup.form.buttons")); + var $nbutton = $buttons.find(".oe_formopenpopup-form-save"); + $nbutton.click(function() { + self.view_form.do_save(); + }); + var $cbutton = $buttons.find(".oe_formopenpopup-form-close"); + $cbutton.click(function() { + self.stop(); + }); + self.view_form.do_show(); + }); + this.dataset.on_write.add(this.on_write); + } +}); + openerp.base.form.FieldReference = openerp.base.form.Field.extend({ init: function(view, node) { this._super(view, node); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 6d075e6972a..603c75cdb74 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -908,7 +908,15 @@ - + +
+
+
+ + + + + $(document.createElement('t')) From 289ec3545b07ca24f627782952327379a489f06c Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 13 Jul 2011 11:53:52 +0200 Subject: [PATCH 4/7] [fix] when modify a record in a m2o, does not reload the name of the record bzr revid: nicolas.vanhoren@openerp.com-20110713095352-qcbmhca6r4bvx1j3 --- addons/base/static/src/js/form.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index d6e9fe35a5a..90c8cc0dec4 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1269,6 +1269,9 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ } var pop = new openerp.base.form.FormOpenPopup(null, self.view.session); pop.show_element(self.field.relation, self.value[0],self.build_context(), {}); + pop.on_write_completed.add_last(function() { + self.set_value(self.value[0]); + }); }; var cmenu = this.$menu_btn.contextMenu(this.cm_id, {'leftClickToo': true, bindings: bindings, itemStyle: {"color": ""}, @@ -1976,8 +1979,10 @@ openerp.base.form.FormOpenPopup = openerp.base.BaseWidget.extend({ wdataset.parent_view = this.options.parent_view; wdataset.write(id, data, function(r) { self.stop(); + self.on_write_completed(); }); }, + on_write_completed: function() {}, setup_form_view: function() { var self = this; this.view_form = new openerp.base.FormView(null, this.session, From 0485c630de9ebd42eaf241e286853458369a0a87 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 13 Jul 2011 11:59:49 +0200 Subject: [PATCH 5/7] [imp] used the form open popup in m2m bzr revid: nicolas.vanhoren@openerp.com-20110713095949-242ibznw1f0qfwet --- addons/base/static/src/js/form.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 90c8cc0dec4..59b1e07e8e4 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1785,15 +1785,11 @@ openerp.base.form.Many2ManyListView = openerp.base.ListView.extend({ }); }, do_activate_record: function(index, id) { - this.m2m_field.view.session.action_manager.do_action({ - "res_model": this.dataset.model, - "views": [[false,"form"]], - "res_id": id, - "type": "ir.actions.act_window", - "view_type": "form", - "view_mode": "form", - "target": "new", - "context": this.m2m_field.build_context() + var self = this; + var pop = new openerp.base.form.FormOpenPopup(null, this.m2m_field.view.session); + pop.show_element(this.dataset.model, id, this.m2m_field.build_context(), {}); + pop.on_write_completed.add_last(function() { + self.reload_content(); }); } }); From 3acbdf8153c3ae9ea29119f82c53832f85574e54 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Wed, 13 Jul 2011 12:26:12 +0200 Subject: [PATCH 6/7] add --db-filter option bzr revid: al@openerp.com-20110713102612-0lu8s1ausql3j07s --- addons/base/controllers/main.py | 33 +++++++++++++++++------------ addons/base/static/src/js/chrome.js | 2 +- openerpweb/openerpweb.py | 20 ++++++++--------- 3 files changed, 31 insertions(+), 24 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 1abfaa7c323..0edfe7ccdda 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import base64 -import glob, os +import base64, glob, os, re from xml.etree import ElementTree from cStringIO import StringIO @@ -55,6 +54,20 @@ class Xml2Json: # OpenERP Web base Controllers #---------------------------------------------------------- +class Database(openerpweb.Controller): + _cp_path = "/base/database" + + @openerpweb.jsonrequest + def get_databases_list(self, req): + proxy = req.session.proxy("db") + dbs = proxy.list() + h = req.httprequest.headers['Host'].split(':')[0] + d = h.split(':')[0] + r = cherrypy.config['openerp.dbfilter'].replace('%h',h).replace('%d',d) + print "h,d",h,d,r + dbs = [i for i in dbs if re.match(r,i)] + return {"db_list": dbs} + class Session(openerpweb.Controller): _cp_path = "/base/session" @@ -103,13 +116,6 @@ class Session(openerpweb.Controller): return req.session.model('ir.ui.view_sc').get_sc(req.session._uid, "ir.ui.menu", req.session.eval_context(req.context)) - @openerpweb.jsonrequest - def get_databases_list(self, req): - proxy = req.session.proxy("db") - dbs = proxy.list() - - return {"db_list": dbs} - @openerpweb.jsonrequest def modules(self, req): return {"modules": [name @@ -230,14 +236,14 @@ class Session(openerpweb.Controller): if not saved_actions: return None return saved_actions["actions"].get(key) - + def eval_context_and_domain(session, context, domain=None): e_context = session.eval_context(context) # should we give the evaluated context as an evaluation context to the domain? e_domain = session.eval_domain(domain or []) return e_context, e_domain - + def load_actions_from_ir_values(req, key, key2, models, meta, context): Values = req.session.model('ir.values') actions = Values.get(key, key2, models, meta, context) @@ -301,7 +307,6 @@ def generate_views(action): return action['views'] = [(view_id, view_modes[0])] - def fix_view_modes(action): """ For historical reasons, OpenERP has weird dealings in relation to view_mode and the view_type attribute (on window actions): @@ -545,7 +550,7 @@ class View(openerpweb.Controller): # todo fme?: check that we should pass the evaluated context here self.process_view(request.session, fvg, context, transform) return fvg - + def process_view(self, session, fvg, context, transform): # depending on how it feels, xmlrpclib.ServerProxy can translate # XML-RPC strings to ``str`` or ``unicode``. ElementTree does not @@ -809,3 +814,5 @@ class Action(openerpweb.Controller): def run(self, req, action_id): return clean_action(req.session.model('ir.actions.server').run( [action_id], req.session.eval_context(req.context)), req.session) + +# diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index ebaf457daa2..0e07b62ae39 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -930,7 +930,7 @@ openerp.base.Login = openerp.base.Controller.extend({ }, start: function() { var self = this; - this.rpc("/base/session/get_databases_list", {}, function(result) { + this.rpc("/base/database/get_databases_list", {}, function(result) { self.db_list = result.db_list; self.display(); }, function() { diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index f567cf1b812..ee75ac0b1f9 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -270,6 +270,9 @@ class JsonRequest(object): self.request = request self.params = request.get("params", {}) self.applicationsession = applicationsession + self.httprequest = cherrypy.request + self.httpresponse = cherrypy.response + self.httpsession = cherrypy.session self.httpsession_id = "cookieid" self.httpsession = cherrypy.session self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex @@ -454,22 +457,19 @@ def main(argv): os.environ["TZ"] = "UTC" DEFAULT_CONFIG = { - 'openerp.server.host': '127.0.0.1', - 'openerp.server.port': 8069, - 'server.socket_port': 8002, 'server.socket_host': '0.0.0.0', 'tools.sessions.on': True, 'tools.sessions.storage_type': 'file', - 'tools.sessions.storage_path': os.path.join(tempfile.gettempdir(), "cpsessions"), 'tools.sessions.timeout': 60 } # Parse config op = optparse.OptionParser() - op.add_option("-p", "--port", dest="server.socket_port", help="listening port", type="int", metavar="NUMBER") - op.add_option("-s", "--session-path", dest="tools.sessions.storage_path", help="directory used for session storage", metavar="DIR") - op.add_option("--server-host", dest="openerp.server.host", help="OpenERP server hostname", metavar="HOST") - op.add_option("--server-port", dest="openerp.server.port", help="OpenERP server port", type="int", metavar="NUMBER") + op.add_option("-p", "--port", dest="server.socket_port", default=8002, help="listening port", type="int", metavar="NUMBER") + op.add_option("-s", "--session-path", dest="tools.sessions.storage_path", default=os.path.join(tempfile.gettempdir(), "cpsessions"), help="directory used for session storage", metavar="DIR") + op.add_option("--server-host", dest="openerp.server.host", default='127.0.0.1', help="OpenERP server hostname", metavar="HOST") + op.add_option("--server-port", dest="openerp.server.port", default=8069, help="OpenERP server port", type="int", metavar="NUMBER") + op.add_option("--db-filter", dest="openerp.dbfilter", default='.*', help="Filter listed database", metavar="REGEXP") (o, args) = op.parse_args(argv[1:]) o = vars(o) for k in o.keys(): @@ -480,8 +480,8 @@ def main(argv): cherrypy.tree.mount(Root()) cherrypy.config.update(config=DEFAULT_CONFIG) - if os.path.exists(os.path.join(os.path.dirname( os.path.dirname(__file__)),'openerp-web.cfg')): - cherrypy.config.update(os.path.join(os.path.dirname( os.path.dirname(__file__)),'openerp-web.cfg')) + if os.path.exists(os.path.join(path_root,'openerp-web.cfg')): + cherrypy.config.update(os.path.join(path_root,'openerp-web.cfg')) if os.path.exists(os.path.expanduser('~/.openerp_webrc')): cherrypy.config.update(os.path.expanduser('~/.openerp_webrc')) cherrypy.config.update(o) From 98cd4261d2ba20741706cb99cf8336b926954fe1 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 13 Jul 2011 12:35:00 +0200 Subject: [PATCH 7/7] [IMP] Dashboard: do not instantiate ActionManager, use ViewManagerAction instead bzr revid: fme@openerp.com-20110713103500-v5w0lnskfj1w3r5x --- addons/base_dashboard/static/src/js/dashboard.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js index fe52f1affd9..1e0a8d22a80 100644 --- a/addons/base_dashboard/static/src/js/dashboard.js +++ b/addons/base_dashboard/static/src/js/dashboard.js @@ -226,9 +226,8 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ action_buttons : false, pager: false }; - new openerp.base.ActionManager( - this.session, this.view.element_id + '_action_' + action.id) - .do_action(action); + new openerp.base.ViewManagerAction(this.session, + this.view.element_id + '_action_' + action.id, action).start(); }, render: function() { // We should start with three columns available