From 96c0023bbd68ceb47e5f783796235b4762945fbd Mon Sep 17 00:00:00 2001 From: "Bhumika (OpenERP)" Date: Thu, 16 Jun 2011 19:01:12 +0530 Subject: [PATCH 1/8] [Fix] mail_gateway: set the correct email address of user bzr revid: sbh@tinyerp.com-20110616133112-npcfc87nonicvpcb --- addons/mail_gateway/mail_gateway.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index c67a2668192..f60e26fe331 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -80,7 +80,7 @@ class mailgate_thread(osv.osv): for thread in self.browse(cr, uid, ids, context=context): l=[] for message in thread.message_ids: - l.append((message.user_id and message.user_id.email) or '') + l.append((message.user_id and message.user_id.user_email) or '') l.append(message.email_from or '') l.append(message.email_cc or '') res[thread.id] = l From 55f5d283d332e484a7c060ea4c839e9a9e226ab5 Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Wed, 29 Jun 2011 16:01:46 +0530 Subject: [PATCH 2/8] [BUG/FIX] project : return action close from web compability lp bug: https://launchpad.net/bugs/799812 fixed bzr revid: jam@tinyerp.com-20110629103146-pvyo9isbq8hfjszv --- addons/project/wizard/project_task_close.py | 2 +- addons/project/wizard/project_task_delegate.py | 2 +- addons/project/wizard/project_task_reevaluate.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/project/wizard/project_task_close.py b/addons/project/wizard/project_task_close.py index 97e8e4730c2..010bba9e52b 100644 --- a/addons/project/wizard/project_task_close.py +++ b/addons/project/wizard/project_task_close.py @@ -115,7 +115,7 @@ class project_task_close(osv.osv_memory): mail_id = tools.email_send(from_adr, to_adr, subject, tools.ustr(body), email_bcc=[from_adr]) if not mail_id: raise osv.except_osv(_('Error'), _("Couldn't send mail! Check the email ids and smtp configuration settings")) - return {} + return {'type': 'ir.actions.act_window_close'} project_task_close() diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index cffdf2f9ef9..eaf5dea3084 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -108,6 +108,6 @@ class project_task_delegate(osv.osv_memory): delegate_data['user_id'] = delegate_data['user_id'][0] delegate_data['name'] = tools.ustr(delegate_data['name']) task_pool.do_delegate(cr, uid, task_id, delegate_data, context=context) - return {} + return {'type': 'ir.actions.act_window_close'} project_task_delegate() diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py index e4e2fab66e3..d627ffa4408 100644 --- a/addons/project/wizard/project_task_reevaluate.py +++ b/addons/project/wizard/project_task_reevaluate.py @@ -79,5 +79,5 @@ class project_task_reevaluate(osv.osv_memory): task_pool.write(cr, uid, task_id, {'remaining_hours': data.remaining_hours}) if context.get('button_reactivate', False): task_pool.do_reopen(cr, uid, [task_id], context=context) - return {} + return {'type': 'ir.actions.act_window_close'} project_task_reevaluate() From ef3a71fec3ec7f87aa79eb525deae6c985881108 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 29 Jun 2011 17:14:00 +0200 Subject: [PATCH 3/8] [IMP] let non-act_window actions pass through unmolested by clean_action, which is currently mostly there to cleanup the junk in act_window actions bzr revid: xmo@openerp.com-20110629151400-pyv48na2wecp7rhj --- addons/base/controllers/main.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 7098f7f8f90..0866d1075fb 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -243,12 +243,12 @@ 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) - for _, _, action in actions: - clean_action(action, req.session) - - return actions + return [(id, name, clean_action(action, req.session)) + for id, name, action in actions] def clean_action(action, session): + if action['type'] != 'ir.actions.act_window': + return action # values come from the server, we can just eval them if isinstance(action.get('context', None), basestring): action['context'] = eval( @@ -260,7 +260,7 @@ def clean_action(action, session): action['domain'], session.evaluation_context( action['context'])) or [] - if not action.has_key('flags'): + if 'flags' not in action: # Set empty flags dictionary for web client. action['flags'] = dict() return fix_view_modes(action) @@ -286,11 +286,11 @@ def fix_view_modes(action): if action.pop('view_type') != 'form': return - if action.has_key('view_mode'): + if 'view_mode' in action: action['view_mode'] = ','.join( mode if mode != 'tree' else 'list' for mode in action['view_mode'].split(',')) - if action.has_key('views'): + if 'views' in action: action['views'] = [ [id, mode if mode != 'tree' else 'list'] for id, mode in action['views'] @@ -461,8 +461,8 @@ class DataSet(openerpweb.Controller): def call_button(self, req, model, method, args, domain_id=None, context_id=None): action = self.call_common(req, model, method, args, domain_id, context_id) if isinstance(action, dict) and action.get('type') != '': - clean_action(action, req.session) - return {'result': action} + return {'result': clean_action(action, req.session)} + return {'result': False} @openerpweb.jsonrequest def exec_workflow(self, req, model, id, signal): From fe98d57143b66dcb34721c1f3f5a2223a2c6e612 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Thu, 30 Jun 2011 04:34:43 +0000 Subject: [PATCH 4/8] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20110630043443-rwrzpu2jsuhgol5i --- addons/account_anglo_saxon/i18n/fi.po | 111 +++++++ addons/analytic/i18n/fi.po | 261 +++++++++++++++ addons/analytic_user_function/i18n/fi.po | 103 ++++++ addons/base_tools/i18n/zh_CN.po | 2 +- addons/event_project/i18n/fi.po | 8 +- .../marketing_campaign_crm_demo/i18n/zh_CN.po | 179 ++++++++++ addons/point_of_sale/i18n/zh_CN.po | 314 +++++++++--------- addons/wiki_faq/i18n/fi.po | 32 ++ 8 files changed, 851 insertions(+), 159 deletions(-) create mode 100644 addons/account_anglo_saxon/i18n/fi.po create mode 100644 addons/analytic/i18n/fi.po create mode 100644 addons/analytic_user_function/i18n/fi.po create mode 100644 addons/marketing_campaign_crm_demo/i18n/zh_CN.po create mode 100644 addons/wiki_faq/i18n/fi.po diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po new file mode 100644 index 00000000000..4806d363e98 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/fi.po @@ -0,0 +1,111 @@ +# Finnish 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:14+0000\n" +"PO-Revision-Date: 2011-06-29 08:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr " Kirjanpito-ominaisuus" + +#. module: account_anglo_saxon +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" +msgstr "Tilauksen viite tulee olla yksilöllinen!" + +#. module: account_anglo_saxon +#: constraint:product.category:0 +msgid "Error ! You can not create recursive categories." +msgstr "Virhe ! Et voi luoda rekursiivisia luokkia." + +#. module: account_anglo_saxon +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" +"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa " +"kategoriassa." + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line +msgid "Invoice Line" +msgstr "Laskun rivi" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_purchase_order +msgid "Purchase Order" +msgstr "Ostotilaus" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_template +msgid "Product Template" +msgstr "Tuotteen malli" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" +msgstr "Tuotteen kategoria" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Accounting for Anglo Saxon countries" +msgstr "Varastokirjanpito anglosaksalaisille maille" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Hintaerotuksen tili" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice +msgid "Invoice" +msgstr "Lasku" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_picking +msgid "Picking List" +msgstr "Keräilylista" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by\n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries\n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales.\n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at the moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account\n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account.\n" +" Secondly, price differences between actual purchase price and fixed " +"product standard price are booked on a separate account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"Tätä tiliä käytetään arvostamaan hintaeroa ostohinnan ja kustannushinnan " +"välillä" diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po new file mode 100644 index 00000000000..5822cb824d2 --- /dev/null +++ b/addons/analytic/i18n/fi.po @@ -0,0 +1,261 @@ +# Finnish 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:14+0000\n" +"PO-Revision-Date: 2011-06-29 06:16+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "Alatason tilit" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "Tilin nimi" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "Määrittelee laskettavan määrän" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" +"Moduuli analyyttisten tilien määrittelyyn.\n" +" " + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "Tila" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "Asiakas päällikkö" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "Luonnos" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "Suljettu" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "Debet" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "" +"* When an account is created its in 'Draft' state. " +" \n" +"* If any associated partner is there, it can be in 'Open' state. " +" \n" +"* If any pending balance is there it can be in 'Pending'. " +" \n" +"* And finally when all the transactions are over, it can be in 'Close' " +"state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. " +"If its in 'Running' state it is a normal project. " +" \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "Tilityyppi" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "Mallipohja" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "Odottava" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "Analyyttinen rivi" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "Kuvaus" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "Tavallinen" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "Yritys" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "Maksimimäärä" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "Käyttäjä" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "Ylempi analyyttinen tili" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "Päiväys" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Account currency" +msgstr "Tilin valuutta" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "Määrä" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" +"Laskettu kertomalla määrä ja tuotteen kustannushinta. Yrityksen " +"päävaluutassa." + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "Asettaa tuntien määrän ylärajan" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "Kredit" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "Määrä" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "Yhteyshenkilö" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta." + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "Peruttu" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "Saldo" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä." + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" +"Jos valitset näkymätyypin, se tarkoittaa että et voi luoda " +"päiväkirjamerkintöjä käyttäen sitä tiliä." + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "Loppupäiväys" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "Tilikoodi" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "Tilin kokonimi" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "Analyyttinen tili" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "Näkymä" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "Kumppani" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "Aloituspäivämäärä" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "Avoin" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "Analyyttiset viennit" diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po new file mode 100644 index 00000000000..78387b7f6bd --- /dev/null +++ b/addons/analytic_user_function/i18n/fi.po @@ -0,0 +1,103 @@ +# Finnish 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-03 16:56+0000\n" +"PO-Revision-Date: 2011-06-29 05:53+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,product_id:0 +msgid "Product" +msgstr "Tuote" + +#. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:96 +#: code:addons/analytic_user_function/analytic_user_function.py:131 +#, python-format +msgid "Error !" +msgstr "Virhe !" + +#. module: analytic_user_function +#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "Tuntilistan rivi" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,account_id:0 +#: model:ir.model,name:analytic_user_function.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analyyttinen tili" + +#. module: analytic_user_function +#: view:account.analytic.account:0 +#: field:account.analytic.account,user_product_ids:0 +msgid "Users/Products Rel." +msgstr "Käyttäjän/Tuotteen suhde" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,user_id:0 +msgid "User" +msgstr "Käyttäjä" + +#. module: analytic_user_function +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta." + +#. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:97 +#: code:addons/analytic_user_function/analytic_user_function.py:132 +#, python-format +msgid "There is no expense account define for this product: \"%s\" (id:%d)" +msgstr "Tuotteelle ei ole määritelty kulutiliä: \"%s\" (id:%d)" + +#. module: analytic_user_function +#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid +msgid "Relation table between users and products on a analytic account" +msgstr "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä" + +#. module: analytic_user_function +#: model:ir.module.module,description:analytic_user_function.module_meta_information +msgid "" +"\n" +"\n" +" This module allows you to define what is the default function of a " +"specific user on a given account. This is mostly used when a user encodes " +"his timesheet: the values are retrieved and the fields are auto-filled... " +"but the possibility to change these values is still available.\n" +"\n" +" Obviously if no data has been recorded for the current account, the " +"default value is given as usual by the employee data so that this module is " +"perfectly compatible with older configurations.\n" +"\n" +" " +msgstr "" + +#. module: analytic_user_function +#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information +msgid "Analytic User Function" +msgstr "Analyyttinen käyttäjätoiminto" + +#. module: analytic_user_function +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä." + +#. module: analytic_user_function +#: view:analytic_user_funct_grid:0 +msgid "User's Product for this Analytic Account" +msgstr "Käyttäjän tuote tälle analyyttiselle tilille" diff --git a/addons/base_tools/i18n/zh_CN.po b/addons/base_tools/i18n/zh_CN.po index 6a1294c8a7d..4dd9285396e 100644 --- a/addons/base_tools/i18n/zh_CN.po +++ b/addons/base_tools/i18n/zh_CN.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: 2011-06-29 04:43+0000\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" "X-Generator: Launchpad (build 13168)\n" #. module: base_tools diff --git a/addons/event_project/i18n/fi.po b/addons/event_project/i18n/fi.po index 00175cd5225..0e94e838766 100644 --- a/addons/event_project/i18n/fi.po +++ b/addons/event_project/i18n/fi.po @@ -8,13 +8,13 @@ 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-06-27 07:48+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2011-06-29 07:23+0000\n" +"Last-Translator: Jussi Mikkola \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" "X-Generator: Launchpad (build 13168)\n" #. module: event_project @@ -30,7 +30,7 @@ msgstr "Loppupäiväys" #. module: event_project #: view:event.project:0 msgid "Ok" -msgstr "" +msgstr "OK" #. module: event_project #: model:ir.module.module,description:event_project.module_meta_information diff --git a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po new file mode 100644 index 00000000000..7723b72fe43 --- /dev/null +++ b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po @@ -0,0 +1,179 @@ +# 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-06-29 16:49+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-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: marketing_campaign_crm_demo +#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report +msgid "Marketing campaign demo report" +msgstr "市场营销活动显示报表" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_1 +msgid "" +"Hello,Thanks for generous interest you have shown in the " +"openERP.Regards,OpenERP Team," +msgstr "你好，感谢你对OpenERP很感兴趣。 OpenERP团队敬上。" + +#. module: marketing_campaign_crm_demo +#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information +msgid "Demo data for the module marketing_campaign." +msgstr "模块marketing_campaign的演示数据。" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4 +msgid "" +"Hello,Thanks for showing intrest and buying the OpenERP book.\n" +" If any further information required kindly revert back.\n" +" I really appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" +"你好，感谢你喜欢和购买OpenERP的书。\n" +" 如果需要进一步的消息，请告诉我们。\n" +" 欢迎垂询进一步的信息。\n" +" 敬上！\n" +" OpenERP团队" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2 +msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010" +msgstr "推荐订购2010年5月的OpenERP 发现日 （OpenERP Discovery Day）" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6 +msgid "Propose paid training to Silver partners" +msgstr "推荐银牌合作伙伴参加付费的培训" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_1 +msgid "Thanks for showing interest in OpenERP" +msgstr "感谢您喜欢OpenERP" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4 +msgid "Thanks for buying the OpenERP book" +msgstr "感谢您购买OpenERP book" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5 +msgid "Propose a free technical training to Gold partners" +msgstr "推荐金牌合作伙伴参加免费的技术培训" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_7 +msgid "" +"Hello, We have very good offer that might suit you.\n" +" For our silver partners,We are offering Gold partnership.\n" +" If any further information required kindly revert back.\n" +" I really appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" +"您好，我们有一些很好的服务可能很适合您。\n" +" 对于我们的银牌合作伙伴，我们提供金牌合作伙伴的服务。\n" +" 欢迎垂询进一步的信息。\n" +"\n" +" 敬上！\n" +" OpenERP团队" + +#. module: marketing_campaign_crm_demo +#: report:crm.lead.demo:0 +msgid "Partner :" +msgstr "合作伙伴：" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8 +msgid "" +"Hello, Thanks for showing intrest and for subscribing to technical " +"training.If any further information required kindly revert back.I really " +"appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" +"您好， 感谢您有兴趣订购技术培训课程。欢迎垂询进一步的信息。我衷心的感谢您的合作。\n" +" OpenERP团队敬上。" + +#. module: marketing_campaign_crm_demo +#: report:crm.lead.demo:0 +msgid "Company :" +msgstr "公司：" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8 +msgid "Thanks for subscribing to technical training" +msgstr "感谢您订购技术培训课程" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3 +msgid "Thanks for subscribing to the OpenERP Discovery Day" +msgstr "感谢您订购OpenERP发现日（OpenERP Discovery Day）" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5 +msgid "" +"Hello, We have very good offer that might suit you.\n" +" For our gold partners,We are arranging free technical training " +"on june,2010.\n" +" If any further information required kindly revert back.\n" +" I really appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_3 +msgid "" +"Hello,Thanks for showing intrest and for subscribing to the OpenERP " +"Discovery Day.\n" +" If any further information required kindly revert back.\n" +" I really appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2 +msgid "" +"Hello,We have very good offer that might suit you.\n" +" We propose you to subscribe to the OpenERP Discovery Day on May " +"2010.\n" +" If any further information required kindly revert back.\n" +" We really appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6 +msgid "" +"Hello, We have very good offer that might suit you.\n" +" For our silver partners,We are paid technical training on " +"june,2010.\n" +" If any further information required kindly revert back.\n" +" I really appreciate your co-operation on this.\n" +" Regards,OpenERP Team," +msgstr "" + +#. module: marketing_campaign_crm_demo +#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy +msgid "Dummy Action" +msgstr "" + +#. module: marketing_campaign_crm_demo +#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information +msgid "marketing_campaign_crm_demo" +msgstr "" + +#. module: marketing_campaign_crm_demo +#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7 +msgid "Propose gold partnership to silver partners" +msgstr "" diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po index 472ae90daba..618e465807a 100644 --- a/addons/point_of_sale/i18n/zh_CN.po +++ b/addons/point_of_sale/i18n/zh_CN.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: 2011-06-29 04:43+0000\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" "X-Generator: Launchpad (build 13168)\n" #. module: point_of_sale @@ -29,7 +29,7 @@ msgstr "日销售情况" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_confirm msgid "Point of Sale Confirm" -msgstr "" +msgstr "POS确认" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount @@ -65,18 +65,18 @@ msgstr "增加业务伙伴:" #. module: point_of_sale #: view:all.closed.cashbox.of.the.day:0 msgid "All Cashboxes Of the day :" -msgstr "" +msgstr "当日所有钱箱" #. module: point_of_sale #: view:pos.box.entries:0 msgid "Put Money" -msgstr "" +msgstr "存钱" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all msgid "Register Analysis" -msgstr "" +msgstr "收银机分析" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail @@ -88,7 +88,7 @@ msgstr "销售详情" #. module: point_of_sale #: view:pos.close.statement:0 msgid "Are you sure you want to close the statements ?" -msgstr "" +msgstr "你确定想关闭收银机吗？" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_scan_product @@ -103,7 +103,7 @@ msgstr "扫描产品" #: view:report.pos.order:0 #: field:report.pos.order,day:0 msgid "Day" -msgstr "" +msgstr "天" #. module: point_of_sale #: view:pos.make.payment:0 @@ -145,7 +145,7 @@ msgstr "增值税" #. module: point_of_sale #: report:pos.invoice:0 msgid "Origin" -msgstr "" +msgstr "原始" #. module: point_of_sale #: report:pos.invoice:0 @@ -160,7 +160,7 @@ msgstr "交易数合计" #. module: point_of_sale #: help:account.journal,special_journal:0 msgid "Will put all the orders in waiting status till being accepted" -msgstr "" +msgstr "将设置所有订单为等待状态，知道被接受" #. module: point_of_sale #: report:account.statement:0 @@ -206,7 +206,7 @@ msgstr "状态" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment msgid "Add payment" -msgstr "" +msgstr "新增付款" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month @@ -230,7 +230,7 @@ msgstr "折扣(%)" #: field:pos.box.entries,ref:0 #: field:pos.box.out,ref:0 msgid "Ref" -msgstr "" +msgstr "关联单号" #. module: point_of_sale #: view:report.pos.order:0 @@ -326,6 +326,8 @@ msgid "" "You can not open a Cashbox for \"%s\".\n" "Please close its related cash register." msgstr "" +"你不能为\"%s\"打开钱箱。\n" +"请关闭相关的收银机。" #. module: point_of_sale #: help:pos.order,user_salesman_id:0 @@ -335,7 +337,7 @@ msgstr "系统的登录用户" #. module: point_of_sale #: field:product.product,income_pdt:0 msgid "Product for Input" -msgstr "" +msgstr "输入类产品" #. module: point_of_sale #: report:pos.details:0 @@ -346,12 +348,12 @@ msgstr "支付方式" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale msgid "Daily Operations" -msgstr "" +msgstr "日常操作" #. module: point_of_sale #: view:account.bank.statement:0 msgid "Search Cash Statements" -msgstr "" +msgstr "查询现金对账单" #. module: point_of_sale #: view:pos.confirm:0 @@ -396,7 +398,7 @@ msgstr "十月" #. module: point_of_sale #: field:account.bank.statement.line,am_out:0 msgid "To count" -msgstr "" +msgstr "计算" #. module: point_of_sale #: report:pos.details:0 @@ -546,7 +548,7 @@ msgstr "按日期和用户查看销售情况" msgid "" "Cannot delete a point of sale which is closed or contains confirmed " "cashboxes!" -msgstr "" +msgstr "不能删除已关闭或者有已确认钱箱的销售终端！" #. module: point_of_sale #: report:pos.details:0 @@ -558,7 +560,7 @@ msgstr "税收模式" #: code:addons/point_of_sale/wizard/pos_close_statement.py:48 #, python-format msgid "Cash registers are already closed." -msgstr "" +msgstr "收银机已关闭。" #. module: point_of_sale #: constraint:product.product:0 @@ -570,7 +572,7 @@ msgstr "错误：无效的EAN编码" #: view:pos.confirm:0 #: view:pos.open.statement:0 msgid "Open Statements" -msgstr "" +msgstr "开启收银机" #. module: point_of_sale #: view:pos.add.product:0 @@ -602,7 +604,7 @@ msgstr "产品数量" #. module: point_of_sale #: field:pos.order,contract_number:0 msgid "Contract Number" -msgstr "" +msgstr "联系号码" #. module: point_of_sale #: selection:report.cash.register,month:0 @@ -638,7 +640,7 @@ msgstr "小计" #: model:ir.model,name:point_of_sale.model_pos_close_statement #: view:pos.close.statement:0 msgid "Close Statements" -msgstr "" +msgstr "关闭收银机" #. module: point_of_sale #: view:account.journal:0 @@ -768,7 +770,7 @@ msgstr "数量#" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_return msgid "Point of sale return" -msgstr "" +msgstr "POS退款" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month @@ -787,7 +789,7 @@ msgstr "订单日期" #. module: point_of_sale #: report:all.closed.cashbox.of.the.day:0 msgid "Today's Closed Cashbox" -msgstr "" +msgstr "今日关闭的钱箱" #. module: point_of_sale #: report:pos.invoice:0 @@ -799,7 +801,7 @@ msgstr "发票草稿" msgid "" "The amount of the voucher must be the same amount as the one on the " "statement line" -msgstr "" +msgstr "凭证金额必须和对账单明细上的金额一致" #. module: point_of_sale #: field:product.product,expense_pdt:0 @@ -955,7 +957,7 @@ msgstr "输入操作" #: model:ir.model,name:point_of_sale.model_report_cash_register #: view:report.cash.register:0 msgid "Point of Sale Cash Register Analysis" -msgstr "" +msgstr "POS收银机分析" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_sales_user_today @@ -1035,7 +1037,7 @@ msgstr "输出操作" #: report:pos.details:0 #: report:pos.details_summary:0 msgid "Start Period" -msgstr "" +msgstr "开始期间" #. module: point_of_sale #: report:account.statement:0 @@ -1086,7 +1088,7 @@ msgstr "POS单" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day msgid "All Closed CashBox" -msgstr "" +msgstr "所有关闭的钱箱" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:1042 @@ -1167,12 +1169,12 @@ msgstr "销售的支付报表" #. module: point_of_sale #: field:account.journal,special_journal:0 msgid "Special Journal" -msgstr "" +msgstr "专用日记账" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_all_closed_cashbox_of_the_day msgid "All closed cashbox of the day" -msgstr "" +msgstr "当日所有关闭的钱箱" #. module: point_of_sale #: view:pos.order:0 @@ -1228,7 +1230,7 @@ msgstr "打印销售订单的收据" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_stock_picking msgid "Picking List" -msgstr "" +msgstr "分拣单" #. module: point_of_sale #: report:pos.details:0 @@ -1246,14 +1248,14 @@ msgstr "数量" #: view:report.cash.register:0 #: view:report.pos.order:0 msgid "Month -1" -msgstr "" +msgstr "上月" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user #: model:ir.model,name:point_of_sale.model_pos_sale_user #: view:pos.payment.report.user:0 msgid "Sale by User" -msgstr "" +msgstr "用户的销售订单" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:558 @@ -1272,34 +1274,34 @@ msgstr "错误！" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm msgid "Sale Confirm" -msgstr "" +msgstr "确认售出" #. module: point_of_sale #: view:report.cash.register:0 msgid "state" -msgstr "" +msgstr "状态" #. module: point_of_sale #: view:product.product:0 msgid "Prices" -msgstr "" +msgstr "价格" #. module: point_of_sale #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "July" -msgstr "" +msgstr "7月" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:547 #, python-format msgid "Please provide an account for the product: %s" -msgstr "" +msgstr "请为产品%s提供一个科目" #. module: point_of_sale #: field:report.pos.order,delay_validation:0 msgid "Delay Validation" -msgstr "" +msgstr "验证延迟" #. module: point_of_sale #: field:pos.order,nb_print:0 @@ -1309,29 +1311,29 @@ msgstr "打印数" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_make_payment msgid "Point of Sale Payment" -msgstr "" +msgstr "POS付款" #. module: point_of_sale #: report:pos.details:0 #: report:pos.details_summary:0 msgid "End Period" -msgstr "" +msgstr "结束期间" #. module: point_of_sale #: field:account.journal,auto_cash:0 msgid "Automatic Opening" -msgstr "" +msgstr "自动打开" #. module: point_of_sale #: field:pos.order.line,price_ded:0 msgid "Discount(Amount)" -msgstr "" +msgstr "折扣（金额）" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_add_product.py:51 #, python-format msgid "Active ID is not found" -msgstr "" +msgstr "没有发现有效的ID" #. module: point_of_sale #: field:account.bank.statement.line,is_acc:0 @@ -1344,7 +1346,7 @@ msgstr "" #: view:report.pos.order:0 #: field:report.pos.order,month:0 msgid "Month" -msgstr "" +msgstr "本月" #. module: point_of_sale #: view:pos.order:0 @@ -1354,7 +1356,7 @@ msgstr "POS销售单" #. module: point_of_sale #: report:account.statement:0 msgid "Statement Name" -msgstr "" +msgstr "对账单名称" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree @@ -1363,44 +1365,44 @@ msgstr "" #: field:pos.box.out,journal_id:0 #: field:pos.make.payment,journal:0 msgid "Cash Register" -msgstr "" +msgstr "收银机" #. module: point_of_sale #: field:pos.payment.report.date,date_start:0 msgid "Start Date" -msgstr "" +msgstr "开始日期" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_receipt msgid "Point of sale receipt" -msgstr "" +msgstr "POS收银条" #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_payment.py:91 #, python-format msgid "No order lines defined for this sale " -msgstr "" +msgstr "此销售订单没有定义订单明细 " #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today msgid "Sales by User Daily margin" -msgstr "" +msgstr "按用户日利润率查看销售报表" #. module: point_of_sale #: field:pos.order,note_2:0 msgid "Customer Note" -msgstr "" +msgstr "客户备注" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:340 #, python-format msgid "No order lines defined for this sale." -msgstr "" +msgstr "订单没有订单明细" #. module: point_of_sale #: field:report.cash.register,balance_start:0 msgid "Opening Balance" -msgstr "" +msgstr "期初余额" #. module: point_of_sale #: field:pos.order,amount_paid:0 @@ -1413,13 +1415,13 @@ msgstr "付款" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines msgid "All sales lines" -msgstr "" +msgstr "所有销售明细" #. module: point_of_sale #: selection:pos.order,state:0 #: selection:report.cash.register,state:0 msgid "Quotation" -msgstr "" +msgstr "报价单" #. module: point_of_sale #: report:all.closed.cashbox.of.the.day:0 @@ -1433,29 +1435,29 @@ msgstr "合计:" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos msgid "Sales by margin" -msgstr "" +msgstr "按利润率查看销售" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_config_journal msgid "Journal Configuration" -msgstr "" +msgstr "日记账配置" #. module: point_of_sale #: view:pos.order:0 msgid "Statement lines" -msgstr "" +msgstr "对账单明细" #. module: point_of_sale #: help:pos.order,user_id:0 msgid "" "Person who uses the the cash register. It could be a reliever, a student or " "an interim employee." -msgstr "" +msgstr "使用收银机的人。可以是一个救济者，学生或临时员工。" #. module: point_of_sale #: field:report.transaction.pos,invoice_id:0 msgid "Nbr Invoice" -msgstr "" +msgstr "发票编号" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt @@ -1490,7 +1492,7 @@ msgstr "" #: view:account.bank.statement:0 #: selection:report.cash.register,state:0 msgid "Open" -msgstr "" +msgstr "开放" #. module: point_of_sale #: field:pos.order.line,order_id:0 @@ -1501,7 +1503,7 @@ msgstr "单据参考" #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_repport_date #: model:ir.ui.menu,name:point_of_sale.menu_pos_payment_report_date msgid "Sales lines Report" -msgstr "" +msgstr "销售明细报表" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_box_entries @@ -1512,19 +1514,19 @@ msgstr "" #. module: point_of_sale #: selection:pos.order,price_type:0 msgid "Tax excluded" -msgstr "" +msgstr "不含税" #. module: point_of_sale #: field:report.sales.by.margin.pos,net_margin_per_qty:0 #: field:report.sales.by.margin.pos.month,net_margin_per_qty:0 msgid "Net margin per Qty" -msgstr "" +msgstr "单位数量的毛利润" #. module: point_of_sale #: view:report.sales.by.margin.pos:0 #: view:report.sales.by.margin.pos.month:0 msgid "Sales by User Margin" -msgstr "" +msgstr "按用户和利润查看销售情况" #. module: point_of_sale #: report:pos.invoice:0 @@ -1534,7 +1536,7 @@ msgstr "税:" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_report_pos_order msgid "Point of Sale Orders Statistics" -msgstr "" +msgstr "POS订单统计" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_product_product @@ -1559,23 +1561,23 @@ msgstr "销售单明细" #. module: point_of_sale #: field:product.product,disc_controle:0 msgid "Discount Control" -msgstr "" +msgstr "折扣控制" #. module: point_of_sale #: field:report.cash.register,balance_end_real:0 msgid "Closing Balance" -msgstr "" +msgstr "期末余额" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details #: model:ir.ui.menu,name:point_of_sale.menu_pos_details msgid "Sale Details" -msgstr "" +msgstr "销售详情" #. module: point_of_sale #: field:pos.payment.report.date,date_end:0 msgid "End Date" -msgstr "" +msgstr "结束日期" #. module: point_of_sale #: field:pos.order,date_order:0 @@ -1586,46 +1588,46 @@ msgstr "订单日期" #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user #: model:ir.model,name:point_of_sale.model_pos_payment_report_user msgid "Sales lines by Users" -msgstr "" +msgstr "用户销售明细" #. module: point_of_sale #: field:res.company,max_diff:0 msgid "Max Difference for Cashboxes" -msgstr "" +msgstr "钱箱最大的差异" #. module: point_of_sale #: view:pos.close.statement:0 #: view:pos.confirm:0 #: view:pos.open.statement:0 msgid "Yes" -msgstr "" +msgstr "是" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:744 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" -msgstr "" +msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)" #. module: point_of_sale #: view:pos.make.payment:0 msgid "The cash register must be opened to be able to execute a payment." -msgstr "" +msgstr "收银机必须处于开启状态才能处理支付业务。" #. module: point_of_sale #: report:pos.lines:0 msgid "Net Total :" -msgstr "" +msgstr "总净重：" #. module: point_of_sale #: view:product.product:0 msgid "Product Description" -msgstr "" +msgstr "产品描述" #. module: point_of_sale #: field:pos.details,date_start:0 #: field:pos.sale.user,date_start:0 msgid "Date Start" -msgstr "" +msgstr "开始日期" #. module: point_of_sale #: field:pos.order,amount_total:0 @@ -1641,18 +1643,18 @@ msgstr "合计" #. module: point_of_sale #: view:pos.sale.user:0 msgid "Sale By User" -msgstr "" +msgstr "用户的销售订单" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement msgid "Open Cash Register" -msgstr "" +msgstr "开启收银机" #. module: point_of_sale #: report:account.statement:0 #: model:ir.actions.report.xml,name:point_of_sale.account_statement msgid "Statement" -msgstr "" +msgstr "银行单据" #. module: point_of_sale #: field:pos.order,name:0 @@ -1662,7 +1664,7 @@ msgstr "订单描述" #. module: point_of_sale #: field:pos.make.payment,num_sale:0 msgid "Num.File" -msgstr "" +msgstr "Num.File" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report @@ -1670,12 +1672,12 @@ msgstr "" #: model:ir.model,name:point_of_sale.model_pos_payment_report #: view:pos.payment.report:0 msgid "Payment Report" -msgstr "" +msgstr "付款分析报表" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_view_pos_return msgid "Return lines" -msgstr "" +msgstr "退货明细" #. module: point_of_sale #: report:account.statement:0 @@ -1709,16 +1711,18 @@ msgid "" "Couldn't find a pricelist line matching this product and quantity.\n" "You have to change either the product, the quantity or the pricelist." msgstr "" +"找不到此产品和数量的价格表。\n" +"你必须修改产品，或价格表的数量。" #. module: point_of_sale #: field:pos.order.line,serial_number:0 msgid "Serial Number" -msgstr "" +msgstr "序列号" #. module: point_of_sale #: view:pos.order:0 msgid "Reprint" -msgstr "" +msgstr "重新打印" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:558 @@ -1726,12 +1730,12 @@ msgstr "" #: code:addons/point_of_sale/wizard/pos_box_out.py:101 #, python-format msgid "You have to open at least one cashbox" -msgstr "" +msgstr "你必须开启至少一个钱箱" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user msgid "Today's Payment By User" -msgstr "" +msgstr "今日用户的付款分析" #. module: point_of_sale #: field:stock.picking,pos_order:0 @@ -1743,7 +1747,7 @@ msgstr "POS单" #: code:addons/point_of_sale/wizard/pos_payment.py:91 #, python-format msgid "Error!" -msgstr "" +msgstr "出错！" #. module: point_of_sale #: report:pos.lines:0 @@ -1774,39 +1778,39 @@ msgstr "最近输出的领料/提货" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "" +msgstr "银行对账单明细" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_account_bank_statement msgid "Bank Statement" -msgstr "" +msgstr "银行对账单" #. module: point_of_sale #: report:pos.user.product:0 msgid "Ending Date" -msgstr "" +msgstr "结束日期" #. module: point_of_sale #: view:report.sales.by.user.pos:0 #: view:report.sales.by.user.pos.month:0 #: view:report.transaction.pos:0 msgid "POS Report" -msgstr "" +msgstr "POS分析报表" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_discount msgid "Add Discount" -msgstr "" +msgstr "增加折扣" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement msgid "Close Cash Register" -msgstr "" +msgstr "关闭收银机" #. module: point_of_sale #: field:pos.order.line,qty_rfd:0 msgid "Refunded Quantity" -msgstr "" +msgstr "退货数量" #. module: point_of_sale #: view:pos.scan.product:0 @@ -1817,27 +1821,27 @@ msgstr "扫描条码" #: field:pos.box.entries,product_id:0 #: field:pos.box.out,product_id:0 msgid "Operation" -msgstr "" +msgstr "操作" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale msgid "Sales Order" -msgstr "" +msgstr "销售订单" #. module: point_of_sale #: field:pos.order,journal_entry:0 msgid "Journal Entry" -msgstr "" +msgstr "日记账簿" #. module: point_of_sale #: selection:report.cash.register,state:0 msgid "Confirmed" -msgstr "" +msgstr "已确认" #. module: point_of_sale #: report:pos.invoice:0 msgid "Cancelled Invoice" -msgstr "" +msgstr "已取消的发票" #. module: point_of_sale #: view:account.bank.statement:0 @@ -1849,17 +1853,17 @@ msgstr "确定" #. module: point_of_sale #: report:pos.payment.report.date:0 msgid "Sales Lines" -msgstr "" +msgstr "销售明细" #. module: point_of_sale #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "错误！您不能创建递归公司." #. module: point_of_sale #: field:pos.discount,discount:0 msgid "Discount " -msgstr "" +msgstr "折扣 " #. module: point_of_sale #: report:pos.invoice:0 @@ -1890,7 +1894,7 @@ msgstr "" #. module: point_of_sale #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today_current_user msgid "Today's Sales by Current User" -msgstr "" +msgstr "当前用户今日销售订单" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_box_out @@ -1900,7 +1904,7 @@ msgstr "" #. module: point_of_sale #: sql_constraint:account.journal:0 msgid "The code of the journal must be unique per company !" -msgstr "" +msgstr "每个公司的日记账代码必须唯一！" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product @@ -1910,48 +1914,48 @@ msgstr "设置" #. module: point_of_sale #: report:pos.user.product:0 msgid "Starting Date" -msgstr "" +msgstr "开始日期" #. module: point_of_sale #: field:pos.order,date_validation:0 #: field:report.pos.order,date_validation:0 msgid "Validation Date" -msgstr "" +msgstr "审核日期" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:507 #: code:addons/point_of_sale/point_of_sale.py:509 #, python-format msgid "You don't have enough access to validate this sale!" -msgstr "" +msgstr "你没有权限审核此销售订单！" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice msgid "Invoices" -msgstr "" +msgstr "发票" #. module: point_of_sale #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "December" -msgstr "" +msgstr "12月" #. module: point_of_sale #: view:report.pos.order:0 #: field:report.pos.order,total_discount:0 msgid "Total Discount" -msgstr "" +msgstr "总折扣" #. module: point_of_sale #: view:pos.box.out:0 msgid "Take Money" -msgstr "" +msgstr "取钱" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_details #: model:ir.model,name:point_of_sale.model_pos_sales_user_today_current_user msgid "Sales Details" -msgstr "" +msgstr "销售明细" #. module: point_of_sale #: field:product.product,am_out:0 @@ -1963,7 +1967,7 @@ msgstr "" #: code:addons/point_of_sale/wizard/pos_open_statement.py:54 #, python-format msgid "Message" -msgstr "" +msgstr "消息" #. module: point_of_sale #: view:account.journal:0 @@ -2000,12 +2004,12 @@ msgstr "已开票" #: view:pos.confirm:0 #: view:pos.open.statement:0 msgid "No" -msgstr "" +msgstr "否" #. module: point_of_sale #: field:pos.order.line,notice:0 msgid "Discount Notice" -msgstr "" +msgstr "折扣通告" #. module: point_of_sale #: view:pos.scan.product:0 @@ -2026,12 +2030,12 @@ msgstr "POS单明细" #. module: point_of_sale #: view:pos.open.statement:0 msgid "Are you sure you want to open the statements ?" -msgstr "" +msgstr "你确定要开启收银机吗？" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_payment_report_date msgid "POS Payment Report according to date" -msgstr "" +msgstr "按日期的POS付款分析报表" #. module: point_of_sale #: report:pos.invoice:0 @@ -2049,12 +2053,12 @@ msgstr "请提供业务伙伴。" #, python-format msgid "" "There is no receivable account defined for this journal: \"%s\" (id:%d)" -msgstr "" +msgstr "没有为此日记账：\"%s\" (id:%d)定义应收账款科目" #. module: point_of_sale #: field:pos.order,user_salesman_id:0 msgid "Cashier" -msgstr "" +msgstr "收银员" #. module: point_of_sale #: report:account.statement:0 @@ -2084,23 +2088,23 @@ msgstr "销售用户" #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "November" -msgstr "" +msgstr "11月" #. module: point_of_sale #: view:pos.receipt:0 msgid "Print Receipt" -msgstr "" +msgstr "打印收银条" #. module: point_of_sale #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "January" -msgstr "" +msgstr "1月" #. module: point_of_sale #: view:pos.order.line:0 msgid "POS Orders lines" -msgstr "" +msgstr "POS订单明细" #. module: point_of_sale #: code:addons/point_of_sale/point_of_sale.py:340 @@ -2117,7 +2121,7 @@ msgstr "错误" #. module: point_of_sale #: field:report.transaction.pos,journal_id:0 msgid "Sales Journal" -msgstr "" +msgstr "销售日记账" #. module: point_of_sale #: report:pos.invoice:0 @@ -2135,19 +2139,19 @@ msgstr "请为此销售单生成发票。" #: report:pos.sales.user.today:0 #: field:report.pos.order,date:0 msgid "Date Order" -msgstr "" +msgstr "订购日期" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_close_statement msgid "Close Cash Registers" -msgstr "" +msgstr "关闭收银机" #. module: point_of_sale #: report:pos.details:0 #: report:pos.payment.report.date:0 #: report:pos.payment.report.user:0 msgid "Disc(%)" -msgstr "" +msgstr "折扣（%）" #. module: point_of_sale #: view:all.closed.cashbox.of.the.day:0 @@ -2171,32 +2175,32 @@ msgstr "单据明细" #. module: point_of_sale #: field:pos.order.line,price_subtotal:0 msgid "Subtotal w/o Tax" -msgstr "" +msgstr "税额小计w/o" #. module: point_of_sale #: view:pos.order:0 msgid "Add product" -msgstr "" +msgstr "添加产品" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment msgid "Pyament Report" -msgstr "" +msgstr "付款分析报表" #. module: point_of_sale #: field:report.transaction.pos,jl_id:0 msgid "Cash Journals" -msgstr "" +msgstr "现金日记账" #. module: point_of_sale #: view:pos.details:0 msgid "POS Details :" -msgstr "" +msgstr "POS详情：" #. module: point_of_sale #: report:pos.sales.user.today:0 msgid "Today's Sales By User" -msgstr "" +msgstr "今日用户销售情况" #. module: point_of_sale #: view:pos.box.entries:0 @@ -2208,7 +2212,7 @@ msgstr "" #: code:addons/point_of_sale/wizard/pos_box_out.py:99 #, python-format msgid "please check that account is set to %s" -msgstr "" +msgstr "请检查科目是否设置为%s" #. module: point_of_sale #: field:pos.box.entries,name:0 @@ -2223,39 +2227,39 @@ msgstr "说明" #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "May" -msgstr "" +msgstr "5月" #. module: point_of_sale #: report:pos.lines:0 msgid "Sales lines" -msgstr "" +msgstr "销售明细" #. module: point_of_sale #: field:pos.order,note:0 msgid "Internal Notes" -msgstr "" +msgstr "内部备注" #. module: point_of_sale #: view:pos.add.product:0 msgid "Save & Close" -msgstr "" +msgstr "保存并关闭" #. module: point_of_sale #: view:pos.order:0 msgid "Running" -msgstr "" +msgstr "正在运行" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_all_closed_cashbox_of_the_day msgid "All Cashboxes Of the day" -msgstr "" +msgstr "当日所有钱箱" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all #: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all #: view:report.pos.order:0 msgid "Point of Sale Analysis" -msgstr "" +msgstr "POS分析" #. module: point_of_sale #: field:pos.make.payment,partner_id:0 @@ -2263,7 +2267,7 @@ msgstr "" #: field:pos.order,partner_id:0 #: view:report.pos.order:0 msgid "Customer" -msgstr "" +msgstr "客户" #. module: point_of_sale #: field:pos.make.payment,is_acc:0 @@ -2271,18 +2275,18 @@ msgstr "" #: selection:pos.order,state:0 #: selection:report.pos.order,state:0 msgid "Advance" -msgstr "" +msgstr "预支" #. module: point_of_sale #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "February" -msgstr "" +msgstr "2月" #. module: point_of_sale #: view:report.cash.register:0 msgid " Today " -msgstr "" +msgstr " 今日 " #. module: point_of_sale #: code:addons/point_of_sale/wizard/pos_box_out.py:95 @@ -2291,22 +2295,24 @@ msgid "" "The maximum value you can still withdraw is exceeded. \n" " Remaining value is equal to %d " msgstr "" +"超出你能提取的最大金额。\n" +"当前余额是%d。 " #. module: point_of_sale #: field:pos.order,remboursed:0 msgid "Remboursed" -msgstr "" +msgstr "已报销" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_tree_open msgid "Opened Sales" -msgstr "" +msgstr "未结销售订单" #. module: point_of_sale #: selection:report.cash.register,month:0 #: selection:report.pos.order,month:0 msgid "April" -msgstr "" +msgstr "4月" #. module: point_of_sale #: field:pos.order,statement_ids:0 @@ -2330,12 +2336,12 @@ msgstr "打印日期" #. module: point_of_sale #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month msgid "Sales by User Monthly margin" -msgstr "" +msgstr "按用户月利润查看销售情况" #. module: point_of_sale #: view:pos.order:0 msgid "Search Sales Order" -msgstr "" +msgstr "查询销售订单" #. module: point_of_sale #: field:pos.order,account_move:0 @@ -2349,13 +2355,13 @@ msgstr "凭证" #: view:pos.order:0 #, python-format msgid "Make Payment" -msgstr "" +msgstr "付款" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_pos_sales_user_today #: view:pos.sales.user.today:0 msgid "Sales User Today" -msgstr "" +msgstr "今日用户销售情况" #. module: point_of_sale #: view:report.cash.register:0 @@ -2363,7 +2369,7 @@ msgstr "" #: view:report.pos.order:0 #: field:report.pos.order,year:0 msgid "Year" -msgstr "" +msgstr "年" #~ msgid "Detail of Sales" #~ msgstr "销售详情" diff --git a/addons/wiki_faq/i18n/fi.po b/addons/wiki_faq/i18n/fi.po new file mode 100644 index 00000000000..17a86af7cd7 --- /dev/null +++ b/addons/wiki_faq/i18n/fi.po @@ -0,0 +1,32 @@ +# Finnish 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-06-29 07:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: wiki_faq +#: model:ir.module.module,description:wiki_faq.module_meta_information +msgid "" +"This module provides a wiki FAQ Template\n" +" " +msgstr "" +"Tämä moduuli sisältää wiki UKK (faq) pohjan\n" +" " + +#. module: wiki_faq +#: model:ir.module.module,shortdesc:wiki_faq.module_meta_information +msgid "Document Management - Wiki - FAQ" +msgstr "Dokumenttienhallinta - Wiki UKK (FAQ)" From 3cd6c86f8753fc1e5f4fc417e122017fe804599f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 30 Jun 2011 08:24:24 +0200 Subject: [PATCH 5/8] [ADD] support for server actions bzr revid: xmo@openerp.com-20110630062424-gmnlahmexklnftbk --- addons/base/controllers/main.py | 19 ++++++++++--------- addons/base/static/src/js/views.js | 8 ++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 0866d1075fb..f9bd835156e 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -286,15 +286,11 @@ def fix_view_modes(action): if action.pop('view_type') != 'form': return - if 'view_mode' in action: - action['view_mode'] = ','.join( - mode if mode != 'tree' else 'list' - for mode in action['view_mode'].split(',')) - if 'views' in action: - action['views'] = [ - [id, mode if mode != 'tree' else 'list'] - for id, mode in action['views'] - ] + action['views'] = [ + [id, mode if mode != 'tree' else 'list'] + for id, mode in action['views'] + ] + return action class Menu(openerpweb.Controller): @@ -774,3 +770,8 @@ class Action(openerpweb.Controller): if action: value = clean_action(action[0], req.session) return {'result': value} + + @openerpweb.jsonrequest + 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/views.js b/addons/base/static/src/js/views.js index ee4388c8971..b32f8b88140 100644 --- a/addons/base/static/src/js/views.js +++ b/addons/base/static/src/js/views.js @@ -73,6 +73,14 @@ openerp.base.ActionManager = openerp.base.Controller.extend({ dialog.$element.dialog('destroy'); dialog.stop(); break; + case 'ir.actions.server': + this.rpc('/base/action/run', { + action_id: action.id, + context: {active_id: 66, active_ids: [66], active_model: 'ir.ui.menu'} + }).then(function (action) { + self.do_action(action, on_closed) + }); + break; default: console.log("Action manager can't handle action of type " + action.type, action); } From 1e8072ea2d8a304ffe19206d6d56a17eabfd578e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 30 Jun 2011 08:46:51 +0200 Subject: [PATCH 6/8] [FIX] act_window actions not coming from the db and missing a views key (and collection): generate views from whatever can be found in view_mode and view_id bzr revid: xmo@openerp.com-20110630064651-701903va7mgbps7g --- addons/base/controllers/main.py | 41 +++++++++++++++++++ addons/base/static/src/js/form.js | 2 - .../base_dashboard/static/src/js/dashboard.js | 2 - 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index f9bd835156e..7b9d34b7623 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -265,6 +265,44 @@ def clean_action(action, session): action['flags'] = dict() return fix_view_modes(action) +def generate_views(action): + """ + While the server generates a sequence called "views" computing dependencies + between a bunch of stuff for views coming directly from the database + (the ``ir.actions.act_window model``), it's also possible for e.g. buttons + to return custom view dictionaries generated on the fly. + + In that case, there is no ``views`` key available on the action. + + Since the web client relies on ``action['views']``, generate it here from + ``view_mode`` and ``view_id``. + + Currently handles two different cases: + + * no view_id, multiple view_mode + * single view_id, single view_mode + + :param dict action: action descriptor dictionary to generate a views key for + """ + view_id = action.get('view_id', False) + if isinstance(view_id, (list, tuple)): + view_id = view_id[0] + + # providing at least one view mode is a requirement, not an option + view_modes = action['view_mode'].split(',') + + if len(view_modes) > 1: + if view_id: + raise ValueError('Non-db action dictionaries should provide ' + 'either multiple view modes or a single view ' + 'mode and an optional view id.\n\n Got view ' + 'modes %r and view id %r for action %r' % ( + view_modes, view_id, action)) + action['views'] = [(False, mode) for mode in view_modes] + 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): @@ -283,6 +321,9 @@ def fix_view_modes(action): :param dict action: an action descriptor :returns: nothing, the action is modified in place """ + if 'views' not in action: + generate_views(action) + if action.pop('view_type') != 'form': return diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index e4cc0172789..e9984c226da 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -1158,8 +1158,6 @@ openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ "views":[[false,"form"]], "res_id": self.value[0], "type":"ir.actions.act_window", - "view_type":"form", - "view_mode":"form", "target":"new", "context": build_relation_context(self) }); diff --git a/addons/base_dashboard/static/src/js/dashboard.js b/addons/base_dashboard/static/src/js/dashboard.js index 70001374ae6..feb4e92d8a9 100644 --- a/addons/base_dashboard/static/src/js/dashboard.js +++ b/addons/base_dashboard/static/src/js/dashboard.js @@ -59,8 +59,6 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ res_model : 'ir.actions.actions', views : [[false, 'list']], type : 'ir.actions.act_window', - view_type : 'list', - view_mode : 'list', limit : 80, auto_search : true, domain : [['type', '=', 'ir.actions.act_window']], From 60842d0f0662f7bd6edc74d7ea0168b1d52b41d9 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 30 Jun 2011 08:48:31 +0200 Subject: [PATCH 7/8] [FIX] view_id should be a scalar bzr revid: xmo@openerp.com-20110630064831-ibfsljiwik52huj6 --- openerp/addons/base/res/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 3f8c6f20b8d..f5dbdb4aaed 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -104,7 +104,7 @@ class res_config_configurable(osv.osv_memory): return { 'view_mode': action.view_mode, 'view_type': action.view_type, - 'view_id': action.view_id and [action.view_id.id] or False, + 'view_id': action.view_id and action.view_id.id or False, 'res_model': action.res_model, 'type': action.type, 'target': action.target, From 122d7b06bad8f8e2821ecf48801d05fb50493d1a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 30 Jun 2011 11:05:37 +0200 Subject: [PATCH 8/8] [FIX] Fixed on_change warning bzr revid: fme@openerp.com-20110630090537-q3jsm5su2cu9frqk --- addons/base/static/src/js/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index e9984c226da..770a6fd8e5e 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -233,7 +233,7 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV } } } else { - this.log("warning : on_processed_onchange can't find field " + field, result); + this.log("warning : on_processed_onchange can't find field " + f, result); } } this.on_form_changed();