From 6bdf0db637ad1b94bc5702e624dc6d650a8647fe Mon Sep 17 00:00:00 2001 From: Launchpad Code Hosting Date: Wed, 5 May 2010 04:48:16 +0100 Subject: [PATCH 1/2] Launchpad automatic translations update. bzr revid: codehost@crowberry-20100505034816-w6vkp8pe29vr2c1b --- addons/account/i18n/pl.po | 2 +- addons/account/i18n/zh_CN.po | 6 +-- addons/account_analytic_plans/i18n/it.po | 52 +++++++++++----------- addons/account_tax_include/i18n/oc.po | 2 +- addons/analytic_user_function/i18n/oc.po | 2 +- addons/crm/i18n/es.po | 2 +- addons/crm_profiling/i18n/ru.po | 2 +- addons/delivery/i18n/pl.po | 10 ++--- addons/hr_holidays/i18n/es.po | 2 +- addons/olap_crm/i18n/de.po | 2 +- addons/profile_manufacturing/i18n/pt_BR.po | 2 +- addons/stock/i18n/es.po | 2 +- 12 files changed, 43 insertions(+), 43 deletions(-) diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 2305e11d469..48b88ee171d 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-03 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index f904e3f8d45..12e1bb3bf30 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-29 00:34+0000\n" -"Last-Translator: digitalsatori \n" +"PO-Revision-Date: 2010-05-03 05:57+0000\n" +"Last-Translator: KenSai \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 04:08+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po index 0e2583dfe3d..41882762d6f 100644 --- a/addons/account_analytic_plans/i18n/it.po +++ b/addons/account_analytic_plans/i18n/it.po @@ -7,27 +7,27 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-29 11:06+0000\n" -"Last-Translator: Lorenzo Lucio Ancora \n" +"PO-Revision-Date: 2010-05-03 16:30+0000\n" +"Last-Translator: eLBati - albatos.com \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account4_ids:0 msgid "Account4 Id" -msgstr "Identificativo di Account4" +msgstr "" #. module: account_analytic_plans #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"Il nome dell'oggetto deve iniziare con x_ e non può contenere caratteri " -"speciali !" +"Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri " +"speciali!" #. module: account_analytic_plans #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic @@ -43,7 +43,7 @@ msgstr "Identificativo di Account5" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,date2:0 msgid "End Date" -msgstr "" +msgstr "Data fine" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,rate:0 @@ -57,7 +57,7 @@ msgstr "Tasso (%)" #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action msgid "Analytic Plan" -msgstr "Pianificazione analitica" +msgstr "Piano analitico" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line @@ -67,7 +67,7 @@ msgstr "" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Lines" -msgstr "" +msgstr "Righe della distribuzione analitica" #. module: account_analytic_plans #: wizard_button:wizard.crossovered.analytic,init,print:0 @@ -82,12 +82,12 @@ msgstr "Alla data" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,plan_id:0 msgid "Plan Id" -msgstr "" +msgstr "Identificativo del piano" #. module: account_analytic_plans #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action msgid "Analytic Distribution's Models" -msgstr "" +msgstr "Modelli di distribuzione analitica" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -97,7 +97,7 @@ msgstr "Nome conto" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Line" -msgstr "" +msgstr "Riga distribuzione analitica" #. module: account_analytic_plans #: field:account.analytic.plan.instance,code:0 @@ -143,32 +143,32 @@ msgstr "Identificativo di Account3" #: field:account.analytic.plan.instance,journal_id:0 #: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 msgid "Analytic Journal" -msgstr "Registro Analitico" +msgstr "Libro Giornale analitico" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "100.00%" -msgstr "Cento per cento" +msgstr "100%" #. module: account_analytic_plans #: wizard_field:wizard.crossovered.analytic,init,ref:0 msgid "Analytic Account Ref." -msgstr "" +msgstr "Riferimento conto analitico" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Analytic Account :" -msgstr "Account analitico:" +msgstr "Conto analitico :" #. module: account_analytic_plans #: view:account.analytic.plan.line:0 msgid "Analytic Plan Line" -msgstr "Linea del piano analitico" +msgstr "Riga piano analitico" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 msgid "Analytic Account Reference:" -msgstr "" +msgstr "Riferimento conto analitico" #. module: account_analytic_plans #: model:ir.actions.wizard,name:account_analytic_plans.create_model @@ -186,7 +186,7 @@ msgstr "Valori di default" #: field:account.journal,plan_id:0 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan msgid "Analytic Plans" -msgstr "" +msgstr "Piani analitici" #. module: account_analytic_plans #: field:account.analytic.plan.line,min_required:0 @@ -261,13 +261,13 @@ msgstr "" #. module: account_analytic_plans #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information msgid "Multiple-plans management in Analytic Accounting" -msgstr "" +msgstr "Gestione multi-piano in contabilità analitica" #. module: account_analytic_plans #: view:account.analytic.plan.line:0 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line msgid "Analytic Plan Lines" -msgstr "Linee del piano analitico" +msgstr "Righe del piano analitico" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -277,7 +277,7 @@ msgstr "" #. module: account_analytic_plans #: field:account.analytic.plan.instance,plan_id:0 msgid "Model's Plan" -msgstr "Piano dei modelli" +msgstr "Piano del modello" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account2_ids:0 @@ -292,7 +292,7 @@ msgstr "Quantità" #. module: account_analytic_plans #: help:account.analytic.plan.line,root_analytic_id:0 msgid "Root account of this plan." -msgstr "Account radice per questo piano" +msgstr "Conto base di questo piano" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account6_ids:0 @@ -307,7 +307,7 @@ msgstr "Quantità" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account_ids:0 msgid "Account Id" -msgstr "Identificativo dell'Account" +msgstr "Identificativo del conto" #. module: account_analytic_plans #: rml:account.analytic.account.crossovered.analytic:0 @@ -322,7 +322,7 @@ msgstr "OK" #. module: account_analytic_plans #: field:account.analytic.plan.line,root_analytic_id:0 msgid "Root Account" -msgstr "Account radice" +msgstr "Conto base" #. module: account_analytic_plans #: wizard_view:create.model,info:0 @@ -340,7 +340,7 @@ msgstr "Sequenza" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,analytic_account_id:0 msgid "Analytic Account" -msgstr "Account analitico" +msgstr "Conto Analitico" #. module: account_analytic_plans #: field:account.analytic.default,analytics_id:0 diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po index 3fddc4ffbd8..5d0f82c83d6 100644 --- a/addons/account_tax_include/i18n/oc.po +++ b/addons/account_tax_include/i18n/oc.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_tax_include diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po index 91d9c373a54..89de5e0ac50 100644 --- a/addons/analytic_user_function/i18n/oc.po +++ b/addons/analytic_user_function/i18n/oc.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po index 1b8cb2de92b..b9424d024dd 100644 --- a/addons/crm/i18n/es.po +++ b/addons/crm/i18n/es.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po index c7c6c60a932..cc9231b12fa 100644 --- a/addons/crm_profiling/i18n/ru.po +++ b/addons/crm_profiling/i18n/ru.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm_profiling diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po index abbc1ce1987..d395d60a8a2 100644 --- a/addons/delivery/i18n/pl.po +++ b/addons/delivery/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-21 16:05+0000\n" -"Last-Translator: Andrzej MoST (Marcin Ostajewski) \n" +"PO-Revision-Date: 2010-05-03 08:04+0000\n" +"Last-Translator: Piotr Lipski \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-17 03:58+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: delivery @@ -27,7 +27,7 @@ msgstr "" #. module: delivery #: selection:delivery.grid.line,operator:0 msgid ">=" -msgstr "" +msgstr ">=" #. module: delivery #: view:res.partner:0 @@ -62,7 +62,7 @@ msgstr "Stany" #. module: delivery #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Nieprawidłowa nazwa modelu w definicji akcji." #. module: delivery #: help:res.partner,property_delivery_carrier:0 diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po index 0aa743eeb55..9d0158f14b2 100644 --- a/addons/hr_holidays/i18n/es.po +++ b/addons/hr_holidays/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-01 03:55+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays diff --git a/addons/olap_crm/i18n/de.po b/addons/olap_crm/i18n/de.po index 41398f13f85..f304ac7ea7f 100644 --- a/addons/olap_crm/i18n/de.po +++ b/addons/olap_crm/i18n/de.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: olap_crm diff --git a/addons/profile_manufacturing/i18n/pt_BR.po b/addons/profile_manufacturing/i18n/pt_BR.po index 725964a977f..ca245a1e0dd 100644 --- a/addons/profile_manufacturing/i18n/pt_BR.po +++ b/addons/profile_manufacturing/i18n/pt_BR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-05-02 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:48+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: profile_manufacturing diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po index 9c935de5c1e..3673eeebe69 100644 --- a/addons/stock/i18n/es.po +++ b/addons/stock/i18n/es.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-04-30 03:51+0000\n" +"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock From ab6963608096e97183a5dad898084c3051a53372 Mon Sep 17 00:00:00 2001 From: "Jay (Open ERP)" Date: Wed, 5 May 2010 12:39:55 +0530 Subject: [PATCH 2/2] [FIX] Account : Cancel/Confirm Invoice wizards improved lp bug: https://launchpad.net/bugs/572421 fixed bzr revid: jvo@tinyerp.com-20100505070955-5v7h418gb5h1bcmn --- .../account/wizard/account_invoice_state.py | 21 +++++++++++++----- .../wizard/account_invoice_state_view.xml | 22 +++++++++---------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py index 6b1a41f49af..c3934e38db0 100644 --- a/addons/account/wizard/account_invoice_state.py +++ b/addons/account/wizard/account_invoice_state.py @@ -21,6 +21,7 @@ from osv import fields, osv from tools.translate import _ import netsvc +import pooler class account_invoice_confirm(osv.osv_memory): """ @@ -34,7 +35,12 @@ class account_invoice_confirm(osv.osv_memory): wf_service = netsvc.LocalService('workflow') if context is None: context = {} - for id in context['active_ids']: + pool_obj = pooler.get_pool(cr.dbname) + data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context) + + for record in data_inv: + if record['state'] not in ('draft','proforma','proforma2'): + raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!")) wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr) return {} @@ -47,14 +53,19 @@ class account_invoice_cancel(osv.osv_memory): """ _name = "account.invoice.cancel" - _description = "Cancel the selected invoices" + _description = "Cancel the Selected Invoices" def invoice_cancel(self, cr, uid, ids, context=None): - wf_service = netsvc.LocalService('workflow') if context is None: context = {} - for id in context['active_ids']: - wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_cancel', cr) + wf_service = netsvc.LocalService('workflow') + pool_obj = pooler.get_pool(cr.dbname) + data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context) + + for record in data_inv: + if record['state'] in ('cancel','paid'): + raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!")) + wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_cancel', cr) return {} account_invoice_cancel() diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml index 8748edbb688..d83c0c6f2dc 100644 --- a/addons/account/wizard/account_invoice_state_view.xml +++ b/addons/account/wizard/account_invoice_state_view.xml @@ -6,10 +6,10 @@ account.invoice.confirm form -
- + + -