diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index c1c5599e2d3..5959bd7abbe 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.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: 2010-03-24 14:33+0000\n" -"Last-Translator: Anders Eriksson (Mobila System) \n" +"PO-Revision-Date: 2010-04-21 15:12+0000\n" +"Last-Translator: djn (XCLUDE) \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-04-22 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -26,12 +26,6 @@ msgstr "Internt namn" msgid "Account Tax Code" msgstr "Konto, skattekod" -#. module: account -#: model:ir.actions.act_window,name:account.action_invoice_tree9 -#: model:ir.ui.menu,name:account.menu_action_invoice_tree9 -msgid "Unpaid Supplier Invoices" -msgstr "Obetalda leverantörsfakturor" - #. module: account #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Entries Encoding" @@ -1593,7 +1587,7 @@ msgstr "Moms" #. module: account #: rml:account.analytic.account.journal:0 msgid "Account n°" -msgstr "" +msgstr "Konto Nr" #. module: account #: view:account.tax:0 diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 71ba0be0acf..0b8bfac659b 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -7,24 +7,24 @@ 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-09-16 17:14+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-22 09:56+0000\n" +"Last-Translator: BlueT - Matthew Lien - 練喆明 \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-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account #: field:account.tax.template,description:0 msgid "Internal Name" -msgstr "" +msgstr "內部名稱" #. module: account #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "" +msgstr "會計稅碼" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree9 @@ -177,7 +177,7 @@ msgstr "" #. module: account #: field:account.config.wizard,charts:0 msgid "Charts of Account" -msgstr "" +msgstr "會計圖表" #. module: account #: model:ir.actions.wizard,name:account.wizard_move_line_select diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po new file mode 100644 index 00000000000..a5cac75343f --- /dev/null +++ b/addons/account_payment/i18n/oc.po @@ -0,0 +1,618 @@ +# Occitan (post 1500) translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-04-22 12:18+0000\n" +"Last-Translator: Cédric VALMARY (Tot en òc) \n" +"Language-Team: Occitan (post 1500) \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-23 03:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_payment +#: field:payment.order,date_planned:0 +msgid "Scheduled date if fixed" +msgstr "" + +#. module: account_payment +#: field:payment.line,currency:0 +msgid "Partner Currency" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Set to draft" +msgstr "" + +#. module: account_payment +#: help:payment.order,mode:0 +msgid "Select the Payment Mode to be applied." +msgstr "" + +#. module: account_payment +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom del Modèl invalid per la definicion de l'accion." + +#. module: account_payment +#: view:payment.line:0 +#: field:payment.line,info_owner:0 +#: view:payment.order:0 +msgid "Owner Account" +msgstr "" + +#. module: account_payment +#: help:account.invoice,amount_to_pay:0 +msgid "" +"The amount which should be paid at the current date\n" +"minus the amount which is already in payment order" +msgstr "" + +#. module: account_payment +#: help:payment.line,date:0 +msgid "" +"If no payment date is specified, the bank will treat this payment line " +"directly" +msgstr "" + +#. module: account_payment +#: field:payment.order,date_prefered:0 +msgid "Preferred date" +msgstr "" + +#. module: account_payment +#: selection:payment.line,state:0 +msgid "Free" +msgstr "Liure" + +#. module: account_payment +#: wizard_field:populate_payment,search,entries:0 +msgid "Entries" +msgstr "Entradas" + +#. module: account_payment +#: wizard_field:populate_payment,init,duedate:0 +msgid "Due Date" +msgstr "Data d'escasença" + +#. module: account_payment +#: view:account.move.line:0 +msgid "Account Entry Line" +msgstr "Linha d'escritura comptabla" + +#. module: account_payment +#: wizard_button:populate_payment,search,create:0 +msgid "_Add to payment order" +msgstr "" + +#. module: account_payment +#: rml:payment.order:0 +#: view:payment.order:0 +msgid "Amount" +msgstr "Soma" + +#. module: account_payment +#: rml:payment.order:0 +msgid "Execution date:" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Total in Company Currency" +msgstr "" + +#. module: account_payment +#: selection:payment.order,state:0 +msgid "Cancelled" +msgstr "Anullat" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new +#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form_new +msgid "New Payment Order" +msgstr "" + +#. module: account_payment +#: rml:payment.order:0 +#: field:payment.order,reference:0 +msgid "Reference" +msgstr "Referéncia" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree +#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form +msgid "Payment Orders" +msgstr "" + +#. module: account_payment +#: selection:payment.order,date_prefered:0 +msgid "Directly" +msgstr "Dirèctament" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_line_form +#: model:ir.model,name:account_payment.model_payment_line +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Payment Line" +msgstr "" + +#. module: account_payment +#: field:payment.type,suitable_bank_types:0 +msgid "Suitable bank types" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +msgid "Amount Total" +msgstr "" + +#. module: account_payment +#: selection:payment.order,state:0 +msgid "Confirmed" +msgstr "" + +#. module: account_payment +#: help:payment.line,ml_date_created:0 +msgid "Invoice Effective Date" +msgstr "" + +#. module: account_payment +#: field:payment.order,line_ids:0 +msgid "Payment lines" +msgstr "" + +#. module: account_payment +#: help:payment.order,date_planned:0 +msgid "Select a date if you have chosen Preferred Date to be fixed." +msgstr "" + +#. module: account_payment +#: selection:payment.line,state:0 +msgid "Structured" +msgstr "" + +#. module: account_payment +#: field:payment.order,state:0 +msgid "State" +msgstr "Estat" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Transaction Information" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form +#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form +#: view:payment.mode:0 +msgid "Payment Mode" +msgstr "" + +#. module: account_payment +#: field:payment.line,ml_date_created:0 +msgid "Effective Date" +msgstr "" + +#. module: account_payment +#: field:payment.line,ml_inv_ref:0 +msgid "Invoice Ref." +msgstr "" + +#. module: account_payment +#: help:payment.order,date_prefered:0 +msgid "" +"Choose an option for the Payment Order:'Fixed' stands for a date specified " +"by you.'Directly' stands for the direct execution.'Due date' stands for the " +"scheduled date of execution." +msgstr "" + +#. module: account_payment +#: view:account.move.line:0 +msgid "Total debit" +msgstr "Debit total" + +#. module: account_payment +#: field:payment.order,date_done:0 +msgid "Execution date" +msgstr "" + +#. module: account_payment +#: selection:payment.order,date_prefered:0 +msgid "Fixed date" +msgstr "Data fixa" + +#. module: account_payment +#: field:payment.line,info_partner:0 +msgid "Destination Account" +msgstr "Compte de destinacion" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Desitination Account" +msgstr "Compte de destinacion" + +#. module: account_payment +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML invalid per l'arquitectura de la vista" + +#. module: account_payment +#: wizard_button:populate_payment,init,end:0 +#: wizard_button:populate_payment,search,end:0 +#: wizard_button:populate_statement,init,end:0 +msgid "_Cancel" +msgstr "_Anullar" + +#. module: account_payment +#: field:payment.line,create_date:0 +msgid "Created" +msgstr "Creat" + +#. module: account_payment +#: view:payment.line:0 +msgid "Currency Amount Total" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Make Payments" +msgstr "" + +#. module: account_payment +#: field:payment.line,state:0 +msgid "Communication Type" +msgstr "" + +#. module: account_payment +#: model:ir.module.module,shortdesc:account_payment.module_meta_information +msgid "Payment Management" +msgstr "" + +#. module: account_payment +#: field:payment.line,communication:0 +msgid "Communication" +msgstr "Comunicacion" + +#. module: account_payment +#: selection:payment.order,date_prefered:0 +msgid "Due date" +msgstr "Data de tèrme" + +#. module: account_payment +#: field:account.invoice,amount_to_pay:0 +msgid "Amount to be paid" +msgstr "" + +#. module: account_payment +#: help:payment.line,info_owner:0 +msgid "Address of the Main Partner" +msgstr "" + +#. module: account_payment +#: help:payment.mode,name:0 +msgid "Mode of Payment" +msgstr "" + +#. module: account_payment +#: view:payment.type:0 +#: help:payment.type,name:0 +msgid "Payment Type" +msgstr "" + +#. module: account_payment +#: help:payment.line,amount_currency:0 +msgid "Payment amount in the partner currency" +msgstr "" + +#. module: account_payment +#: selection:payment.order,state:0 +msgid "Draft" +msgstr "Borrolhon" + +#. module: account_payment +#: field:payment.line,partner_id:0 +#: rml:payment.order:0 +msgid "Partner" +msgstr "Partenari" + +#. module: account_payment +#: help:payment.line,communication2:0 +msgid "The successor message of Communication." +msgstr "" + +#. module: account_payment +#: help:payment.line,info_partner:0 +msgid "Address of the Ordering Customer." +msgstr "" + +#. module: account_payment +#: view:account.move.line:0 +msgid "Total credit" +msgstr "Credit total" + +#. module: account_payment +#: model:ir.actions.wizard,name:account_payment.wizard_populate_payment +msgid "Populate payment" +msgstr "" + +#. module: account_payment +#: field:payment.order,user_id:0 +msgid "User" +msgstr "Utilizaire" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line +#: wizard_field:populate_statement,init,lines:0 +msgid "Payment Lines" +msgstr "" + +#. module: account_payment +#: rml:payment.order:0 +msgid "Date" +msgstr "Data" + +#. module: account_payment +#: rml:payment.order:0 +msgid "Reference:" +msgstr "" + +#. module: account_payment +#: help:payment.line,move_line_id:0 +msgid "" +"This Entry Line will be referred for the information of the ordering " +"customer." +msgstr "" + +#. module: account_payment +#: field:payment.line,date:0 +msgid "Payment Date" +msgstr "" + +#. module: account_payment +#: field:payment.order,date_created:0 +msgid "Creation date" +msgstr "Data de creacion" + +#. module: account_payment +#: field:payment.line,ml_maturity_date:0 +msgid "Maturity Date" +msgstr "" + +#. module: account_payment +#: view:account.bank.statement:0 +msgid "Import payment lines" +msgstr "" + +#. module: account_payment +#: help:payment.type,code:0 +msgid "Specify the Code for Payment Type" +msgstr "" + +#. module: account_payment +#: field:account.move.line,amount_to_pay:0 +msgid "Amount to pay" +msgstr "Soma de pagar" + +#. module: account_payment +#: field:payment.line,amount:0 +msgid "Amount in Company Currency" +msgstr "" + +#. module: account_payment +#: help:payment.line,partner_id:0 +msgid "The Ordering Customer" +msgstr "" + +#. module: account_payment +#: field:payment.type,code:0 +msgid "Code" +msgstr "Còde" + +#. module: account_payment +#: field:payment.line,name:0 +msgid "Your Reference" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Payment order" +msgstr "" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "General Information" +msgstr "Informacions generalas" + +#. module: account_payment +#: selection:payment.order,state:0 +msgid "Done" +msgstr "Acabat" + +#. module: account_payment +#: view:payment.order:0 +msgid "Select Invoices to Pay" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Cancel" +msgstr "Anullar" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Information" +msgstr "Informacion" + +#. module: account_payment +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs " +"especials !" + +#. module: account_payment +#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment +msgid "Pay" +msgstr "Pagar" + +#. module: account_payment +#: model:ir.actions.report.xml,name:account_payment.payment_order1 +#: model:ir.model,name:account_payment.model_payment_order +msgid "Payment Order" +msgstr "" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_order_draft +#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_draft +msgid "Draft Payment Order" +msgstr "" + +#. module: account_payment +#: help:payment.line,amount:0 +msgid "Payment amount in the company currency" +msgstr "" + +#. module: account_payment +#: wizard_view:populate_payment,init:0 +msgid "Search Payment lines" +msgstr "" + +#. module: account_payment +#: field:payment.line,amount_currency:0 +msgid "Amount in Partner Currency" +msgstr "" + +#. module: account_payment +#: field:payment.line,communication2:0 +msgid "Communication 2" +msgstr "Comunicacion 2" + +#. module: account_payment +#: field:payment.line,bank_id:0 +msgid "Destination Bank account" +msgstr "" + +#. module: account_payment +#: help:payment.mode,journal:0 +msgid "Cash Journal for the Payment Mode" +msgstr "" + +#. module: account_payment +#: field:payment.mode,bank_id:0 +#: rml:payment.order:0 +msgid "Bank account" +msgstr "Compte bancari" + +#. module: account_payment +#: view:payment.order:0 +msgid "Confirm Payments" +msgstr "" + +#. module: account_payment +#: field:payment.line,company_currency:0 +msgid "Company Currency" +msgstr "" + +#. module: account_payment +#: model:ir.ui.menu,name:account_payment.menu_main +#: model:ir.ui.menu,name:account_payment.next_id_44 +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Payment" +msgstr "" + +#. module: account_payment +#: field:payment.line,move_line_id:0 +msgid "Entry line" +msgstr "" + +#. module: account_payment +#: help:payment.line,communication:0 +msgid "" +"Used as the message between ordering customer and current company. Depicts " +"'What do you want to say to the recipient about this order ?'" +msgstr "" + +#. module: account_payment +#: field:payment.mode,name:0 +#: field:payment.type,name:0 +msgid "Name" +msgstr "Nom" + +#. module: account_payment +#: wizard_button:populate_payment,init,search:0 +msgid "_Search" +msgstr "_Recercar" + +#. module: account_payment +#: view:payment.line:0 +#: view:payment.order:0 +msgid "Entry Information" +msgstr "" + +#. module: account_payment +#: model:ir.actions.wizard,name:account_payment.wizard_populate_statement +msgid "Populate Statement with Payment lines" +msgstr "" + +#. module: account_payment +#: field:payment.line,order_id:0 +msgid "Order" +msgstr "Òrdre" + +#. module: account_payment +#: model:ir.actions.act_window,name:account_payment.action_payment_order_open +#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_open +msgid "Payment Orders to Validate" +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_payment_type +#: field:payment.mode,type:0 +msgid "Payment type" +msgstr "" + +#. module: account_payment +#: field:payment.order,total:0 +msgid "Total" +msgstr "Total" + +#. module: account_payment +#: wizard_button:populate_statement,init,add:0 +msgid "_Add" +msgstr "_Apondre" + +#. module: account_payment +#: help:payment.mode,type:0 +msgid "Select the Payment Type for the Payment Mode." +msgstr "" + +#. module: account_payment +#: model:ir.model,name:account_payment.model_payment_mode +#: field:payment.order,mode:0 +msgid "Payment mode" +msgstr "" + +#. module: account_payment +#: help:payment.mode,bank_id:0 +msgid "Bank Account for the Payment Mode" +msgstr "" + +#. module: account_payment +#: field:payment.mode,journal:0 +msgid "Journal" +msgstr "Jornal" diff --git a/addons/account_report/i18n/nl.po b/addons/account_report/i18n/nl.po index 1469c0a8c2b..361ff83fe61 100644 --- a/addons/account_report/i18n/nl.po +++ b/addons/account_report/i18n/nl.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-12-11 22:21+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2010-04-22 08:49+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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:57+0000\n" +"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report @@ -354,7 +354,7 @@ msgstr "Dochters" msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" -"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !" +"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!" #. module: account_report #: help:account.report.report,goodness_limit:0 diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po index fb194a33bec..ee892e6fc0e 100644 --- a/addons/base_setup/i18n/nl.po +++ b/addons/base_setup/i18n/nl.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-09-08 12:12+0000\n" -"Last-Translator: Freerk Kalsbeek (Mindswitch BV) \n" +"PO-Revision-Date: 2010-04-22 08:50+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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:05+0000\n" +"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup @@ -272,7 +272,7 @@ msgstr "Logo" #. module: base_setup #: model:ir.module.module,shortdesc:base_setup.module_meta_information msgid "Base Setup" -msgstr "" +msgstr "Basis setup" #. module: base_setup #: wizard_button:base_setup.base_setup,company,init:0 diff --git a/addons/board_association/i18n/nl.po b/addons/board_association/i18n/nl.po index 4582b384d3a..0e69af4027e 100644 --- a/addons/board_association/i18n/nl.po +++ b/addons/board_association/i18n/nl.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-09-28 07:55+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-22 08:51+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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:57+0000\n" +"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_association @@ -55,7 +55,7 @@ msgstr "Onbetaalde facturen" #. module: board_association #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de definitie van de actie." #. module: board_association #: view:board.board:0 diff --git a/addons/board_association/i18n/oc.po b/addons/board_association/i18n/oc.po new file mode 100644 index 00000000000..477a9bff006 --- /dev/null +++ b/addons/board_association/i18n/oc.po @@ -0,0 +1,69 @@ +# Occitan (post 1500) translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-04-22 12:09+0000\n" +"Last-Translator: Cédric VALMARY (Tot en òc) \n" +"Language-Team: Occitan (post 1500) \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-23 03:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: board_association +#: model:ir.ui.menu,name:board_association.menu_board_associations_manager +msgid "Associations" +msgstr "Associacions" + +#. module: board_association +#: model:ir.module.module,shortdesc:board_association.module_meta_information +msgid "Dashboard for Associations" +msgstr "Tablèu de Bòrd per las Associacions" + +#. module: board_association +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML invalid per l'arquitectura de la vista" + +#. module: board_association +#: view:board.board:0 +#: model:ir.actions.act_window,name:board_association.open_board_associations_manager +msgid "Association Dashboard" +msgstr "Tablèu de Bòrd Associacion" + +#. module: board_association +#: view:board.board:0 +msgid "My tasks" +msgstr "Mos Prètzfaches" + +#. module: board_association +#: view:board.board:0 +msgid "New members" +msgstr "Membres novèls" + +#. module: board_association +#: view:board.board:0 +msgid "Unpaid Invoices" +msgstr "Facturas impagadas" + +#. module: board_association +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom del Modèl invalid per la definicion de l'accion." + +#. module: board_association +#: view:board.board:0 +msgid "Next Events" +msgstr "Eveniments que venon" + +#. module: board_association +#: view:board.board:0 +msgid "Registrations by Events" +msgstr "Inscripcions per eveniment" diff --git a/addons/board_manufacturing/i18n/nl.po b/addons/board_manufacturing/i18n/nl.po index ff549ec53ab..d3b0991b311 100644 --- a/addons/board_manufacturing/i18n/nl.po +++ b/addons/board_manufacturing/i18n/nl.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-12-14 21:34+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2010-04-22 08:52+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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:00+0000\n" +"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board_manufacturing @@ -44,7 +44,7 @@ msgstr "Fabricage dashboard" #. module: board_manufacturing #: model:ir.ui.menu,name:board_manufacturing.next_id_87 msgid "Production" -msgstr "" +msgstr "Productie" #. module: board_manufacturing #: constraint:ir.actions.act_window:0 diff --git a/addons/crm/crm_mailgate.py b/addons/crm/crm_mailgate.py index 65ca7626468..7ffc6c26ec5 100644 --- a/addons/crm/crm_mailgate.py +++ b/addons/crm/crm_mailgate.py @@ -23,6 +23,7 @@ import time import re import os +import binascii import mx.DateTime import base64 @@ -72,6 +73,19 @@ class crm_cases(osv.osv): res = self.create(cr, uid, vals, context) cases = self.browse(cr, uid, [res]) self._history(cr, uid, cases, _('Receive'), history=True, details=body, email_from=msg_from, message_id=msg.get('id')) + + attachents = msg.get('attachments', []) + for attactment in attachents or []: + data_attach = { + 'name': attactment, + 'datas':binascii.b2a_base64(str(attachents.get(attactment))), + 'datas_fname': attactment, + 'description': 'Mail attachment', + 'res_model': self._name, + 'res_id': res, + } + self.pool.get('ir.attachment').create(cr, uid, data_attach) + return res def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}): diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 0d4bb763556..f3c178afb74 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -704,9 +704,9 @@ - view.res.partner.form.crm.inherited2 + view.res.partner.tree.crm.inherited2 res.partner - form + tree @@ -718,9 +718,9 @@ - view.res.partner.form.crm.inherited3 + view.res.partner.search.crm.inherited3 res.partner - form + search diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py index 434035cd2df..7054c77cb90 100644 --- a/addons/crm/wizard/crm_send_email.py +++ b/addons/crm/wizard/crm_send_email.py @@ -97,7 +97,6 @@ class crm_send_new_email(osv.osv_memory): } flag = False if case.section_id and case.section_id.server_id: - flag = smtp_pool.send_email( cr=cr, uid=uid, diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po index 8228774e5a6..960675791c1 100644 --- a/addons/delivery/i18n/nl.po +++ b/addons/delivery/i18n/nl.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-09-08 15:27+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-04-22 09:04+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: delivery @@ -41,7 +41,7 @@ msgstr "Afleveradres" #. module: delivery #: model:product.template,name:delivery.delivery_product_product_template msgid "Delivery by Poste" -msgstr "" +msgstr "Aflevering per post" #. module: delivery #: constraint:ir.ui.view:0 @@ -51,7 +51,7 @@ msgstr "Ongeldige XML voor overzicht" #. module: delivery #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Fout! U kunt geen recursieve geassocieerde leden aanmaken." #. module: delivery #: field:delivery.grid,state_ids:0 @@ -61,12 +61,14 @@ msgstr "Provincies" #. module: delivery #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de definitie van de actie." #. module: delivery #: help:res.partner,property_delivery_carrier:0 msgid "This delivery method will be used when invoicing from packing." msgstr "" +"Deze leveringsmethode wordt gebruikt bij het \"Facturering op basis van " +"verzending\"" #. module: delivery #: model:ir.model,name:delivery.model_delivery_grid @@ -123,7 +125,7 @@ msgstr "Planning" #. module: delivery #: view:res.partner:0 msgid "Deliveries Properties" -msgstr "" +msgstr "Afleveringseigenschappen" #. module: delivery #: field:delivery.carrier,active:0 @@ -234,7 +236,7 @@ msgstr "Maximumwaarde" #. module: delivery #: wizard_button:delivery.sale.order,init,delivery:0 msgid "Add Delivery Costs" -msgstr "" +msgstr "Afleveringskosten toevoegen" #. module: delivery #: wizard_field:delivery.sale.order,init,carrier_id:0 @@ -247,7 +249,7 @@ msgstr "Verzendwijze" #. module: delivery #: field:sale.order,id:0 msgid "ID" -msgstr "" +msgstr "ID" #. module: delivery #: field:delivery.grid.line,operator:0 @@ -257,7 +259,7 @@ msgstr "Operator" #. module: delivery #: model:ir.module.module,shortdesc:delivery.module_meta_information msgid "Carriers and deliveries" -msgstr "" +msgstr "Transporteurs en leveringen" #. module: delivery #: field:delivery.carrier,grids_id:0 @@ -288,6 +290,10 @@ msgid "" "define your own carrier and delivery grids for prices. When creating " "invoices from picking, Open ERP is able to add and compute the shipping line." msgstr "" +"Hiermee kunt u afleveringsmethoden toe voegen in verkooporders en picking. U " +"kunt uw eigen transporteur en leveringsroosters met prijzen configureren. " +"Bij het aanmaken van facturen op basis van verzending, is OpenERP in staat " +"om een verzendregel te berekenen en toe te voegen aan de factuur." #. module: delivery #: field:delivery.grid,zip_to:0 @@ -298,18 +304,18 @@ msgstr "Poscode Afleverradres" #: model:ir.actions.act_window,name:delivery.action_picking_tree4 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3 msgid "Packing to be invoiced" -msgstr "" +msgstr "Te factureren verzending" #. module: delivery #: help:sale.order,carrier_id:0 msgid "" "Complete this field if you plan to invoice the shipping based on packing." -msgstr "" +msgstr "Vul dit veld in als u van plan te facturen op basis van verzending." #. module: delivery #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add msgid "Delivery Costs" -msgstr "" +msgstr "Afleveringskosten" #. module: delivery #: field:delivery.grid.line,list_price:0 diff --git a/addons/document_email/__init__.py b/addons/document_email/__init__.py new file mode 100644 index 00000000000..40d4f14c4d1 --- /dev/null +++ b/addons/document_email/__init__.py @@ -0,0 +1,24 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# fp@tinyerp.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +import document_email diff --git a/addons/document_email/__openerp__.py b/addons/document_email/__openerp__.py new file mode 100644 index 00000000000..5f628b2a02c --- /dev/null +++ b/addons/document_email/__openerp__.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# fp@tinyerp.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +{ + "name" : "Email Integrated Document", + "version" : "1.1", + "depends" : ["base", "document", "mail_gateway"], + "author" : "Tiny", + "description": """Email Integrated Document + * Email based Document submission + * user based document subission + """, + 'author': 'Tiny', + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'update_xml': [ + "document_email.xml" + ], + 'demo_xml': [ + + ], + 'installable': True, + 'active': False +} diff --git a/addons/document_email/document_email.py b/addons/document_email/document_email.py new file mode 100644 index 00000000000..a4406f7a4d5 --- /dev/null +++ b/addons/document_email/document_email.py @@ -0,0 +1,115 @@ +#!/usr/bin/env python +#-*- coding:utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved +# fp@tinyerp.com +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## + +import os +import binascii + +import netsvc + +from osv import osv +from osv import fields +from tools.translate import _ + +logger = netsvc.Logger() + +class email_to_document(osv.osv): + + _name = 'document.email' + _description = "Emails to Documents Gateway" + + _columns = { + 'name':fields.char('Name', size=64, required=True, readonly=False), + 'user_id':fields.many2one('res.users', 'User', required=True), + 'directory_id':fields.many2one('document.directory', 'Directory', required=True), + 'accept_files':fields.char('File Extension', size=1024, required=True), + 'note': fields.text('Description'), + 'server_id': fields.many2one('email.server',"Mail Server", select=True), + } + + _defaults = { + 'accept_files': lambda *a: "['.txt', '.ppt', '.doc', '.xls', '.pdf', '.jpg', '.png']", + 'user_id': lambda self, cr, uid, ctx: uid, + } + + _sql_constraints = [ + ('name_uniq', 'unique (user_id, server_id)', 'You can not configure one serve for multiple directory !'), + ] + + def message_new(self, cr, uid, msg, context): + """ + Automatically calls when new email message arrives + + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks + """ + server_id = context.get('server_id', False) + file_pool = self.pool.get('ir.attachment') + if server_id: + ids = self.search(cr, uid, [('server_id', '=', server_id)]) + dr = self.browse(cr, uid, ids[0]) + id = dr.directory_id.id + + partner = self.pool.get('email.server.tools').get_partner(cr, uid, msg.get('from'), context) + ext = eval(dr.accept_files, {}) + attachents = msg.get('attachments', []) + + for attactment in attachents: + file_ext = os.path.splitext(attactment) + if file_ext[1] not in ext: + logger.notifyChannel('document', netsvc.LOG_WARNING, 'file type %s is not allows to process for directory %s' % (file_ext[1], dr.directory_id.name)) + continue + + data_attach = { + 'name': attactment, + 'datas':binascii.b2a_base64(str(attachents.get(attactment))), + 'datas_fname': attactment, + 'description': msg.get('body', 'Mail attachment'), + 'parent_id': id, + 'partner_id':partner.get('partner_id', False), + 'res_model': 'document.directory', + 'res_id': id, + } + file_pool.create(cr, uid, data_attach) + + return id + return 0 + + def message_update(self, cr, uid, ids, vals={}, msg="", default_act=None, context={}): + """ + @param self: The object pointer + @param cr: the current row, from the database cursor, + @param uid: the current user’s ID for security checks, + @param ids: List of update mail’s IDs + """ + logger.notifyChannel('document', netsvc.LOG_WARNING, 'method not implement to keep multipe version of file') + return True +email_to_document() + +class document_directory(osv.osv): + _inherit = 'document.directory' + + _columns = { + 'email_ids':fields.one2many('document.email', 'directory_id', 'Document to Email', required=False), + } +document_directory() diff --git a/addons/document_email/document_email.xml b/addons/document_email/document_email.xml new file mode 100644 index 00000000000..9dd550acd7c --- /dev/null +++ b/addons/document_email/document_email.xml @@ -0,0 +1,103 @@ + + + + + + document.directory + document.directory + form + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +
+ + + + + + + + document.email.tree + document.email + tree + + + + + + + + + + + document.email.form + document.email + form + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + Email to Document + document.email + form + tree,form + + {} + [] + + + + + + diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 565c4434607..feb88b57136 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -117,7 +117,7 @@ def html2plaintext(html, body_id=None, encoding='utf-8'): html += '[%s] %s\n' % (i+1, url) return html -class mail_server(osv.osv): +class email_server(osv.osv): _name = 'email.server' _description = "POP/IMAP Server" @@ -144,13 +144,14 @@ class mail_server(osv.osv): 'action_id':fields.many2one('ir.actions.server', 'Reply Email', required=False, domain="[('state','=','email')]"), 'object_id': fields.many2one('ir.model',"Model", required=True), 'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly',False)]}, help="Priority between 0 to 10, select define the order of Processing"), + 'user_id':fields.many2one('res.users', 'User', required=False), } _defaults = { -# 'type': lambda *a: "imap", 'state': lambda *a: "draft", 'active': lambda *a: True, 'priority': lambda *a: 5, 'date': lambda *a: time.strftime('%Y-%m-%d'), + 'user_id': lambda self, cr, uid, ctx: uid, } def check_duplicate(self, cr, uid, ids): @@ -176,6 +177,9 @@ class mail_server(osv.osv): return {'value':{'port':port}} def _process_email(self, cr, uid, server, message, context={}): + context.update({ + 'server_id':server.id + }) history_pool = self.pool.get('mail.server.history') msg_txt = email.message_from_string(message) message_id = msg_txt.get('Message-ID', False) @@ -289,16 +293,16 @@ class mail_server(osv.osv): logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s' % (model_pool._name)) return False - for attactment in attachents or []: - data_attach = { - 'name': attactment, - 'datas':binascii.b2a_base64(str(attachents.get(attactment))), - 'datas_fname': attactment, - 'description': 'Mail attachment', - 'res_model': server.object_id.model, - 'res_id': res_id, - } - self.pool.get('ir.attachment').create(cr, uid, data_attach) +# for attactment in attachents or []: +# data_attach = { +# 'name': attactment, +# 'datas':binascii.b2a_base64(str(attachents.get(attactment))), +# 'datas_fname': attactment, +# 'description': 'Mail attachment', +# 'res_model': server.object_id.model, +# 'res_id': res_id, +# } +# self.pool.get('ir.attachment').create(cr, uid, data_attach) if server.action_id: action_pool = self.pool.get('ir.actions.server') @@ -322,13 +326,10 @@ class mail_server(osv.osv): return self.fetch_mail(cr, uid, ids, context) def fetch_mail(self, cr, uid, ids, context={}): - fp = os.popen('ping www.google.com -c 1 -w 5',"r") - if not fp.read(): - logger.notifyChannel('imap', netsvc.LOG_WARNING, 'No address associated with hostname !') - for server in self.browse(cr, uid, ids, context): logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name)) + count = 0 try: if server.type == 'imap': imap_server = None @@ -363,7 +364,6 @@ class mail_server(osv.osv): pop_server.list() (numMsgs, totalSize) = pop_server.stat() - count = 0 for num in range(1, numMsgs + 1): (header, msges, octets) = pop_server.retr(num) msg = '\n'.join(msges) @@ -379,7 +379,7 @@ class mail_server(osv.osv): return True -mail_server() +email_server() class mail_server_history(osv.osv): @@ -404,10 +404,7 @@ class mail_server_history(osv.osv): mail_server_history() class fetchmail_tool(osv.osv): - """ - OpenERP Model : fetchmail_tool - """ - + _name = 'email.server.tools' _description = "Email Tools" _auto = False diff --git a/addons/fetchmail/fetchmail_data.xml b/addons/fetchmail/fetchmail_data.xml index ef40a76489f..d9f35874356 100644 --- a/addons/fetchmail/fetchmail_data.xml +++ b/addons/fetchmail/fetchmail_data.xml @@ -12,4 +12,20 @@ + + + + User wise Server + + + + + + + = + user.id + + + + diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po new file mode 100644 index 00000000000..b5359a8e82d --- /dev/null +++ b/addons/google_map/i18n/oc.po @@ -0,0 +1,48 @@ +# Occitan (post 1500) translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-08-28 16:01+0000\n" +"PO-Revision-Date: 2010-04-22 12:06+0000\n" +"Last-Translator: Cédric VALMARY (Tot en òc) \n" +"Language-Team: Occitan (post 1500) \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-23 03:45+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: google_map +#: model:ir.actions.wizard,name:google_map.wizard_google_map +msgid "Launch Google Map" +msgstr "Aviar Google Map" + +#. module: google_map +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML invalid per l'arquitectura de la vista" + +#. module: google_map +#: view:res.partner:0 +#: view:res.partner.address:0 +msgid "Street2 : " +msgstr "Adreça seguida : " + +#. module: google_map +#: model:ir.module.module,description:google_map.module_meta_information +msgid "" +"The module adds google map field in partner address\n" +"so that we can directly open google map from the\n" +"url widget." +msgstr "" + +#. module: google_map +#: view:res.partner:0 +#: view:res.partner.address:0 +msgid "Map" +msgstr "Mapa" diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po index e3acd524000..661e079515f 100644 --- a/addons/hr/i18n/sv.po +++ b/addons/hr/i18n/sv.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: 2010-03-09 21:10+0000\n" -"Last-Translator: Anders Eriksson (Mobila System) \n" +"PO-Revision-Date: 2010-04-21 15:10+0000\n" +"Last-Translator: djn (XCLUDE) \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:16+0000\n" +"X-Launchpad-Export-Date: 2010-04-22 03:43+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr @@ -189,7 +189,7 @@ msgstr "Medlemmar" #. module: hr #: field:hr.employee,ssnid:0 msgid "SSN No" -msgstr "" +msgstr "Personnummer" #. module: hr #: model:process.transition,note:hr.process_transition_contactofemployee0 @@ -315,7 +315,7 @@ msgstr "Aktiv" #. module: hr #: constraint:hr.employee:0 msgid "Error ! You cannot create recursive Hierarchy of Employees." -msgstr "" +msgstr "Fel! Du kan inte skapa omvänd rangordning av anställda." #. module: hr #: model:process.process,name:hr.process_process_employeecontractprocess0 diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po index 02819b8cfe7..e8501d64af1 100644 --- a/addons/hr_holidays/i18n/nl.po +++ b/addons/hr_holidays/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-12-11 20:08+0000\n" -"Last-Translator: Pieter J. Kersten (EduSense BV) \n" +"PO-Revision-Date: 2010-04-22 09:05+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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:15+0000\n" +"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays @@ -600,7 +600,7 @@ msgstr "Verlofaanvraag" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting msgid "Holidays Requests Awaiting for Validation" -msgstr "" +msgstr "Verlofaanvragen wachtend op bevestiging" #. module: hr_holidays #: view:hr.holidays:0 diff --git a/addons/profile_manufacturing/i18n/nl.po b/addons/profile_manufacturing/i18n/nl.po index 3b07c5da62a..43fc7db315a 100644 --- a/addons/profile_manufacturing/i18n/nl.po +++ b/addons/profile_manufacturing/i18n/nl.po @@ -7,24 +7,24 @@ 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-15 09:57+0000\n" -"Last-Translator: The Loeki \n" +"PO-Revision-Date: 2010-04-22 10:54+0000\n" +"Last-Translator: Jan Verlaan (Veritos) \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-21 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-04-23 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0 msgid "Manufacturing Operations" -msgstr "" +msgstr "Productie operaties" #. module: profile_manufacturing #: model:ir.module.module,description:profile_manufacturing.module_meta_information msgid "Profile for manufacturing industries" -msgstr "" +msgstr "Profiel voor productie industrie" #. module: profile_manufacturing #: constraint:ir.model:0 @@ -36,22 +36,22 @@ msgstr "" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0 msgid "Just in Time Scheduling" -msgstr "" +msgstr "Just in time planning" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,sale_journal:0 msgid "Manage by Journals" -msgstr "" +msgstr "Beheer middels dagboeken" #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 msgid "Relationship Management" -msgstr "" +msgstr "Relatiebeheer" #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,portal:0 msgid "This module allows you to manage a Portal system." -msgstr "" +msgstr "Deze module helpt u het portaal-systeem te beheren." #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,board_document:0 @@ -61,6 +61,11 @@ msgid "" "documents, printed reports, calendar system). It opens an FTP access for the " "users to easily browse association's document." msgstr "" +"Met het documentbeheersysteem van OpenERP kunt u allerlei documenten " +"(interne documenten, afgedrukte overzichten, agenda's) opslaan, " +"doorbladeren, automatisch indexeren, zoeken en inzien.\r\n" +"Het systeem maakt gebruik van FTP toegang zodat gebruikers eenvoudig bij de " +"documenten kunnen komen." #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0 @@ -69,17 +74,20 @@ msgid "" "journals. You can define journals for trucks, salesman, departments, " "invoicing date delivery period, etc." msgstr "" +"Deze module help u uw verkopen, facturatie en materiaal picking the beheren " +"middels dagboeken. U kunt dagboeken definiëren voor vrachtwagens, verkopers, " +"afdelingen, factuurdatum aflever periode, enz." #. module: profile_manufacturing #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Ongeldige modelnaam in de definitie van de actie." #. module: profile_manufacturing #: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module #: view:profile.manufacturing.config.install_modules_wizard:0 msgid "Manufacturing Profile: Install Extra Modules" -msgstr "" +msgstr "Installeer extra modulen" #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0 @@ -88,6 +96,11 @@ msgid "" "and faster for real time stock computation but, in counter-part, it manages " "less efficiently priorities in procurements." msgstr "" +"De JIT (Just in Time) module stelt u in staat een directe mrp-planningsrun " +"van het actieve product bij wijzigingen te laten uitvoeren. Dit is " +"makkelijker en sneller in gebruik voor real time voorraad berekening, maar " +"heeft als nadeel dat het minder efficiënt prioriteiten kan stellen bij " +"genereren van inkoopaanvragen." #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0 @@ -96,16 +109,20 @@ msgid "" "work order/operation. You will be able to planify, analyse the cost, check " "times, ... on all operations of each manufacturing order" msgstr "" +"Deze module stelt u in staat om niet alleen de productie order te beheren, " +"maar ook de operaties. U zult in staat zijn om te plannen, haar kosten te " +"analyseren, tijden te controleren, ... over alle operaties van elke " +"productieorder." #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,board_document:0 msgid "Document Management" -msgstr "" +msgstr "Documentbeheer" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,portal:0 msgid "Portal" -msgstr "" +msgstr "Portaal" #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 @@ -118,6 +135,8 @@ msgid "" "Allow to manage product repairs. Handle the guarantee limit date and the " "invoicing of products and services." msgstr "" +"Deze module stelt u in staat om productreparaties te beheren. Beheer " +"garantietermeinen en de facturatie van producten en services." #. module: profile_manufacturing #: constraint:ir.ui.view:0 @@ -131,21 +150,27 @@ msgid "" "manufacturing profile you selected. You will be able to install them based " "on our requirements." msgstr "" +"Installeer meer modules. Enkele modules worden voorgesteld in " +"overeenstemming met dit productieprofiel dat u heeft geselecteerd. U zult in " +"staat om deze modules te installeren waarbij OpenERP rekening houd met de " +"benodigde afhankelijkheden." #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0 msgid "This module allows you to add sub poducts in mrp bom." msgstr "" +"Deze module stelt u in staat om subproducten toe te voegen in de BOM (Bill " +"of Materials)" #. module: profile_manufacturing #: model:ir.module.module,shortdesc:profile_manufacturing.module_meta_information msgid "Manufacturing industry profile" -msgstr "" +msgstr "Productie industrie profiel" #. module: profile_manufacturing #: model:ir.model,name:profile_manufacturing.model_profile_manufacturing_config_install_modules_wizard msgid "profile.manufacturing.config.install_modules_wizard" -msgstr "" +msgstr "profile.manufacturing.config.install_modules_wizard" #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0 @@ -154,6 +179,9 @@ msgid "" "opportunities tracking, shared calendar, jobs tracking, bug tracker, and so " "on." msgstr "" +"Deze module installeert de Customer Relation Management (CRM) uitbreidingen " +"als: volgen van leads en kansen, gedeelde agenda's, HRM werving- & " +"selectieproces, foutenrapportbeheer, enz." #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 @@ -163,7 +191,7 @@ msgstr "Installeren" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,sale_crm:0 msgid "CRM and Calendars" -msgstr "" +msgstr "CRM en calenders" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0 @@ -173,7 +201,7 @@ msgstr "Reparatie" #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0 msgid "Display margins on the sale order form." -msgstr "" +msgstr "Toont marges op het verkooporderformulier." #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0 @@ -183,16 +211,20 @@ msgid "" "a perfect ergonomy with touchscreen materials and payment processing " "hardware." msgstr "" +"Deze module stelt u in staat om een kassa systeem (POS) te beheren. Het bied " +"een basis formulier voor kassa operaties. Selecteert u ook onze " +"gebruikersinterface kassa systeem voor een uitstekende ergonomy met " +"touchscreen schermen en betaalautomaten hardware." #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,mrp_subproduct:0 msgid "Mrp Sub Product" -msgstr "" +msgstr "Mrp sub-product" #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 msgid "Sales Management" -msgstr "" +msgstr "Verkoopbeheer" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,warning:0 @@ -213,6 +245,11 @@ msgid "" "managing a manufacturing chain, a quality control location, product that you " "rent, etc." msgstr "" +"Stelt u in staat om geavanceerde logistiek te beheren met diverse locaties " +"en magazijnen. U kunt per product definiëren: standaard locaties voor " +"verschillende operaties, etc. Deze module wordt vaak gebruikt voor " +"lokalisatie van producten, beheren van en productieketen, kwaliteitscontrole " +"lokaties, bij verhuur van producten, enz." #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py index abbc0ed66f0..fe72c96d7e2 100644 --- a/addons/purchase_requisition/purchase_requisition.py +++ b/addons/purchase_requisition/purchase_requisition.py @@ -39,24 +39,18 @@ class purchase_requisition(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True), 'purchase_ids' : fields.one2many('purchase.order','requisition_id','Purchase Orders'), 'line_ids' : fields.one2many('purchase.requisition.line','requisition_id','Products to Purchase'), - 'state': fields.selection([('draft','Draft'),('open','Open'),('cancel','Cancelled'),('close','Close'),('done','Done')], 'State', required=True) + 'state': fields.selection([('draft','Draft'),('in_progress','In Progress'),('cancel','Cancelled'),('done','Done')], 'State', required=True) } _defaults = { 'date_start': lambda *args: time.strftime('%Y-%m-%d %H:%M:%S'), - 'state': lambda *args: 'open', + 'state': lambda *args: 'draft', 'exclusive': lambda *args: 'multiple', 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id, 'user_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).id , 'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'), } - def tender_close(self, cr, uid, ids, context={}): - self.write(cr, uid, ids, {'state': 'done', 'date_end': time.strftime('%Y-%m-%d %H:%M:%S')}) - return True - - def tender_open(self, cr, uid, ids, context={}): - self.write(cr, uid, ids, {'state':'open'}, context=context) - return True + def tender_cancel(self, cr, uid, ids, context={}): purchase_order_obj = self.pool.get('purchase.order') for purchase in self.browse(cr, uid, ids): @@ -65,14 +59,14 @@ class purchase_requisition(osv.osv): purchase_order_obj.action_cancel(cr,uid,[purchase_id.id]) self.write(cr, uid, ids, {'state': 'cancel'}) return True - def tender_confirm(self, cr, uid, ids, context={}): - self.write(cr, uid, ids, {'state':'done','date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context) + def tender_in_progress(self, cr, uid, ids, context={}): + self.write(cr, uid, ids, {'state':'in_progress'} ,context=context) return True def tender_reset(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'draft'}) return True def tender_done(self, cr, uid, ids, context={}): - self.write(cr, uid, ids, {'state':'done'}, context=context) + self.write(cr, uid, ids, {'state':'done', 'date_end':time.strftime('%Y-%m-%d %H:%M:%S')}, context=context) return True @@ -84,7 +78,7 @@ class purchase_requisition_line(osv.osv): _description="Purchase Requisition Line" _rec_name = 'product_id' _columns = { - 'product_id': fields.many2one('product.product', 'Product'), + 'product_id': fields.many2one('product.product', 'Product' , domain=[('purchase_requisition', '=', True)]), 'product_uom_id': fields.many2one('product.uom', 'Product UoM'), 'product_qty': fields.float('Quantity', digits=(16,2)), 'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition', ondelete='cascade'), @@ -156,7 +150,7 @@ class mrp_procurement(osv.osv): procurement = self.browse(cr, uid, proc_id) if procurement.product_id.purchase_requisition: self.pool.get('purchase.requisition').create(cr, uid, { - 'name': procurement.name, + 'name': sequence_obj.get(cr, uid, 'purchase.order.requisition'), 'origin': procurement.name, 'date_end': procurement.date_planned, 'line_ids': [(0,0,{ diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index f5165eaa394..eaf433051c0 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -73,11 +73,10 @@ -