\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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_holidays
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index c5a94bcc69d..c2f7b686f65 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,13 @@ msgid "Set to Draft"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
#, python-format
msgid "Variable Error: %s "
msgstr ""
@@ -254,7 +260,7 @@ msgid "Amount"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:1225
#, python-format
msgid "Please check configuration of %s, payroll head is missing"
msgstr ""
@@ -534,7 +540,8 @@ msgid "#"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:1225
#, python-format
msgid "Error !"
msgstr ""
@@ -637,7 +644,13 @@ msgid "To"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
#, python-format
msgid "Variable Error !"
msgstr ""
@@ -683,18 +696,17 @@ msgstr ""
msgid "Bank Advice Note"
msgstr ""
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contibution Register"
-msgstr ""
-
#. module: hr_payroll
#: view:hr.payroll.register:0
#: view:hr.payslip:0
msgid "Payslip"
msgstr ""
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
#. module: hr_payroll
#: selection:hr.allounce.deduction.categoty,type:0
#: selection:hr.payslip.line,type:0
@@ -878,7 +890,6 @@ msgid "For"
msgstr ""
#. module: hr_payroll
-#: view:hr.passport:0
#: field:hr.passport,contracts_ids:0
msgid "Contracts"
msgstr ""
@@ -1213,7 +1224,9 @@ msgstr ""
#. module: hr_payroll
#: field:company.contribution,register_id:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
#: model:ir.model,name:hr_payroll.model_hr_contibution_register
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
msgid "Contribution Register"
msgstr ""
@@ -1499,7 +1512,7 @@ msgid "Payroll Configurtion"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:469
#, python-format
msgid "Please define bank account for the %s employee"
msgstr ""
diff --git a/addons/hr_payroll/report/payroll_register.rml b/addons/hr_payroll/report/payroll_register.rml
index 4dd2900171a..3fecf454aa1 100644
--- a/addons/hr_payroll/report/payroll_register.rml
+++ b/addons/hr_payroll/report/payroll_register.rml
@@ -206,22 +206,22 @@
Total Salary
|
- [[formatLang(get_basic(), dp='Account')]][[ company.currency_id.symbol]]
+ [[formatLang(get_basic(o), dp='Account')]][[ company.currency_id.symbol]]
|
- [[formatLang(get_other(), dp='Account')]] [[ company.currency_id.symbol]]
+ [[formatLang(get_other(o), dp='Account')]] [[ company.currency_id.symbol]]
|
- [[formatLang(get_allow(), dp='Account')]] [[ company.currency_id.symbol]]
+ [[formatLang(get_allow(o), dp='Account')]] [[ company.currency_id.symbol]]
|
- [[formatLang(get_grows(), dp='Account')]] [[ company.currency_id.symbol]]
+ [[formatLang(get_grows(o), dp='Account')]] [[ company.currency_id.symbol]]
|
- [[formatLang(get_deduct(), dp='Account')]] [[ company.currency_id.symbol]]
+ [[formatLang(get_deduct(o), dp='Account')]] [[ company.currency_id.symbol]]
|
- [[formatLang(get_net(), dp='Account')]] [[ company.currency_id.symbol]]
+ [[formatLang(get_net(o), dp='Account')]] [[ company.currency_id.symbol]]
|
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 6953f24bffa..64882a8c921 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,12 @@ msgstr ""
msgid "Analytic Account for Salary Analysis"
msgstr ""
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
#. module: hr_payroll_account
#: field:hr.contibution.register.line,period_id:0
msgid "Period"
@@ -57,14 +63,13 @@ msgid "Other Informations"
msgstr ""
#. module: hr_payroll_account
-#: field:hr.payroll.register,journal_id:0
-#: field:hr.payslip,journal_id:0
-msgid "Expanse Journal"
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
msgstr ""
#. module: hr_payroll_account
-#: field:hr.employee,salary_account:0
-msgid "Salary Account"
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
msgstr ""
#. module: hr_payroll_account
@@ -83,13 +88,13 @@ msgid "Description"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
#, python-format
msgid "Please Confirm all Expense Invoice appear for Reimbursement"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
#, python-format
msgid "Please defined partner in bank account for %s !"
msgstr ""
@@ -100,7 +105,12 @@ msgid "Accounting Informations"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
#, python-format
msgid "Please defined bank account for %s !"
msgstr ""
@@ -126,19 +136,16 @@ msgid "Payment Lines"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
#, python-format
msgid "Please define fiscal year for perticular contract"
msgstr ""
#. module: hr_payroll_account
-#: help:hr.employee,property_bank_account:0
-msgid "Select Bank Account from where Salary Expanse will be Paid"
-msgstr ""
-
-#. module: hr_payroll_account
-#: help:hr.employee,salary_account:0
-msgid "Expanse account when Salary Expanse will be recorded"
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
msgstr ""
#. module: hr_payroll_account
@@ -205,7 +212,13 @@ msgid "Accounting vouchers"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
#, python-format
msgid "Warning !"
msgstr ""
@@ -230,12 +243,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: hr_payroll_account
-#: field:hr.payslip.account.move,slip_id:0
-#: model:ir.model,name:hr_payroll_account.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
#. module: hr_payroll_account
#: field:hr.payroll.register,period_id:0
#: field:hr.payslip,period_id:0
@@ -248,7 +255,8 @@ msgid "Leave Type"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
#, python-format
msgid "Fiscal Year is not defined for slip date %s"
msgstr ""
@@ -278,7 +286,7 @@ msgid "Salary Structure"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
#, python-format
msgid "Please Configure Partners Receivable Account!!"
msgstr ""
@@ -289,29 +297,28 @@ msgid "Year"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
#, python-format
msgid "Period is not defined for slip date %s"
msgstr ""
-#. module: hr_payroll_account
-#: view:hr.employee:0
-msgid "Accounting"
-msgstr ""
-
#. module: hr_payroll_account
#: view:hr.payslip:0
msgid "Accounting Details"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
#, python-format
msgid "Please Configure Partners Payable Account!!"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
#, python-format
msgid "Integrity Error !"
msgstr ""
diff --git a/addons/hr_payroll_account/i18n/it.po b/addons/hr_payroll_account/i18n/it.po
new file mode 100644
index 00000000000..b80c143ca80
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/it.po
@@ -0,0 +1,324 @@
+# Italian 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2011-01-01 17:08+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \n"
+"Language-Team: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_line_ids:0
+msgid "Accounting Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,bank_journal_id:0
+#: field:hr.payslip,bank_journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register_line
+msgid "Contribution Register Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contibution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,analytic_account:0
+msgid "Analytic Account for Salary Analysis"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register.line,period_id:0
+msgid "Period"
+msgstr "Periodo"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_employee
+msgid "Employee"
+msgstr "Impiegato"
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Other Informations"
+msgstr "Altre informazioni"
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expanse Journal"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
+msgstr "Conto stipendio"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_register
+msgid "Payroll Register"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_account_move
+msgid "Account Move Link to Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Confirm all Expense Invoice appear for Reimbursement"
+msgstr ""
+"Per favore confermare tutte le fatture di spesa che compaiono nei rimborsi"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please defined partner in bank account for %s !"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Informations"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please defined bank account for %s !"
+msgstr "Per favore definire il conto banca per %s!"
+
+#. module: hr_payroll_account
+#: model:ir.module.module,description:hr_payroll_account.module_meta_information
+msgid ""
+"Generic Payroll system Integrated with Accountings\n"
+" * Expanse Encoding\n"
+" * Payment Encoding\n"
+" * Comany Contribution Managemet\n"
+" "
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.module.module,shortdesc:hr_payroll_account.module_meta_information
+msgid "Human Resource Payroll Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+#: field:hr.payslip,move_payment_ids:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please define fiscal year for perticular contract"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expanse will be Paid"
+msgstr ""
+
+#. module: hr_payroll_account
+#: help:hr.employee,salary_account:0
+msgid "Expanse account when Salary Expanse will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Errore! Non è possibile creare gerarchie ricorsive di impiegati."
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Account Lines"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,account_id:0
+#: field:hr.holidays.status,account_id:0
+#: field:hr.payroll.advice,account_id:0
+msgid "Account"
+msgstr "Conto"
+
+#. module: hr_payroll_account
+#: field:hr.employee,property_bank_account:0
+msgid "Bank Account"
+msgstr "Conto bancario"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
+msgid "Payslip Line"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+"Errore! Non è possibile selezionare un reparto per il quale l'impiegato è "
+"manager."
+
+#. module: hr_payroll_account
+#: help:hr.payroll.register,period_id:0
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_advice
+msgid "Bank Advice Note"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,move_id:0
+msgid "Expense Entries"
+msgstr "Voce di spesa"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_ids:0
+msgid "Accounting vouchers"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Attenzione!"
+
+#. module: hr_payroll_account
+#: field:hr.employee,employee_account:0
+msgid "Employee Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payslip.line,account_id:0
+msgid "General Account"
+msgstr "Contabilità Generale"
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_emp:0
+msgid "Total By Employee"
+msgstr "Totale per impiegato"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: hr_payroll_account
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.payroll.register,period_id:0
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_holidays_status
+msgid "Leave Type"
+msgstr "Tipo di permesso"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Fiscal Year is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,analytic_account_id:0
+#: field:hr.employee,analytic_account:0
+#: field:hr.holidays.status,analytic_account_id:0
+#: field:hr.payroll.structure,account_id:0
+#: field:hr.payslip.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Conto Analitico"
+
+#. module: hr_payroll_account
+#: help:hr.employee,employee_account:0
+msgid "Employee Payable Account"
+msgstr ""
+
+#. module: hr_payroll_account
+#: field:hr.contibution.register,yearly_total_by_comp:0
+msgid "Total By Company"
+msgstr ""
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payroll_structure
+msgid "Salary Structure"
+msgstr "Struttura stipendio"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Receivable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.contibution.register:0
+msgid "Year"
+msgstr "Anno"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Period is not defined for slip date %s"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.employee:0
+msgid "Accounting"
+msgstr ""
+
+#. module: hr_payroll_account
+#: view:hr.payslip:0
+msgid "Accounting Details"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Please Configure Partners Payable Account!!"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#, python-format
+msgid "Integrity Error !"
+msgstr "Errore di Integrità!"
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index dbac449f470..1b72377eeec 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -217,7 +217,7 @@ msgid "Previous"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
#: view:hr.applicant:0
#, python-format
msgid "Phone Call"
@@ -249,7 +249,7 @@ msgid "Send New Email"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
#, python-format
msgid "A partner is already defined on this job request."
msgstr ""
@@ -284,11 +284,17 @@ msgid "Good"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
#, python-format
msgid "Error !"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid "Define here your stages of the recruitment process, for example: qualification call, first interview, second interview, refused, hired."
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
#: field:hr.applicant,create_date:0
@@ -699,6 +705,11 @@ msgstr ""
msgid "Are you sure you want to create a partner based on this job request ?"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid "From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content."
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "History"
@@ -739,7 +750,7 @@ msgid "Open"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
#, python-format
msgid "A partner is already existing with the same name."
msgstr ""
@@ -829,7 +840,7 @@ msgid "Refused"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:0
+#: code:addons/hr_recruitment/hr_recruitment.py:412
#, python-format
msgid "Applicant '%s' is being hired."
msgstr ""
@@ -902,7 +913,7 @@ msgid "Assign To"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:0
+#: code:addons/hr_recruitment/hr_recruitment.py:396
#, python-format
msgid "The job request '%s' has been set 'in progress'."
msgstr ""
diff --git a/addons/hr_recruitment/i18n/it.po b/addons/hr_recruitment/i18n/it.po
new file mode 100644
index 00000000000..813477b090f
--- /dev/null
+++ b/addons/hr_recruitment/i18n/it.po
@@ -0,0 +1,943 @@
+# Italian 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2011-01-01 17:07+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \n"
+"Language-Team: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+"Se il campo attivo è impostato su \"falso\", vi permetterà di nascondere il "
+"caso senza rimuoverlo."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr "Assunzioni"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr "Ritardo medio di apertura"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr "# di Casi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr "Dipartimento"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr "Data prossima azione"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr "Lavori"
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr "Email osservatori"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr "Obiettivi"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr "Giorno"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr "Aggiungi nota interna"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr "Cellulare"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr "Messaggi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr "Prossima azione"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr "Sviluppatore Junior"
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr "Laureato"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr "Contatto del partner"
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr "Le mie assunzioni"
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr "Prossima azione"
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr "Assunzioni"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr "Stipendio medio proposto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr "Disponibilità"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr "Precedente"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr "Telefonata"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr "Converti a partner"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr "Statistiche assunzioni"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr "Prossimo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr "Descrizione lavoro"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr "Invia nuova email"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr "Un partner è già definito su questa richiesta di lavoro."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr "Email"
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr "Disponibilità (giorni)"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr "Buono"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "Error !"
+msgstr "Errore!"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr "Data creazione"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr "Data pianificata"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr "Lavoro"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr "Seconda intervista"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr "Stipendio previsto"
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr "Stipendio previsto"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr "Luglio"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr "Oggetto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr "Candidati"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid " Month-1 "
+msgstr " Mese-1 "
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr "Candidato"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr "Fornisce l'ordinamento quando è visualizzata la lista delle fasi-"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr "Contatto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr "Qualifica"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr "Fase dell'assunzione"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr "Fasi"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr "In corso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr "Probabililtà"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr "Settembre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr "Dicembre"
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr "HR - Assunzioni"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr "Info lavoro"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr "Prima intervista"
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr "Stipendio Proposto"
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr "Commerciale"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr "Cerca lavori"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr "Categoria"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr "Nome candidato"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr "Molto Buono"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr "# Casi"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr "Raggruppa per ..."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr "In corso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr "Salario previsto per candidato"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+"Questi indirizzi email verranno aggiunti nel campo CC di tutte le email, in "
+"entrate e uscita, prima di essere spedite. E' necessario separare gli "
+"indirizzi con una virgola"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr "Definizione fase"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr "Riunione"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr "In sospeso"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr "Grado"
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr "Telefono"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr "CC globale"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr "Ottobre"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr "Giugno"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr "Fasi candidato"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr "Rifiutato dalla società"
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr "Giorni per la chiusura"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr "Eccellente"
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr "Attivo"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr "Novembre"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr "Filtri estesi..."
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr "Stipendio medio proposto"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr "Pianifica telefonata"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr "Gennaio"
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr "Queste persone riceveranno email."
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr "Non buono"
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr "Data"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr "Descrizione telefonata"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+"Sei sicuro di volere creare un partner basandosi su questa richiesta lavoro?"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr "Storico"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr "Allegati"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr "Contratto proposto"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr "Categorie candidato"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr "Un partner esiste già con lo stesso nome."
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr "Responsabile"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr "Analisi assunzione"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr "Attuale"
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@YOURCOMPANY.com. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+" "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr "Dettagli"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr "Casi per fasi e stime"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr "Rispondi"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr "Intervista"
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr "Descrizione"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr "Maggio"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr "Contratto firmato"
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr "Rifiutato"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr "Il candidato \"%s\" è stato assunto."
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr "Assunto"
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Emails"
+msgstr "Email"
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr "Febbraio"
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr "Aprile"
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr "Assegnato a"
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:0
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr "La richiesta lavoro \"%s\" è stata impostata a \"in corso\"."
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr "Anno"
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr "Sondaggio"
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index e75c386eb79..3e9e588ee6c 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:41+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid "Service on Timesheet"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Wed"
msgstr ""
@@ -33,7 +33,7 @@ msgid "(Keep empty for current_time)"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "No employee defined for your user !"
msgstr ""
@@ -87,8 +87,8 @@ msgid "janvier"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Mon"
msgstr ""
@@ -141,26 +141,28 @@ msgid "Print Employees Timesheet"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
#, python-format
msgid "Warning !"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "UserError"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
#, python-format
msgid "No cost unit defined for this employee !"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Tue"
msgstr ""
@@ -171,7 +173,7 @@ msgid "Analytic Account"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
#, python-format
msgid "Warning"
msgstr ""
@@ -188,24 +190,19 @@ msgid "Sign In/Out By Project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Sat"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Sun"
msgstr ""
-#. module: hr_timesheet
-#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
-msgid "Working Hours allows you to log your working hours by project every day."
-msgstr ""
-
#. module: hr_timesheet
#: view:hr.analytical.timesheet.employee:0
#: view:hr.analytical.timesheet.users:0
@@ -229,8 +226,8 @@ msgid "Monthly Employees Timesheet"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "July"
msgstr ""
@@ -252,6 +249,11 @@ msgstr ""
msgid "novembre"
msgstr ""
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid "Through Working Hours you can register your working hours by project every day."
+msgstr ""
+
#. module: hr_timesheet
#: model:ir.module.module,description:hr_timesheet.module_meta_information
msgid "\n"
@@ -268,8 +270,8 @@ msgid "\n"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "March"
msgstr ""
@@ -286,8 +288,8 @@ msgid "décembre"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "September"
msgstr ""
@@ -332,13 +334,12 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_sign_in
msgid "Sign in / Sign out by project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Fri"
msgstr ""
@@ -349,7 +350,7 @@ msgid "Sign in / Sign out"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:174
#, python-format
msgid "Analytic journal is not defined for employee %s \n"
"Define an employee for the selected user and assign an analytic journal!"
@@ -377,15 +378,15 @@ msgid "août"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "August"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "June"
msgstr ""
@@ -407,8 +408,8 @@ msgid "Date"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "November"
msgstr ""
@@ -424,15 +425,15 @@ msgid "Closing Date"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "October"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "January"
msgstr ""
@@ -443,8 +444,8 @@ msgid "Key dates"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Thu"
msgstr ""
@@ -481,8 +482,8 @@ msgid "Analysis summary"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "December"
msgstr ""
@@ -554,8 +555,8 @@ msgid "Invoicing"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "May"
msgstr ""
@@ -589,8 +590,8 @@ msgid "Sign In By Project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "February"
msgstr ""
@@ -617,14 +618,14 @@ msgid "octobre"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "April"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:176
#, python-format
msgid "No analytic account defined on the project.\n"
"Please set one or we can not automatically fill the timesheet."
@@ -653,7 +654,7 @@ msgid "Stats by user"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
#, python-format
msgid "No employee defined for this user"
msgstr ""
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index e32300f87dd..f98f901991f 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -7,14 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-12 10:03+0000\n"
-"Last-Translator: Lorenzo Battistini - agilebg.com "
-"\n"
+"PO-Revision-Date: 2011-01-01 16:49+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet \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-12-24 05:30+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet
@@ -291,6 +290,20 @@ msgid ""
"to set up a management by affair.\n"
" "
msgstr ""
+"\n"
+"Questo modulo implementa il sistema timesheet. Ogni impiegato può codificare "
+"e\n"
+"tenere traccia del propio tempo dedicato ai differenti progetti. Un progetto "
+"è un\n"
+"conto analitico e il tempo speso sul progetto genera costi nel\n"
+"conto analitico.\n"
+"\n"
+"Molti report, per tracciamento tempistiche ed impiegati, sono forniti.\n"
+"\n"
+"E completamente integrato con il modulo contabilità costi. Esso vi "
+"permetterà di \n"
+"installare una gestione per affare.\n"
+" "
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 0b69b771880..2007acd6560 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:17+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:17+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:42+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgid "Profit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:68
#, python-format
msgid "Analytic account incomplete"
msgstr ""
@@ -47,11 +47,6 @@ msgstr ""
msgid "Force to use a specific product"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
-msgid "This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically."
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid " 7 Days "
@@ -122,7 +117,6 @@ msgid "Day"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,uom_id:0
#: field:report.account.analytic.line.to.invoice,product_uom_id:0
msgid "UoM"
msgstr ""
@@ -133,8 +127,9 @@ msgid "Account"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:report.random.timesheet:0
-msgid "Random Timesheets"
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
msgstr ""
#. module: hr_timesheet_invoice
@@ -147,11 +142,6 @@ msgstr ""
msgid "Uninvoiced line with billing rate"
msgstr ""
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Random Timesheets Lines"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,account_id:0
msgid "Project"
@@ -163,14 +153,13 @@ msgid "Sale Pricelist"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,amount:0
#: field:report.account.analytic.line.to.invoice,amount:0
msgid "Amount"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:board.board:0
-msgid "Uninvoice Lines With Billing Rate"
+#: view:account.analytic.account:0
+msgid "Reactivate Account"
msgstr ""
#. module: hr_timesheet_invoice
@@ -178,11 +167,6 @@ msgstr ""
msgid "The detail of each work done will be displayed on the invoice"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_board
-msgid "Random Timesheet"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
msgid "Create invoice from timesheet"
@@ -199,12 +183,11 @@ msgid "Analytic account to close"
msgstr ""
#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
-msgid "OpenERP allows you to create default invoicing types. You could need to regularly make discounts based on a specific contract or agreement with a customer. From this menu, you can create additional default types of invoicing that will speed up your invoicing."
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
#: view:report.timesheet.line:0
msgid "Group By..."
msgstr ""
@@ -227,16 +210,13 @@ msgid "Final invoice for analytic account"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
#, python-format
msgid "Analytic Account incomplete"
msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,analytic_account_id:0
-#: field:report.random.timesheet,analytic_account_id:0
#: field:report.timesheet.line,account_id:0
#: field:report_timesheet.account,account_id:0
#: field:report_timesheet.account.date,account_id:0
@@ -307,13 +287,12 @@ msgid "Analytic account"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
#: field:report.analytic.account.close,state:0
msgid "State"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "Data Insufficient!"
msgstr ""
@@ -349,7 +328,7 @@ msgid "Lines to Invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:119
#, python-format
msgid "Error !"
msgstr ""
@@ -381,7 +360,7 @@ msgid "Timesheet Profit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:80
#, python-format
msgid "Partner incomplete"
msgstr ""
@@ -400,11 +379,6 @@ msgstr ""
msgid "July"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_report_random_timesheet
-msgid "Random Timesheet Report"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Printing date"
@@ -428,7 +402,7 @@ msgid "Theorical"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:120
#, python-format
msgid "You can not modify an invoiced analytic line!"
msgstr ""
@@ -470,7 +444,7 @@ msgid "Employee or Journal Name"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
#, python-format
msgid "Invoices"
msgstr ""
@@ -500,9 +474,6 @@ msgid "Currency"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,user_id:0
-#: field:report.random.timesheet,user_id:0
#: view:report.timesheet.line:0
#: field:report.timesheet.line,user_id:0
#: field:report_timesheet.account,user_id:0
@@ -552,6 +523,11 @@ msgstr ""
msgid "From"
msgstr ""
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
#. module: hr_timesheet_invoice
#: help:account.analytic.account,amount_invoiced:0
msgid "Total invoiced"
@@ -616,14 +592,12 @@ msgstr ""
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,date:0
#: field:hr.timesheet.invoice.create.final,date:0
-#: field:random.timesheet.lines,date:0
-#: field:report.random.timesheet,date:0
#: field:report.timesheet.line,date:0
msgid "Date"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:81
#, python-format
msgid "Please fill in the Address field in the Partner: %s."
msgstr ""
@@ -683,14 +657,19 @@ msgid "Credit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:69
#, python-format
msgid "Please fill in the partner and pricelist field in the analytic account:\n"
"%s"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
#, python-format
msgid "Error"
msgstr ""
@@ -707,9 +686,7 @@ msgid "Balance"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,quantity:0
#: field:report.analytic.account.close,quantity:0
-#: field:report.random.timesheet,quantity:0
#: view:report.timesheet.line:0
#: field:report.timesheet.line,quantity:0
#: field:report_timesheet.account,quantity:0
@@ -725,8 +702,6 @@ msgid "Date/Code"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,general_account_id:0
#: field:report.timesheet.line,general_account_id:0
msgid "General Account"
msgstr ""
@@ -783,6 +758,7 @@ msgid "Invoice"
msgstr ""
#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
#: view:hr.timesheet.analytic.cost.ledger:0
#: view:hr.timesheet.analytic.profit:0
#: view:hr.timesheet.invoice.create:0
@@ -790,6 +766,16 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid "OpenERP allows you to create default invoicing types. You might have to regularly assign discounts because of a specific contract or agreement with a customer. From this menu, you can create additional types of invoicing to speed up your invoicing."
+msgstr ""
+
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
@@ -799,7 +785,7 @@ msgid "Timesheet Line"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
#, python-format
msgid "Balance product needed"
msgstr ""
@@ -810,7 +796,7 @@ msgid "Billing Data"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
#, python-format
msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n"
"%s"
@@ -821,22 +807,12 @@ msgstr ""
msgid "Label for the customer"
msgstr ""
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Current"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.cost.ledger:0
#: view:hr.timesheet.analytic.profit:0
msgid "Print"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_random_timesheet_lines
-msgid "Random Timesheet Lines"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
#: selection:report.timesheet.line,month:0
@@ -857,7 +833,7 @@ msgid "The real date of each work will be displayed on the invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
#, python-format
msgid "At least one line has no product !"
msgstr ""
@@ -867,23 +843,11 @@ msgstr ""
msgid "Timesheets to invoice"
msgstr ""
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-#, python-format
-msgid "Please fill a Balance product in the wizard"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:hr.timesheet.analytic.cost.ledger,date1:0
msgid "Start of period"
msgstr ""
-#. module: hr_timesheet_invoice
-#: field:hr.timesheet.invoice.create,time:0
-#: field:hr.timesheet.invoice.create.final,time:0
-msgid "Time spent"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
msgid "Daily Timesheet by Account"
@@ -891,8 +855,6 @@ msgstr ""
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,product:0
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,product_id:0
#: field:report.account.analytic.line.to.invoice,product_id:0
#: view:report.timesheet.line:0
#: field:report.timesheet.line,product_id:0
@@ -910,8 +872,8 @@ msgid "%"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,to_invoice:0
-msgid "Invoicing"
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
msgstr ""
#. module: hr_timesheet_invoice
@@ -934,7 +896,12 @@ msgid "The product that will be used to invoice the remaining amount"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid "This list shows you every task you can invoice to the customer. Select the lines and click the Action button to generate the invoices automatically."
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "No Records Found for Report!"
msgstr ""
@@ -953,11 +920,6 @@ msgstr ""
msgid "This Month"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_lines_board
-msgid "Working Hours"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.cost.ledger:0
msgid "Select Period"
@@ -997,16 +959,6 @@ msgstr ""
msgid "Employees"
msgstr ""
-#. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,name:0
-#: view:report.timesheet.line:0
-#: field:report.timesheet.line,name:0
-#: field:report_timesheet.account,name:0
-#: field:report_timesheet.account.date,name:0
-#: field:report_timesheet.user,name:0
-msgid "Year"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
msgid "Timesheets per day"
@@ -1042,8 +994,8 @@ msgid "Timesheets per account"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,name:0
-msgid "Internal name"
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
msgstr ""
#. module: hr_timesheet_invoice
@@ -1063,10 +1015,9 @@ msgid "Analytic Lines to Invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:hr.timesheet.invoice.create,name:0
-#: field:random.timesheet.lines,name:0
-#: field:report.random.timesheet,name:0
-msgid "Description"
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#, python-format
+msgid "Please fill a Balance product in the wizard"
msgstr ""
#. module: hr_timesheet_invoice
@@ -1085,7 +1036,12 @@ msgid "Cost"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Search Timesheet Lines"
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index f9332bf0e77..ea8f95e8ac9 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-28 08:49+0000\n"
+"PO-Revision-Date: 2011-01-01 07:49+0000\n"
"Last-Translator: OpenERP Administrators \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-12-29 04:54+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
@@ -122,7 +122,7 @@ msgstr "Mostra le tempistiche nello storico dei lavori"
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
msgid "Journals"
-msgstr ""
+msgstr "Libri giornali"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -139,7 +139,7 @@ msgstr "Unità di Misura"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid "Account"
-msgstr ""
+msgstr "Conto"
#. module: hr_timesheet_invoice
#: view:report.random.timesheet:0
@@ -399,6 +399,9 @@ msgid ""
"costs in this analytic account: timesheets, expenses, ...You can configure "
"an automatic invoice rate on analytic accounts."
msgstr ""
+"Riempire questo campo se pianificate di generare automaticamente fatture "
+"basandole sui costi nel conto analitico: timesheet, spese, ... E' possibile "
+"configurare un tasso di fatturazione automatico sui conti analitici."
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
@@ -552,7 +555,7 @@ msgstr ""
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid "Non Assigned timesheets to users"
-msgstr ""
+msgstr "Timesheet non assegnati a utenti"
#. module: hr_timesheet_invoice
#: field:report.timesheet.line,invoice_id:0
@@ -658,7 +661,7 @@ msgstr "Data"
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
#, python-format
msgid "Please fill in the Address field in the Partner: %s."
-msgstr ""
+msgstr "Per favore compilare il campo indirizzo nel partner: %s."
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
@@ -721,6 +724,8 @@ msgid ""
"Please fill in the partner and pricelist field in the analytic account:\n"
"%s"
msgstr ""
+"Per favore compilare il partner e il campo listino nel conto analitico:\n"
+"%s"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
@@ -850,11 +855,14 @@ msgid ""
"Analytic Account:\n"
"%s"
msgstr ""
+"Per favore compilare il partner o cliente e il campo listino di vendita nel "
+"conto analitico:\n"
+"%s"
#. module: hr_timesheet_invoice
#: help:hr_timesheet_invoice.factor,customer_name:0
msgid "Label for the customer"
-msgstr ""
+msgstr "Etichetta per il cliente"
#. module: hr_timesheet_invoice
#: view:random.timesheet.lines:0
@@ -937,7 +945,7 @@ msgstr "Prodotto"
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_uninvoiced_line
msgid "Uninvoice lines with billing rate"
-msgstr ""
+msgstr "Linee non fatturate con tasso di fatturazione"
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
@@ -966,13 +974,13 @@ msgstr "Registro"
#. module: hr_timesheet_invoice
#: help:hr.timesheet.invoice.create.final,balance_product:0
msgid "The product that will be used to invoice the remaining amount"
-msgstr ""
+msgstr "Il prodotto che verrà utilizzato per fatture l'importo rimenente"
#. module: hr_timesheet_invoice
#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
#, python-format
msgid "No Records Found for Report!"
-msgstr ""
+msgstr "Record non trovati per il report!"
#. module: hr_timesheet_invoice
#: view:report_timesheet.invoice:0
@@ -1090,7 +1098,7 @@ msgstr "Unità"
#. module: hr_timesheet_invoice
#: field:account.analytic.line,to_invoice:0
msgid "Type of Invoicing"
-msgstr ""
+msgstr "Tipo di fatturazione"
#. module: hr_timesheet_invoice
#: view:report.account.analytic.line.to.invoice:0
@@ -1122,7 +1130,7 @@ msgstr "Costo"
#. module: hr_timesheet_invoice
#: view:random.timesheet.lines:0
msgid "Search Timesheet Lines"
-msgstr ""
+msgstr "Cerca linee timesheet"
#~ msgid "Visible name"
#~ msgstr "Nome visualizzato"
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index 3a0d1d4ee5c..ed34ea3f432 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-31 00:21+0000\n"
+"PO-Revision-Date: 2010-12-31 10:14+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index d89b56b3b3f..eb6d684e08c 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 09:08+0000\n"
+"PO-Revision-Date: 2010-12-31 08:46+0000\n"
"Last-Translator: Borja López Soilán \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index beab0a3d3da..e517f1d04ea 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:43+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
#: constraint:hr_timesheet_sheet.sheet:0
#, python-format
msgid "You can not have 2 timesheets that overlaps !\n"
@@ -37,7 +37,7 @@ msgid "Service"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "No employee defined for your user !"
msgstr ""
@@ -74,7 +74,7 @@ msgid "Today"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
#, python-format
msgid "Please verify that the total difference of the sheet is lower than %.2f !"
msgstr ""
@@ -146,7 +146,8 @@ msgid "Total Cost"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
#, python-format
msgid "UserError"
msgstr ""
@@ -158,7 +159,8 @@ msgid "Refuse"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
#, python-format
msgid "You cannot enter an attendance date outside the current timesheet dates!"
msgstr ""
@@ -169,7 +171,7 @@ msgid "My Timesheet opens your timesheet so that you can book your activities in
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
#, python-format
msgid "You can not sign in from an other date than today"
msgstr ""
@@ -186,7 +188,7 @@ msgid "Validation"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
#, python-format
msgid "Warning !"
msgstr ""
@@ -311,7 +313,7 @@ msgid "New"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
#, python-format
msgid "You cannot duplicate a timesheet !"
msgstr ""
@@ -322,8 +324,16 @@ msgid "My Total Attendances By Week"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "Error !"
msgstr ""
@@ -360,7 +370,8 @@ msgid "No employee defined"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -382,7 +393,8 @@ msgid "Configuration"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
#, python-format
msgid "You cannot create a timesheet for an employee that does not have any user defined !"
msgstr ""
@@ -509,12 +521,6 @@ msgstr ""
msgid "Timesheet allowed difference(Hours)"
msgstr ""
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#, python-format
-msgid "You can not sign out from an other date than today"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
msgid "The invoice is created based on the timesheet."
@@ -554,7 +560,8 @@ msgid "Current Status"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet !"
msgstr ""
@@ -618,6 +625,11 @@ msgstr ""
msgid "October"
msgstr ""
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid "Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned."
+msgstr ""
+
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
#: selection:timesheet.report,month:0
@@ -659,7 +671,8 @@ msgid "Period"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
#, python-format
msgid "You can not modify an entry in a confirmed timesheet !"
msgstr ""
@@ -696,8 +709,8 @@ msgid "Validated"
msgstr ""
#. module: hr_timesheet_sheet
-#: view:hr.timesheet.current.open:0
-msgid "Open"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
msgstr ""
#. module: hr_timesheet_sheet
@@ -706,13 +719,13 @@ msgid "Timesheet by Accounts"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
#, python-format
msgid "Open Timesheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
#, python-format
msgid "Cannot delete Sheet(s) which are already confirmed !"
msgstr ""
@@ -742,7 +755,7 @@ msgid "Search Timesheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
#, python-format
msgid "The timesheet cannot be validated as it does not contain equal no. of sign ins and sign outs!"
msgstr ""
@@ -796,7 +809,7 @@ msgid "Sign Out"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
#, python-format
msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
msgstr ""
@@ -861,11 +874,6 @@ msgstr ""
msgid "Invoice rate"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Approve"
@@ -888,11 +896,6 @@ msgstr ""
msgid "#Total Attendance"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-msgid "This view allows you to check timesheet sheets following a specific period. You can also encode time spent on a project that is an analytic account and the time spent on a project generate costs on the analytic account."
-msgstr ""
-
#. module: hr_timesheet_sheet
#: field:hr.timesheet.report,cost:0
msgid "Cost"
@@ -918,6 +921,11 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "To Approve"
diff --git a/addons/html_view/i18n/html_view.pot b/addons/html_view/i18n/html_view.pot
index c7c2abe8946..792ee770015 100644
--- a/addons/html_view/i18n/html_view.pot
+++ b/addons/html_view/i18n/html_view.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:43+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index 329f879048a..338d62f84e9 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:44+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgid "March"
msgstr ""
#. module: idea
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/wizard/idea_post_vote.py:92
#, python-format
msgid "Idea must be in 'Open' state before vote for that idea."
msgstr ""
@@ -124,8 +124,9 @@ msgid "Category of ideas"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:0
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/idea.py:253
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#: code:addons/idea/wizard/idea_post_vote.py:92
#, python-format
msgid "Warning !"
msgstr ""
@@ -170,7 +171,7 @@ msgid "# of Lines"
msgstr ""
#. module: idea
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/wizard/idea_post_vote.py:89
#, python-format
msgid "You can not give Vote for this idea more than %s times"
msgstr ""
@@ -597,7 +598,7 @@ msgid "Refused"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:0
+#: code:addons/idea/idea.py:253
#, python-format
msgid "Draft/Accepted/Cancelled ideas Could not be voted"
msgstr ""
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index e934613de1a..8b876bf2426 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:44+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index bb22fb28b29..3dcd59e76ec 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 13:51+0000\n"
+"PO-Revision-Date: 2010-12-31 11:01+0000\n"
"Last-Translator: Wei \"oldrev\" Li \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: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: knowledge
diff --git a/addons/l10n_be/i18n/l10n_be.pot b/addons/l10n_be/i18n/l10n_be.pot
index 071d8436301..d91b04398c4 100644
--- a/addons/l10n_be/i18n/l10n_be.pot
+++ b/addons/l10n_be/i18n/l10n_be.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,14 +16,82 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
-msgid "Tiers - Recevable"
+#: field:partner.vat,test_xml:0
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
msgstr ""
#. module: l10n_be
-#: field:l1on_be.vat.declaration,tax_code_id:0
-#: field:partner.vat.intra,tax_code_id:0
-msgid "Tax Code"
+#: field:vat.listing.clients,name:0
+msgid "Client Name"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr ""
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Data Insufficient!"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Create XML"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:150
+#, python-format
+msgid "Save"
msgstr ""
#. module: l10n_be
@@ -32,20 +100,38 @@ msgid "Régime Intra-Communautaire"
msgstr ""
#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat_intra
-#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
-msgid "Partner VAT Intra"
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list,msg:0
+msgid "File created"
msgstr ""
#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:116
#, python-format
msgid "Save XML For Vat declaration"
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_immo
-msgid "Immobilisation"
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_resitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
msgstr ""
#. module: l10n_be
@@ -55,13 +141,122 @@ msgid "Company"
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_payable
-msgid "Tiers - Payable"
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list
+msgid "partner.vat.list"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
+msgid "Belgium - Plan Comptable Minimum Normalise"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "Select Fiscal Year"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_resitution:0
+msgid "Ask Restitution"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_intra
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
+msgid "Partner VAT Intra"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
+#: view:l1on_be.vat.declaration:0
+msgid "Periodical VAT Declaration"
msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
-msgid "Save XML"
+msgid "Note: "
+msgstr ""
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
+msgid "Régime National"
+msgstr ""
+
+#. module: l10n_be
+#: view:vat.listing.clients:0
+msgid "VAT listing"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr ""
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat,limit_amount:0
+msgid "Limit Amount"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,no_vat:0
+msgid "The Partner whose VAT number is not defined they doesn't include in XML File."
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,vat:0
+msgid "VAT"
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,country:0
+msgid "Country"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid "Tick this case only if it concerns only the last statement on the civil or cessation of activity"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_ids:0
+msgid "Select here the period(s) you want to include in your intracom declaration"
msgstr ""
#. module: l10n_be
@@ -69,14 +264,57 @@ msgstr ""
msgid "Amount"
msgstr ""
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_vat_listing_clients
+msgid "vat.listing.clients"
+msgstr ""
+
#. module: l10n_be
#: view:l1on_be.vat.declaration:0
msgid "Is Last Declaration"
msgstr ""
#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_vat_listing_clients
-msgid "vat.listing.clients"
+#: model:ir.model,name:l10n_be.model_partner_vat
+msgid "partner.vat"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "Data Insufficient"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,turnover:0
+msgid "Turnover"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
msgstr ""
#. module: l10n_be
@@ -86,13 +324,21 @@ msgid "This identifies the representative of the sending company. This is a stri
msgstr ""
#. module: l10n_be
-#: field:vat.listing.clients,vat:0
-msgid "VAT"
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
msgstr ""
#. module: l10n_be
-#: field:vat.listing.clients,turnover:0
-msgid "Turnover"
+#: field:partner.vat,mand_id:0
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list,file_save:0
+msgid "Save File"
msgstr ""
#. module: l10n_be
@@ -108,125 +354,26 @@ msgid "This is where you have to set the period code for the intracom declaratio
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tax
-msgid "Tax"
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list,name:0
+msgid "File Name"
msgstr ""
#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
#, python-format
-msgid "No VAT Number Associated with Main Company!"
+msgid "Wrong Period Code"
msgstr ""
#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
+#: field:partner.vat,fyear:0
+msgid "Fiscal Year"
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_financiers
-msgid "Financier"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat:0
-msgid "View Client"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Please select at least one Period."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
-msgid "Régime National"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Data Insufficient!"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.list,partner_ids:0
-msgid "You can remove clients/partners which you do not want to show in xml file"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Save"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "General Information"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,file_save:0
-#: field:partner.vat.intra,file_save:0
-#: field:partner.vat.list,file_save:0
-msgid "Save File"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "Select Fiscal Year"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid "Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers
-msgid "Tiers"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "You can remove clients/partners which you do not want in exported xml file"
-msgstr ""
-
-#. module: l10n_be
-#: help:l1on_be.vat.declaration,client_nihil:0
-msgid "Tick this case only if it concerns only the last statement on the civil or cessation of activity"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,test_xml:0
-#: field:partner.vat.intra,test_xml:0
-msgid "Test XML file"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Save xml"
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
msgstr ""
#. module: l10n_be
@@ -235,100 +382,6 @@ msgstr ""
msgid "European Countries"
msgstr ""
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Create an XML file for Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Partner VAT intra"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,msg:0
-#: field:partner.vat.intra,msg:0
-#: field:partner.vat.list,msg:0
-msgid "File created"
-msgstr ""
-
-#. module: l10n_be
-#: help:l1on_be.vat.declaration,ask_resitution:0
-msgid "It indicates whether a resitution is to made or not?"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat_list
-msgid "partner.vat.list"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,ask_resitution:0
-msgid "Ask Restitution"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.intra,no_vat:0
-msgid "The Partner whose VAT number is not defined they doesn't include in XML File."
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
-msgid "Vat Declaraion"
-msgstr ""
-
-#. module: l10n_be
-#: view:vat.listing.clients:0
-msgid "VAT listing"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_produit
-msgid "Produit"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,limit_amount:0
-msgid "Limit Amount"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
-msgid "Partner Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,mand_id:0
-#: field:partner.vat.intra,mand_id:0
-msgid "MandataireId"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Wrong Period Code"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
-msgid "Vat Declaration"
-msgstr ""
-
#. module: l10n_be
#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
#: view:partner.vat:0
@@ -337,13 +390,37 @@ msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
-#: field:partner.vat.intra,no_vat:0
-msgid "Partner With No VAT"
+msgid "General Information"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.list,partner_ids:0
+msgid "You can remove clients/partners which you do not want to show in xml file"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "You can remove clients/partners which you do not want in exported xml file"
msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
-msgid "Periods"
+msgid "Create an XML file for Vat Intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "View Client"
msgstr ""
#. module: l10n_be
@@ -359,145 +436,9 @@ msgid "Close"
msgstr ""
#. module: l10n_be
-#: field:partner.vat.intra,period_ids:0
-msgid "Period (s)"
-msgstr ""
-
-#. module: l10n_be
-#: field:vat.listing.clients,name:0
-msgid "Client Name"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
#, python-format
-msgid "No partner has a VAT Number asociated with him."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_charge
-msgid "Charge"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-#: view:partner.vat.intra:0
-#: view:partner.vat.list:0
-msgid "Create XML"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_capitaux
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-#: view:partner.vat.intra:0
-msgid "Save the File with '.xml' extension."
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Ok"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "The period code you entered is not valid."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_stock
-msgid "Stock et Encours"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
-msgid "Annual Listing Of VAT-Subjected Customers"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
-msgid "Belgium - Plan Comptable Minimum Normalise"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Note: "
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
-#: view:l1on_be.vat.declaration:0
-msgid "Periodical VAT Declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,ask_payment:0
-msgid "Ask Payment"
-msgstr ""
-
-#. module: l10n_be
-#: field:vat.listing.clients,country:0
-msgid "Country"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,fyear:0
-msgid "Fiscal Year"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,client_nihil:0
-msgid "Last Declaration of Enterprise"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Data Insufficient"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
-msgid "Belgium Statements"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Declare Periodical VAT"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat
-msgid "partner.vat"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,name:0
-#: field:partner.vat.intra,name:0
-#: field:partner.vat.list,name:0
-msgid "File Name"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat:0
-msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
+msgid "Please select at least one Period."
msgstr ""
#. module: l10n_be
@@ -523,7 +464,12 @@ msgid "\n"
msgstr ""
#. module: l10n_be
-#: help:l1on_be.vat.declaration,ask_payment:0
-msgid "It indicates whether a payment is to made or not?"
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
msgstr ""
diff --git a/addons/l10n_es/i18n/l10n_es.pot b/addons/l10n_es/i18n/l10n_es.pot
index 3e5e90d0007..218bd78a35d 100644
--- a/addons/l10n_es/i18n/l10n_es.pot
+++ b/addons/l10n_es/i18n/l10n_es.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:50+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
+msgid "Régimen Nacional"
+msgstr ""
+
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_extra
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
@@ -27,92 +33,12 @@ msgstr ""
msgid "Retención IRPF 15%"
msgstr ""
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
-#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
-msgid "Recargo de Equivalencia"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros - rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
-msgid "Terceros"
-msgstr ""
-
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf1
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf1
msgid "Retención IRPF 1%"
msgstr ""
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros - pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
-msgid "Retención IRPF 7%"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
-msgid "Régimen Nacional"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
-msgid "Retención IRPF 18%"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_intra
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
-msgid "Régimen Intracomunitario"
-msgstr ""
-
#. module: l10n_es
#: model:ir.module.module,description:l10n_es.module_meta_information
msgid "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -129,18 +55,27 @@ msgid "Spanish Charts of Accounts (PGCE 2008)\n"
msgstr ""
#. module: l10n_es
-#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spanish Charts of Accounts (PGCE 2008)"
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
+#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
+msgid "Recargo de Equivalencia"
msgstr ""
#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
+msgid "Retención IRPF 7%"
msgstr ""
#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
+msgid "Retención IRPF 18%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_intra
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
+msgid "Régimen Intracomunitario"
msgstr ""
#. module: l10n_es
@@ -156,7 +91,7 @@ msgid "Retención IRPF 2%"
msgstr ""
#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
msgstr ""
diff --git a/addons/l10n_fr/i18n/l10n_fr.pot b/addons/l10n_fr/i18n/l10n_fr.pot
index a9665579cc6..37ef8a71197 100644
--- a/addons/l10n_fr/i18n/l10n_fr.pot
+++ b/addons/l10n_fr/i18n/l10n_fr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:28+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:28+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,45 +15,12 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_fr
-#: model:ir.module.module,description:l10n_fr.module_meta_information
-msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
-"\n"
-"Credits: Sistheo Zeekom CrysaLEAD\n"
-""
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_immobilisations
-msgid "Immobilisations"
-msgstr ""
-
#. module: l10n_fr
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
msgid "France"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_equity
-msgid "Equity"
-msgstr ""
-
#. module: l10n_fr
#: view:account.bilan.report:0
#: view:account.cdr.report:0
@@ -66,8 +33,11 @@ msgid "Account Bilan Report"
msgstr ""
#. module: l10n_fr
-#: model:ir.model,name:l10n_fr.model_l10n_fr_report
-msgid "Report for l10n_fr"
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+""
msgstr ""
#. module: l10n_fr
@@ -75,34 +45,19 @@ msgstr ""
msgid "Zone Euro"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_expense
-msgid "Expense"
-msgstr ""
-
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_account_cdr_report
msgid "Account CDR Report"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_provision
-msgid "Provisions"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_payable
-msgid "Payable"
-msgstr ""
-
#. module: l10n_fr
#: view:account.cdr.report:0
msgid "Compte de resultant"
msgstr ""
#. module: l10n_fr
-#: field:l10n.fr.line,report_id:0
-msgid "Report"
+#: sql_constraint:l10n.fr.report:0
+msgid "The code report must be unique !"
msgstr ""
#. module: l10n_fr
@@ -110,11 +65,6 @@ msgstr ""
msgid "Hors Euro"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_commitment
-msgid "Engagements"
-msgstr ""
-
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_l10n_fr_line
msgid "Report Lines for l10n_fr"
@@ -141,29 +91,14 @@ msgstr ""
msgid "Compte de resultat Report"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stock
-msgid "Stocks"
-msgstr ""
-
#. module: l10n_fr
#: field:l10n.fr.report,line_ids:0
msgid "Lines"
msgstr ""
#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_special
-msgid "Comptes spéciaux"
-msgstr ""
-
-#. module: l10n_fr
-#: sql_constraint:l10n.fr.report:0
-msgid "The code report must be unique !"
+#: field:l10n.fr.line,report_id:0
+msgid "Report"
msgstr ""
#. module: l10n_fr
@@ -173,18 +108,8 @@ msgid "Fiscal Year"
msgstr ""
#. module: l10n_fr
-#: field:l10n.fr.report,code:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_dettes
-msgid "Dettes long terme"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_view
-msgid "View"
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
msgstr ""
#. module: l10n_fr
@@ -193,8 +118,8 @@ msgid "The variable name must be unique !"
msgstr ""
#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stocks
-msgid "Actif circulant"
+#: field:l10n.fr.report,code:0
+msgid "Code"
msgstr ""
#. module: l10n_fr
@@ -213,11 +138,6 @@ msgstr ""
msgid "France - Plan Comptable Général"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_tax
-msgid "Tax"
-msgstr ""
-
#. module: l10n_fr
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
msgid "DOM-TOM"
@@ -229,11 +149,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_cloture
-msgid "Cloture"
-msgstr ""
-
#. module: l10n_fr
#: field:l10n.fr.line,code:0
msgid "Variable Name"
diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
index 7cf9b161223..aadd2c97311 100644
--- a/addons/l10n_fr/test/l10n_fr_report.yml
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -1,23 +1,9 @@
--
- In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
--
- !record {model: account.fiscalyear, id: account_fiscalyear_01}:
- code: FY2011
- company_id: base.main_company
- date_start: '2012-01-01'
- date_stop: '2012-12-31'
- name: Fiscal Year 2012
--
- I create the fiscal periods
--
- !python {model: account.fiscalyear}:
- self.create_period(cr, uid, [ref('account_fiscalyear_01'),])
-
In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
-
!python {model: account.move.line}: |
import netsvc, tools, os, time
- (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {})
+ (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data)
diff --git a/addons/l10n_gr/i18n/l10n_gr.pot b/addons/l10n_gr/i18n/l10n_gr.pot
index 5564bce48de..14ae239e816 100644
--- a/addons/l10n_gr/i18n/l10n_gr.pot
+++ b/addons/l10n_gr/i18n/l10n_gr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:29+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:29+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,26 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
#. module: l10n_gr
#: model:ir.module.module,description:l10n_gr.module_meta_information
msgid "This is the base module to manage the accounting chart for Greece."
msgstr ""
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_tax
-msgid "Tax"
-msgstr ""
-
#. module: l10n_gr
#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
msgid "Greece - minimal"
@@ -46,38 +31,3 @@ msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pa
" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_other
-msgid "Other"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_view
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index da81c7b11e4..034fd23f52d 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,43 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_vista
-msgid "Vista"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_cxp
-msgid "Cuentas por Pagar"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_cxc
-msgid "Cuentas por Cobrar"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,description:l10n_gt.module_meta_information
-msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_gastos
-msgid "Gastos"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_pasivo
-msgid "Pasivo"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_activo
-msgid "Activo"
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
msgstr ""
#. module: l10n_gt
@@ -61,17 +26,7 @@ msgid "Generar la nomenclatura contable a partir de un modelo. Deberá seleccio
msgstr ""
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_capital
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
-msgid "Guatemala - Plan contable general"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_efectivo
-msgid "Efectivo"
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency"
msgstr ""
diff --git a/addons/l10n_in/i18n/l10n_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index 7ba3b01b31c..b702fb84a6b 100644
--- a/addons/l10n_in/i18n/l10n_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset_view
-msgid "Asset View"
-msgstr ""
-
#. module: l10n_in
#: model:ir.module.module,description:l10n_in.module_meta_information
msgid "\n"
@@ -28,13 +23,8 @@ msgid "\n"
msgstr ""
#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense_view
-msgid "Expense View"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income_view
-msgid "Income View"
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+msgid "Indian Chart of Account"
msgstr ""
#. module: l10n_in
@@ -43,43 +33,3 @@ msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pa
" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability1
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset1
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_closed1
-msgid "Closed"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income1
-msgid "Income"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability_view
-msgid "Liability View"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense1
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
-msgid "Indian Chart of Account"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_root_ind1
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
index c1d6d6de6fd..9687635e7a8 100644
--- a/addons/l10n_lu/i18n/l10n_lu.pot
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:32+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:32+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,25 +20,14 @@ msgstr ""
msgid "Print Tax Statements"
msgstr ""
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
#. module: l10n_lu
#: field:vat.declaration.report,tax_code_id:0
msgid "Company"
msgstr ""
#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
msgstr ""
#. module: l10n_lu
@@ -57,12 +46,7 @@ msgid "\n"
msgstr ""
#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
+#: code:addons/l10n_lu/wizard/print_vat.py:65
#, python-format
msgid "pdf not created !"
msgstr ""
@@ -73,26 +57,11 @@ msgid "VAT Declaration"
msgstr ""
#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
+#: code:addons/l10n_lu/wizard/print_vat.py:65
#, python-format
msgid "Please check if package pdftk is installed!"
msgstr ""
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
#. module: l10n_lu
#: view:vat.declaration.report:0
msgid "Cancel"
@@ -104,17 +73,8 @@ msgid "Luxembourg - Plan Comptable Minimum Normalise"
msgstr ""
#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_creances
-msgid "Créances"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
msgstr ""
diff --git a/addons/l10n_ma/i18n/l10n_ma.pot b/addons/l10n_ma/i18n/l10n_ma.pot
index 7913362a486..dd7643a0278 100644
--- a/addons/l10n_ma/i18n/l10n_ma.pot
+++ b/addons/l10n_ma/i18n/l10n_ma.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:33+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:33+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:55+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,48 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_ma
-#: model:ir.module.module,description:l10n_ma.module_meta_information
-msgid "Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_imm
-msgid "Immobilisations"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_ach
-msgid "Charges Achats"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_tpl
-msgid "Titres de placement"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_vue
-msgid "Vue"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_dct
-msgid "Dettes à court terme"
-msgstr ""
-
-#. module: l10n_ma
-#: field:l10n.ma.line,report_id:0
-msgid "Report"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_stk
-msgid "Stocks"
-msgstr ""
-
-#. module: l10n_ma
-#: field:l10n.ma.line,code:0
-msgid "Variable Name"
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
msgstr ""
#. module: l10n_ma
@@ -66,8 +26,13 @@ msgid "Definition"
msgstr ""
#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_dlt
-msgid "Dettes à long terme"
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
msgstr ""
#. module: l10n_ma
@@ -77,13 +42,13 @@ msgid "Name"
msgstr ""
#. module: l10n_ma
-#: field:l10n.ma.report,line_ids:0
-msgid "Lines"
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid "Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010"
msgstr ""
#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_tax
-msgid "Taxes"
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
msgstr ""
#. module: l10n_ma
@@ -102,52 +67,12 @@ msgid "Maroc - Plan Comptable Général"
msgstr ""
#. module: l10n_ma
-#: sql_constraint:l10n.ma.line:0
-msgid "The variable name must be unique !"
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
msgstr ""
#. module: l10n_ma
-#: model:ir.model,name:l10n_ma.model_l10n_ma_report
-msgid "Report for l10n_ma_kzc"
-msgstr ""
-
-#. module: l10n_ma
-#: field:l10n.ma.report,code:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_per
-msgid "Charges Personnel"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_liq
-msgid "Liquidité"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_pdt
-msgid "Produits"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_reg
-msgid "Régularisation"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_cp
-msgid "Capitaux Propres"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_cre
-msgid "Créances"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_aut
-msgid "Charges Autres"
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
msgstr ""
diff --git a/addons/l10n_uk/i18n/l10n_uk.pot b/addons/l10n_uk/i18n/l10n_uk.pot
index 1c3372445c6..fe712bbc694 100644
--- a/addons/l10n_uk/i18n/l10n_uk.pot
+++ b/addons/l10n_uk/i18n/l10n_uk.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:36+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:36+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:58+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,57 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_asset_view
-msgid "Asset View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_uk
-#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_income_view
-msgid "Income View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_liability
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_payable
-msgid "Payable"
-msgstr ""
-
#. module: l10n_uk
#: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
msgid "United Kingdom - minimal"
@@ -77,27 +26,8 @@ msgid "This is the base module to manage the accounting chart for United Kingdom
msgstr ""
#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_liability_view
-msgid "Liability View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_expense_view
-msgid "Expense View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_view
-msgid "View"
+#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index 58c0125334f..5762d6456e3 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:50+0000\n"
+"PO-Revision-Date: 2010-12-31 10:38+0000\n"
"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: lunch
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index f262558ff6b..157e540c611 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot
index 06ca7604705..46ebf92f2a7 100644
--- a/addons/mail_gateway/i18n/mail_gateway.pot
+++ b/addons/mail_gateway/i18n/mail_gateway.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,9 @@ msgid "Resource ID"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
#, python-format
msgid "Method is not implemented"
msgstr ""
@@ -58,7 +60,7 @@ msgid "Mailgateway History"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:249
#, python-format
msgid "Note"
msgstr ""
@@ -111,7 +113,7 @@ msgid "Partner"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:242
#, python-format
msgid " wrote on "
msgstr ""
@@ -164,7 +166,7 @@ msgid "Mailgateway Threads"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:247
#, python-format
msgid "Opportunity"
msgstr ""
@@ -178,13 +180,13 @@ msgid "Emails"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:252
#, python-format
msgid "Stage"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:250
#, python-format
msgid " added note on "
msgstr ""
@@ -216,7 +218,7 @@ msgid "User Responsible"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:248
#, python-format
msgid "Converted to Opportunity"
msgstr ""
@@ -242,7 +244,7 @@ msgid "mailgate message"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:148
#: view:mailgate.thread:0
#: view:res.partner:0
#, python-format
@@ -284,7 +286,7 @@ msgid "Cc"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:246
#, python-format
msgid " on "
msgstr ""
@@ -300,7 +302,7 @@ msgid "Email Search"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:561
#, python-format
msgid "receive"
msgstr ""
@@ -313,7 +315,7 @@ msgid "The generic email gateway system allows to send and receive emails\n"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:255
#, python-format
msgid "Changed Status to: "
msgstr ""
@@ -329,7 +331,7 @@ msgid "Owner"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:253
#, python-format
msgid "Changed Stage to: "
msgstr ""
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index e54e8b7142d..92e7b675870 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index d078f29fefc..270334c7527 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 12:26+0000\n"
+"PO-Revision-Date: 2011-01-01 08:52+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing_campaign
@@ -895,7 +895,7 @@ msgstr "Vorgang nicht unterstützt"
#. module: marketing_campaign
#: model:ir.model,name:marketing_campaign.model_email_template
msgid "Email Templates for Models"
-msgstr "EMail Vorlagen f. Modelle"
+msgstr "EMail Vorlagen"
#. module: marketing_campaign
#: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index fa2b4e99a00..ba482b169c6 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:00+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Previous Activity"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:772
#, python-format
msgid "The current step for this item has no email or report to preview."
msgstr ""
@@ -37,7 +37,7 @@ msgid "The To/From Activity of transition must be of the same Campaign "
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:144
#, python-format
msgid "The campaign cannot be started: it doesn't have any starting activity (or any activity with a signal and no previous activity)"
msgstr ""
@@ -53,7 +53,7 @@ msgid "Custom Action"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:139
#, python-format
msgid "The campaign cannot be started: the email account is missing in email activity '%s'"
msgstr ""
@@ -139,7 +139,7 @@ msgid "This Year"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:772
#, python-format
msgid "No preview"
msgstr ""
@@ -182,7 +182,7 @@ msgid "Year(s)"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:209
#, python-format
msgid "Sorry, campaign duplication is not supported at the moment."
msgstr ""
@@ -511,12 +511,6 @@ msgstr ""
msgid "Campaign Statistics"
msgstr ""
-#. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-#: field:marketing.campaign.workitem,res_id:0
-msgid "Resource ID"
-msgstr ""
-
#. module: marketing_campaign
#: help:marketing.campaign.activity,server_action_id:0
msgid "The action to perform when this activity is activated"
@@ -664,7 +658,7 @@ msgid "October"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:141
#, python-format
msgid "The campaign cannot be started: the email account is not approved in email activity '%s'"
msgstr ""
@@ -701,7 +695,11 @@ msgid "This folder is used to store the generated reports"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
#, python-format
msgid "Error"
msgstr ""
@@ -713,7 +711,7 @@ msgid "Action"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:488
#, python-format
msgid "Automatic transition"
msgstr ""
@@ -735,7 +733,7 @@ msgid "Process"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:490
#: selection:marketing.campaign.transition,trigger:0
#, python-format
msgid "Cosmetic"
@@ -746,6 +744,11 @@ msgstr ""
msgid "How is the destination workitem triggered"
msgstr ""
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid "A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered from a specific situation. One action could be sending an email template that has previously been created in the system."
+msgstr ""
+
#. module: marketing_campaign
#: view:campaign.analysis:0
#: selection:campaign.analysis,state:0
@@ -756,7 +759,7 @@ msgid "Done"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:209
#, python-format
msgid "Operation not supported"
msgstr ""
@@ -783,14 +786,15 @@ msgid "Synchronize Manually"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:154
#, python-format
msgid "The campaign cannot be marked as done before all segments are done"
msgstr ""
#. module: marketing_campaign
-#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
-msgid "A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered based on a specific situation. One possible action could be sending an email template that has previously been created in the system."
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
msgstr ""
#. module: marketing_campaign
@@ -858,7 +862,7 @@ msgid "Running"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:489
#, python-format
msgid "After %(interval_nbr)d %(interval_type)s"
msgstr ""
@@ -895,7 +899,7 @@ msgid "Fixed cost for running this campaign. You may also specify variable cost
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:746
#, python-format
msgid "Email Preview"
msgstr ""
@@ -906,7 +910,7 @@ msgid "Signal"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:125
#, python-format
msgid "The campaign cannot be started: there are no activities in it"
msgstr ""
diff --git a/addons/marketing_campaign_crm_demo/i18n/es.po b/addons/marketing_campaign_crm_demo/i18n/es.po
index e34f08d7045..437e2918146 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 12:25+0000\n"
+"PO-Revision-Date: 2010-12-31 10:59+0000\n"
"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: marketing_campaign_crm_demo
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index f58277884ca..800154bed63 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:01+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 162f7f8664d..e65813787e0 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:01+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgid "Date from"
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:414
#, python-format
msgid "Partner doesn't have an address to make the invoice."
msgstr ""
@@ -215,7 +215,8 @@ msgid "Start membership date"
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
#, python-format
msgid "Error !"
msgstr ""
@@ -386,7 +387,7 @@ msgid "Group by..."
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:411
#, python-format
msgid "Partner is a free Member."
msgstr ""
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index f8d642055b7..9578293d704 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2009-09-08 16:47+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2011-01-01 21:49+0000\n"
+"Last-Translator: Tamás Dénes \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-12-24 05:03+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
@@ -27,11 +27,6 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of iterations this work center has to do in the specified operation of the routing."
-msgstr ""
-
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -44,7 +39,7 @@ msgstr ""
#. module: mrp
#: view:report.workcenter.load:0
-msgid "Work Center Loads"
+msgid "Work Centers load"
msgstr ""
#. module: mrp
@@ -363,7 +358,7 @@ msgstr ""
#: report:mrp.production.order:0
#, python-format
msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
#. module: mrp
#: field:mrp.production.workcenter.line,hour:0
@@ -505,7 +500,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Work center per hour."
+msgid "Specify Cost of Workcenter per hour."
msgstr ""
#. module: mrp
@@ -557,7 +552,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Work center per cycle."
+msgid "Specify Cost of Workcenter per cycle."
msgstr ""
#. module: mrp
@@ -650,7 +645,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for this work center to achieve the operation of the specified routing."
+msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
@@ -1039,7 +1034,7 @@ msgstr ""
#: field:mrp.routing,name:0
#: field:mrp.routing.workcenter,name:0
msgid "Name"
-msgstr ""
+msgstr "Név"
#. module: mrp
#: view:mrp.installer:0
@@ -1069,7 +1064,7 @@ msgstr ""
#. module: mrp
#: help:mrp.routing.workcenter,sequence:0
msgid ""
-"Gives the sequence order when displaying a list of routing work centers."
+"Gives the sequence order when displaying a list of routing workcenters."
msgstr ""
#. module: mrp
@@ -1431,7 +1426,7 @@ msgstr ""
#: field:mrp.bom,active:0
#: field:mrp.routing,active:0
msgid "Active"
-msgstr ""
+msgstr "Aktív"
#. module: mrp
#: model:process.node,name:mrp.process_node_procureproducts0
@@ -1572,7 +1567,7 @@ msgstr ""
#: field:mrp.production.order,product_id:0
#: field:mrp.production.product.line,product_id:0
msgid "Product"
-msgstr ""
+msgstr "Termék"
#. module: mrp
#: view:mrp.production:0
@@ -1595,7 +1590,7 @@ msgstr ""
#: field:mrp.bom,product_uos:0
#: field:mrp.production.product.line,product_uos:0
msgid "Product UOS"
-msgstr ""
+msgstr "Termék EE"
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action
@@ -1617,7 +1612,7 @@ msgstr ""
#: field:mrp.production.order,product_uom:0
#: field:mrp.production.product.line,product_uom:0
msgid "Product UOM"
-msgstr ""
+msgstr "Termék ME"
#. module: mrp
#: model:process.node,name:mrp.process_node_stock0
@@ -1710,8 +1705,8 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,note:0
msgid ""
-"Description of the work center. Explain here what's a cycle according to this "
-"work center."
+"Description of the workcenter. Explain here what's a cycle according to this "
+"workcenter."
msgstr ""
#. module: mrp
@@ -1794,9 +1789,9 @@ msgstr ""
#. module: mrp
#: help:mrp.production,routing_id:0
msgid ""
-"The list of operations (list of work centers) to produce the finished "
-"product. The routing is mainly used to compute work center costs during "
-"operations and to plan future loads on work centers based on production "
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan future loads on workcenters based on production "
"plannification."
msgstr ""
@@ -1829,7 +1824,7 @@ msgstr ""
#. module: mrp
#: help:mrp.workcenter,capacity_per_cycle:0
msgid ""
-"Number of operations this work center can do in parallel. If this work center "
+"Number of operations this workcenter can do in parallel. If this workcenter "
"represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
@@ -2267,9 +2262,9 @@ msgstr ""
#. module: mrp
#: help:mrp.bom,routing_id:0
msgid ""
-"The list of operations (list of work centers) to produce the finished "
-"product. The routing is mainly used to compute work center costs during "
-"operations and to plan future loads on work centers based on production "
+"The list of operations (list of workcenters) to produce the finished "
+"product. The routing is mainly used to compute workcenter costs during "
+"operations and to plan future loads on workcenters based on production "
"planning."
msgstr ""
@@ -2299,7 +2294,7 @@ msgstr ""
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
msgid "Manufacturing"
-msgstr ""
+msgstr "Gyártás"
#. module: mrp
#: view:board.board:0
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 24f420781ef..86edff02694 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:03+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,13 +22,8 @@ msgid "Moves Created"
msgstr ""
#. module: mrp
-#: report:mrp.production.order:0
-msgid "No. Of Cycles"
-msgstr ""
-
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of iterations this work center has to do in the specified operation of the routing."
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid "Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed."
msgstr ""
#. module: mrp
@@ -41,11 +36,6 @@ msgstr ""
msgid "Work Centers Utilisation"
msgstr ""
-#. module: mrp
-#: view:report.workcenter.load:0
-msgid "Work Centers load"
-msgstr ""
-
#. module: mrp
#: view:mrp.routing.workcenter:0
msgid "Routing Work Centers"
@@ -56,6 +46,11 @@ msgstr ""
msgid "Manufacturing Resource Planning"
msgstr ""
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
#. module: mrp
#: field:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of Cycles"
@@ -73,13 +68,13 @@ msgid "Picking list"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Hourly Cost"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
#, python-format
msgid "Cost Price per Uom"
msgstr ""
@@ -139,11 +134,6 @@ msgstr ""
msgid "Finished Products"
msgstr ""
-#. module: mrp
-#: selection:mrp.production.order,month:0
-msgid "May"
-msgstr ""
-
#. module: mrp
#: model:process.transition,name:mrp.process_transition_servicerfq0
#: model:process.transition,name:mrp.process_transition_stockrfq0
@@ -165,11 +155,6 @@ msgstr ""
msgid "The system launches automatically a RFQ to the preferred supplier."
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_routing_action
-msgid "Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
-msgstr ""
-
#. module: mrp
#: view:mrp.production:0
msgid "Products to Finish"
@@ -209,8 +194,13 @@ msgid "UOM"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "Define specific property groups that can be assigned to the properties of your bills of materials."
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
msgstr ""
#. module: mrp
@@ -239,7 +229,7 @@ msgid "Cycle Account"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Work Cost"
msgstr ""
@@ -274,6 +264,11 @@ msgstr ""
msgid "Master Data"
msgstr ""
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid "The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
#. module: mrp
#: report:mrp.production.order:0
msgid "Partner Ref"
@@ -329,6 +324,12 @@ msgstr ""
msgid "October"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr ""
+
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
msgid "Procurement of stockable Product"
@@ -340,7 +341,7 @@ msgid "Default UOM"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
#: report:bom.structure:0
#: field:mrp.product_price,number:0
#: report:mrp.production.order:0
@@ -425,6 +426,11 @@ msgstr ""
msgid "Product type is service"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid "Define specific property groups that can be assigned to the properties of your bill of materials."
+msgstr ""
+
#. module: mrp
#: model:process.transition,name:mrp.process_transition_bom0
msgid "Manufacturing decomposition"
@@ -446,12 +452,6 @@ msgstr ""
msgid "Complete this only if you want automatic analytic accounting entries on production orders."
msgstr ""
-#. module: mrp
-#: help:mrp.workcenter,product_id:0
-#: help:mrp.workcenter,product_id:0
-msgid "Fill this product to track easily your production costs in the analytic accounting."
-msgstr ""
-
#. module: mrp
#: field:mrp.production.workcenter.line,cycle:0
msgid "Nbr of cycles"
@@ -463,12 +463,6 @@ msgstr ""
msgid "Request for Quotation."
msgstr ""
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component suppliers"
-msgstr ""
-
#. module: mrp
#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
msgid "The Bill of Material is linked to a routing, i.e. the succession of work centers."
@@ -479,11 +473,6 @@ msgstr ""
msgid "Error: Invalid ean code"
msgstr ""
-#. module: mrp
-#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Work center per hour."
-msgstr ""
-
#. module: mrp
#: view:mrp.routing:0
#: field:mrp.routing,location_id:0
@@ -521,7 +510,7 @@ msgid "Search Production"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
#, python-format
msgid "Supplier Price per Uom"
msgstr ""
@@ -531,16 +520,6 @@ msgstr ""
msgid "March"
msgstr ""
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter_load
-msgid "Work Center Load"
-msgstr ""
-
-#. module: mrp
-#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Work center per cycle."
-msgstr ""
-
#. module: mrp
#: field:mrp.bom,child_complete_ids:0
msgid "BoM Hierarchy"
@@ -553,6 +532,11 @@ msgstr ""
msgid "Produce"
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work center per cycle."
+msgstr ""
+
#. module: mrp
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
@@ -601,7 +585,7 @@ msgid "Work Center Load"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:0
+#: code:addons/mrp/procurement.py:45
#, python-format
msgid "No BoM defined for this product !"
msgstr ""
@@ -627,9 +611,14 @@ msgstr ""
msgid "Ready"
msgstr ""
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
+msgstr ""
+
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for this work center to achieve the operation of the specified routing."
+msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
@@ -638,6 +627,7 @@ msgid "BOM Ref"
msgstr ""
#. module: mrp
+#: view:mrp.production:0
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
#: selection:mrp.production.order,state:0
@@ -667,7 +657,8 @@ msgid "Type"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
#, python-format
msgid "Total Cost of "
msgstr ""
@@ -683,24 +674,20 @@ msgid "Per month"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
#, python-format
msgid "Couldn't find bill of material for product"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid "The Properties in OpenERP are used to select the right bill of material in order to manufacture a product, when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will select automatically the BoM to use according the the needs."
-msgstr ""
-
#. module: mrp
#: report:bom.structure:0
msgid "Product Name"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:491
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -731,6 +718,11 @@ msgstr ""
msgid "Procurement rule"
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr ""
+
#. module: mrp
#: view:mrp.production:0
msgid "Partial"
@@ -767,11 +759,6 @@ msgstr ""
msgid "Manufacturing Order"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
-msgid "Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component."
-msgstr ""
-
#. module: mrp
#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
msgid "Procurement of raw material"
@@ -818,7 +805,7 @@ msgid "Extended Filters..."
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:0
+#: code:addons/mrp/procurement.py:47
#, python-format
msgid "Procurement '%s' has an exception: 'No BoM defined for this product !'"
msgstr ""
@@ -863,7 +850,7 @@ msgid "Stockable Product"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Work Center name"
msgstr ""
@@ -924,6 +911,11 @@ msgstr ""
msgid "Split in production lots"
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
#. module: mrp
#: model:process.transition,note:mrp.process_transition_servicerfq0
msgid "If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."
@@ -944,6 +936,11 @@ msgstr ""
msgid "Make to stock"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid "Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+
#. module: mrp
#: report:bom.structure:0
msgid "BOM Name"
@@ -960,12 +957,6 @@ msgstr ""
msgid "Production Dashboard"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component"
-msgstr ""
-
#. module: mrp
#: view:mrp.production:0
msgid "Source Loc."
@@ -1018,8 +1009,13 @@ msgid "]"
msgstr ""
#. module: mrp
-#: help:mrp.routing.workcenter,sequence:0
-msgid "Gives the sequence order when displaying a list of routing work centers."
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid "Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each production stage. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route depending on the needs of the company."
msgstr ""
#. module: mrp
@@ -1027,6 +1023,11 @@ msgstr ""
msgid "Order quantity cannot be negative or zero !"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
#. module: mrp
#: model:ir.module.module,description:mrp.module_meta_information
msgid "\n"
@@ -1036,7 +1037,7 @@ msgid "\n"
" * Make to Stock / Make to Order (by line)\n"
" * Multi-level BoMs, no limit\n"
" * Multi-level routing, no limit\n"
-" * Routing and workcenter integrated with analytic accounting\n"
+" * Routing and work center integrated with analytic accounting\n"
" * Scheduler computation periodically / Just In Time module\n"
" * Multi-pos, multi-warehouse\n"
" * Different reordering policies\n"
@@ -1063,16 +1064,6 @@ msgid "\n"
" "
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action3
-msgid "Manufacturing Orders in Progress"
-msgstr ""
-
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
-msgid "Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company."
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action4
msgid "Manufacturing Orders Waiting Products"
@@ -1089,7 +1080,7 @@ msgid "Group By..."
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Cycles Cost"
msgstr ""
@@ -1129,18 +1120,8 @@ msgid "Per week"
msgstr ""
#. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockmts0
-msgid "The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."
-msgstr ""
-
-#. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid "Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
msgstr ""
#. module: mrp
@@ -1217,11 +1198,6 @@ msgstr ""
msgid "Configure Your Manufacturing Resource Planning Application"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action
-msgid "Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed."
-msgstr ""
-
#. module: mrp
#: field:mrp.production,priority:0
#: field:mrp.production.order,priority:0
@@ -1239,7 +1215,7 @@ msgid "Month -1"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:914
#, python-format
msgid "Manufacturing order '%s' is scheduled for the %s."
msgstr ""
@@ -1250,7 +1226,7 @@ msgid "Production Order N° :"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:630
#, python-format
msgid "Manufacturing order '%s' is ready to produce."
msgstr ""
@@ -1277,6 +1253,11 @@ msgstr ""
msgid "July"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid "Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
#. module: mrp
#: model:process.transition,note:mrp.process_transition_stockrfq0
msgid "In case the Supply method of the product is Buy, the system creates a purchase order."
@@ -1293,6 +1274,12 @@ msgstr ""
msgid "Product Cost Structure"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_installer
msgid "mrp.installer"
@@ -1310,12 +1297,7 @@ msgid "Month"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
-msgid "Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:62
#, python-format
msgid "Active Id is not found"
msgstr ""
@@ -1351,6 +1333,11 @@ msgstr ""
msgid "Product Consumed"
msgstr ""
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
#. module: mrp
#: field:mrp.bom,active:0
#: field:mrp.routing,active:0
@@ -1364,6 +1351,7 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
msgid "Work Center Loads"
msgstr ""
@@ -1379,8 +1367,8 @@ msgid "Properties"
msgstr ""
#. module: mrp
-#: field:mrp.production,date_planned:0
-msgid "Scheduled date"
+#: help:mrp.production,origin:0
+msgid "Reference of the document that generated this production order request."
msgstr ""
#. module: mrp
@@ -1405,7 +1393,6 @@ msgid "Drives the procurement orders for raw material."
msgstr ""
#. module: mrp
-#: view:mrp.production:0
#: view:mrp.production.order:0
msgid "Current"
msgstr ""
@@ -1420,12 +1407,6 @@ msgstr ""
msgid "SO Number"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component Cost of "
-msgstr ""
-
#. module: mrp
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
@@ -1462,7 +1443,7 @@ msgid "Manufacturing Orders To Start"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:491
#, python-format
msgid "Cannot delete Production Order(s) which are in %s State!"
msgstr ""
@@ -1518,12 +1499,8 @@ msgid "Product UOS"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-#: view:mrp.production:0
-msgid "Manufacturing Orders"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid "Work Centers allow you to create and manage manufacturing units consisting of one or more persons and/or machines that can be considered as a unit for capacity and planning forecasting."
msgstr ""
#. module: mrp
@@ -1553,7 +1530,7 @@ msgid "Production Analysis"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:345
#, python-format
msgid "Copy"
msgstr ""
@@ -1596,6 +1573,11 @@ msgstr ""
msgid "Very Urgent"
msgstr ""
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
+msgstr ""
+
#. module: mrp
#: view:change.production.qty:0
msgid "Approve"
@@ -1628,8 +1610,12 @@ msgid "Production Products Consommation"
msgstr ""
#. module: mrp
-#: help:mrp.workcenter,note:0
-msgid "Description of the work center. Explain here what's a cycle according to this work center."
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
msgstr ""
#. module: mrp
@@ -1701,11 +1687,6 @@ msgstr ""
msgid "Production Order"
msgstr ""
-#. module: mrp
-#: help:mrp.production,routing_id:0
-msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
-msgstr ""
-
#. module: mrp
#: model:process.node,note:mrp.process_node_productminimumstockrule0
msgid "Automatic procurement rule"
@@ -1722,7 +1703,9 @@ msgid "Product UoS Qty"
msgstr ""
#. module: mrp
+#: code:addons/mrp/report/price.py:130
#: view:mrp.bom:0
+#, python-format
msgid "Components"
msgstr ""
@@ -1733,8 +1716,8 @@ msgid "BOM Structure"
msgstr ""
#. module: mrp
-#: help:mrp.workcenter,capacity_per_cycle:0
-msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
msgstr ""
#. module: mrp
@@ -1758,11 +1741,6 @@ msgstr ""
msgid "Product UOS Qty"
msgstr ""
-#. module: mrp
-#: field:mrp.bom,date_stop:0
-msgid "Valid Until"
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
msgid "Weekly Stock Value Variation enables you to track the stock value evolution linked to manufacturing activities, receptions of products and delivery orders."
@@ -1975,7 +1953,7 @@ msgid "Manufacturing Steps."
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:136
#: model:ir.actions.report.xml,name:mrp.report_cost_structure
#, python-format
msgid "Cost Structure"
@@ -1997,8 +1975,8 @@ msgid "Parent BoM"
msgstr ""
#. module: mrp
-#: field:mrp.workcenter.load,measure_unit:0
-msgid "Amount measuring unit"
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid "Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used."
msgstr ""
#. module: mrp
@@ -2012,8 +1990,9 @@ msgid "Product type is Stockable or Consumable."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
#, python-format
msgid "Error"
msgstr ""
@@ -2053,14 +2032,14 @@ msgid "Productions"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:194
#, python-format
msgid "Work Cost of "
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
-msgid "Master Bill of Materials allows you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoM in order to propose automatically manufacturing orders according to products' needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials."
+#: help:mrp.workcenter,note:0
+msgid "Description of the work center. Explain here what's a cycle according to this work center."
msgstr ""
#. module: mrp
@@ -2081,8 +2060,8 @@ msgid "Manufacturing Operations"
msgstr ""
#. module: mrp
-#: help:mrp.production,origin:0
-msgid "Reference of the document that generated this production order request."
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
msgstr ""
#. module: mrp
@@ -2090,6 +2069,11 @@ msgstr ""
msgid "You must assign a production lot for this product"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid "The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the the needs."
+msgstr ""
+
#. module: mrp
#: view:mrp.production.order:0
#: field:stock.move,production_id:0
@@ -2146,8 +2130,8 @@ msgid "Description"
msgstr ""
#. module: mrp
-#: help:mrp.bom,routing_id:0
-msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
+#: selection:mrp.production.order,month:0
+msgid "May"
msgstr ""
#. module: mrp
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index c9f60111e44..cc0d8e387d8 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 20:01+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) \n"
+"PO-Revision-Date: 2010-12-31 08:43+0000\n"
+"Last-Translator: OpenERP Administrators \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-12-31 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 3850ab33822..a57b76bf2ce 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -664,6 +664,8 @@ class mrp_production(osv.osv):
"""
stock_mov_obj = self.pool.get('stock.move')
production = self.browse(cr, uid, production_id, context=context)
+
+ final_product_todo = []
produced_qty = 0
if production_mode == 'consume_produce':
@@ -704,7 +706,11 @@ class mrp_production(osv.osv):
stock_mov_obj.action_consume(cr, uid, [raw_product.id], consumed_qty, production.location_src_id.id, context=context)
if production_mode == 'consume_produce':
-
+ # To produce remaining qty of final product
+ vals = {'state':'confirmed'}
+ final_product_todo = [x.id for x in production.move_created_ids]
+ #stock_mov_obj.write(cr, uid, final_product_todo, vals)
+ stock_mov_obj.action_confirm(cr, uid, final_product_todo, context)
produced_products = {}
for produced_product in production.move_created_ids2:
if produced_product.scrapped:
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index f8fad71fc58..8758bc09cd5 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -140,13 +140,6 @@ class StockMove(osv.osv):
res.append(new_move)
return {}
- def trigger_move_state(self, cr, uid, move, state, context=None):
- new_moves = super(StockMove, self).trigger_move_state(cr, uid, move, state, context=context)
- if state == 'confirm':
- new_moves =[x.id for x in new_moves]
- self.write(cr, uid, new_moves, {'production_id': False}, context=context)
- return new_moves
-
StockMove()
diff --git a/addons/mrp_jit/i18n/mrp_jit.pot b/addons/mrp_jit/i18n/mrp_jit.pot
index da0621d10dc..8f45a01e70f 100644
--- a/addons/mrp_jit/i18n/mrp_jit.pot
+++ b/addons/mrp_jit/i18n/mrp_jit.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:03+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index e2426cf3684..4e2372d335b 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:04+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgid "mrp_operations.operation.code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:133
#, python-format
msgid "Production Order Cannot start in [%s] state"
msgstr ""
@@ -116,7 +116,7 @@ msgid "Creation of the work order"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:461
#, python-format
msgid "You cannot Pause the Operation other then Start/Resume state !"
msgstr ""
@@ -134,7 +134,11 @@ msgid "The work orders are created on the basis of the production order."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:133
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:480
#, python-format
msgid "Error!"
msgstr ""
@@ -214,7 +218,7 @@ msgid "* When a work order is created it is set in 'Draft' state.\n"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:470
#, python-format
msgid "You cannot finish the operation without Starting/Resuming it !"
msgstr ""
@@ -225,7 +229,7 @@ msgid "Planned Date"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:477
#, python-format
msgid "There is no Operation to be cancelled !"
msgstr ""
@@ -251,6 +255,11 @@ msgstr ""
msgid "Status"
msgstr ""
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid "To manufacture or assemble products, and use raw materials and finished products you must also handle manufacturing operations. Manufacturing operations are often called Work Orders. The various operations will have different impacts on the costs of manufacturing and planning depending on the available workload."
+msgstr ""
+
#. module: mrp_operations
#: field:mrp_operations.operation,order_date:0
msgid "Order Date"
@@ -262,7 +271,7 @@ msgid "Future Work Orders"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:457
#, python-format
msgid "Operation has already started !You can either Pause /Finish/Cancel the operation"
msgstr ""
@@ -376,7 +385,7 @@ msgid "Production Operation Code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:465
#, python-format
msgid " You cannot Resume the operation other then Pause state !"
msgstr ""
@@ -426,7 +435,7 @@ msgid "June"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:480
#, python-format
msgid "Operation is already finished !"
msgstr ""
@@ -483,7 +492,7 @@ msgid "Finish the operation."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:450
#, python-format
msgid "Operation is not started yet !"
msgstr ""
@@ -494,7 +503,10 @@ msgid "Information from the production order."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:473
#, python-format
msgid "Sorry!"
msgstr ""
@@ -511,16 +523,11 @@ msgid "Code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:473
#, python-format
msgid "Operation is Already Cancelled !"
msgstr ""
-#. module: mrp_operations
-#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
-msgid "To manufacture or assemble products, as well as using raw materials and finished product you must also handle manufacturing operations. Manufacturing operations are often called work orders. The different operations will have different impacts on the costs of manufacture and planning depending on the available workload."
-msgstr ""
-
#. module: mrp_operations
#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
msgid "Work Center Production start end workflow"
diff --git a/addons/mrp_operations/test/mrp_operations.yml b/addons/mrp_operations/test/mrp_operations.yml
index 299269cbb44..afa3fa55d74 100644
--- a/addons/mrp_operations/test/mrp_operations.yml
+++ b/addons/mrp_operations/test/mrp_operations.yml
@@ -13,10 +13,10 @@
product_id: product.product_product_pc1
product_qty: 5.0
product_uom: product.product_uom_unit
- product_uos_qty: 0.0
--
+ product_uos_qty: 5.0
+-
I am computing the data.
--
+-
!python {model: mrp.production}: |
self.action_compute(cr, uid, [ref("mrp_production_mo0")], {"lang": "en_US", "tz":
False, "search_default_current": 1, "active_model": "ir.ui.menu", "active_ids":
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 33809832e15..90a6cd5dd8f 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@ msgstr ""
msgid "Inventory Move"
msgstr ""
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid "Repair orders allow you to organize your product repairs. In a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if whether the repair should be invoiced to the customer or not."
+msgstr ""
+
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Group By..."
@@ -73,7 +78,7 @@ msgid "Group by partner invoice address"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:427
#, python-format
msgid "No product defined on Fees!"
msgstr ""
@@ -147,7 +152,7 @@ msgid "Net Total :"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:427
#, python-format
msgid "Warning !"
msgstr ""
@@ -168,7 +173,7 @@ msgid "Move"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:362
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form !"
msgstr ""
@@ -201,7 +206,7 @@ msgid "Draft"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:376
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
@@ -218,11 +223,6 @@ msgstr ""
msgid "Repairs order"
msgstr ""
-#. module: mrp_repair
-#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
-msgid "Repair orders allows you to organize your reparations on the products. On a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if you have to invoice the reparation to the customer or not."
-msgstr ""
-
#. module: mrp_repair
#: report:repair.order:0
msgid "Repair Order N° :"
@@ -260,7 +260,9 @@ msgid "Shipping address :"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:405
+#: code:addons/mrp_repair/mrp_repair.py:434
#, python-format
msgid "Error !"
msgstr ""
@@ -300,7 +302,7 @@ msgid "Quotation Notes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Warning!"
msgstr ""
@@ -487,7 +489,8 @@ msgid "End Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:405
+#: code:addons/mrp_repair/mrp_repair.py:434
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
@@ -645,13 +648,13 @@ msgid "Untaxed amount"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:41
#, python-format
msgid "Active ID is not Found"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Repair order is not invoiced."
msgstr ""
@@ -729,7 +732,7 @@ msgid "Ready to Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:362
#, python-format
msgid "No partner !"
msgstr ""
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
index e9b03c3ab69..2ea0ac88a17 100644
--- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot
+++ b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index 4cf8b28cfd1..dc22c0c15b2 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/outlook/i18n/it.po b/addons/outlook/i18n/it.po
index 7d4f871ec50..df63380be27 100644
--- a/addons/outlook/i18n/it.po
+++ b/addons/outlook/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-25 20:56+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-01-01 22:11+0000\n"
+"Last-Translator: Roberto Onnis \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-26 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: outlook
@@ -30,7 +30,7 @@ msgstr "Manuale d'installazione"
#. module: outlook
#: view:outlook.installer:0
msgid "Configure"
-msgstr ""
+msgstr "Configura"
#. module: outlook
#: field:outlook.installer,description:0
@@ -79,6 +79,18 @@ msgid ""
"\n"
" "
msgstr ""
+"\n"
+" Questo modulo fornisce il plug in per Outlook. \n"
+"\n"
+" Il plug in per Outlook permette di selezionare un oggetto che vorreste "
+"aggiungere\n"
+" alle vostra email e al suo allegato da MS Outlook. E' possibile "
+"selezionare un partner, un'attività.\n"
+" un progetto, un conto analitico, o altri oggetti ed archiviare le mail "
+"selezionate\n"
+" nel gestore mail come messaggi ed allegati.\n"
+"\n"
+" "
#. module: outlook
#: help:outlook.installer,doc_file:0
@@ -98,6 +110,8 @@ msgid ""
"Allows you to select an object that you’d like to add to your email and its "
"attachments."
msgstr ""
+"Permette di selezionare un oggetto che vorrete aggiungere alla email e il "
+"suoi allegati."
#. module: outlook
#: model:ir.model,name:outlook.model_outlook_installer
@@ -110,16 +124,18 @@ msgid ""
"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
"attach it to any existing one in OpenERP or create a new one."
msgstr ""
+"Il plug in permette di collegare le e-mail ai documenti di OpenERP. E' "
+"possibile allegarli ad ogni esistente di OpenERP o crearne di nuovi"
#. module: outlook
#: view:outlook.installer:0
msgid "Skip"
-msgstr ""
+msgstr "Tralascia"
#. module: outlook
#: view:outlook.installer:0
msgid "_Close"
-msgstr ""
+msgstr "_Chiudi"
#. module: outlook
#: view:outlook.installer:0
@@ -142,4 +158,4 @@ msgstr ""
#. module: outlook
#: field:outlook.installer,progress:0
msgid "Configuration Progress"
-msgstr ""
+msgstr "Avanzamento configurazione"
diff --git a/addons/outlook/i18n/outlook.pot b/addons/outlook/i18n/outlook.pot
index 1111fc6218e..88138e5bcaa 100644
--- a/addons/outlook/i18n/outlook.pot
+++ b/addons/outlook/i18n/outlook.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:06+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,19 +15,14 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: outlook
-#: field:outlook.installer,plugin_file:0
-msgid "Outlook Plug-in"
-msgstr ""
-
#. module: outlook
#: field:outlook.installer,doc_file:0
msgid "Installation Manual"
msgstr ""
#. module: outlook
-#: view:outlook.installer:0
-msgid "Configure"
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
msgstr ""
#. module: outlook
@@ -43,7 +38,7 @@ msgstr ""
#. module: outlook
#: view:outlook.installer:0
-msgid "title"
+msgid "Skip"
msgstr ""
#. module: outlook
@@ -80,6 +75,11 @@ msgstr ""
msgid "The documentation file :- how to install Outlook Plug-in."
msgstr ""
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
#. module: outlook
#: model:ir.actions.act_window,name:outlook.action_outlook_installer
#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
@@ -88,13 +88,8 @@ msgid "Outlook Plug-In Configuration"
msgstr ""
#. module: outlook
-#: help:outlook.installer,outlook:0
-msgid "Allows you to select an object that you’d like to add to your email and its attachments."
-msgstr ""
-
-#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
msgstr ""
#. module: outlook
@@ -102,9 +97,14 @@ msgstr ""
msgid "This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."
msgstr ""
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid "Allows you to select an object that you would like to add to your email and its attachments."
+msgstr ""
+
#. module: outlook
#: view:outlook.installer:0
-msgid "Skip"
+msgid "title"
msgstr ""
#. module: outlook
@@ -128,7 +128,7 @@ msgid "outlook plug-in file. Save as this file and install this plug-in in outlo
msgstr ""
#. module: outlook
-#: field:outlook.installer,progress:0
-msgid "Configuration Progress"
+#: view:outlook.installer:0
+msgid "Configure"
msgstr ""
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
index cef3e88e1c0..72d515c46a8 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/dialogs/dialog_map.py
@@ -705,17 +705,12 @@ def GetSearchText(txtProcessor,*args):
b = check()
if not b:
return
- # Get the selected mail and set the default value for search_text_control to mail.SenderEmailAddress
- ex = txtProcessor.window.manager.outlook.ActiveExplorer()
- assert ex.Selection.Count == 1
- mail = ex.Selection.Item(1)
try:
global objects_with_match
list_hwnd = win32gui.GetDlgItem(txtProcessor.window.hwnd, txtProcessor.other_ids[1])
objects_with_match = NewConn.SearchPartners()
setList(list_hwnd)
except Exception,e:
- msg=getMessage(e)
win32ui.MessageBox('Document can not be loaded.\n'+str(e), "Push", flag_error)
txtProcessor.init_done=True
diff --git a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
index 9a81c318dc4..0ab5d08a6ec 100644
--- a/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
+++ b/addons/outlook/plugin/openerp-outlook-plugin/tiny_xmlrpc.py
@@ -104,19 +104,19 @@ class XMLRpcConn(object):
return db_list
def login(self,dbname, user, pwd):
- self._dbname = dbname
- self._uname = user
- self._pwd = pwd
- conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
- uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
- return uid
+ self._dbname = dbname
+ self._uname = user
+ self._pwd = pwd
+ conn = xmlrpclib.ServerProxy(str(self._uri) + '/xmlrpc/common')
+ uid = execute(conn,'login',dbname, ustr(user), ustr(pwd))
+ return uid
def GetAllObjects(self):
- conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
- ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
- objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
- obj_list = [item['model'] for item in objects]
- return obj_list
+ conn = xmlrpclib.ServerProxy(self._uri+ '/xmlrpc/object')
+ ids = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','search',[])
+ objects = execute(conn,'execute',self._dbname,int(self._uid),self._pwd,'ir.model','read',ids,['model'])
+ obj_list = [item['model'] for item in objects]
+ return obj_list
def GetObjList(self):
self._obj_list=list(self._obj_list)
@@ -288,7 +288,6 @@ class XMLRpcConn(object):
headers[line[:split_here]] = line[split_here:]
temp1 = headers.get('Message-ID')
temp2 = headers.get('Message-Id')
- referances = headers.get('References')
if temp1 == None: message_id = temp2
if temp2 == None: message_id = temp1
startCut = message_id.find("<")
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index e00bb0d770c..963c5d8ece2 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:06+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: pad
-#: code:addons/pad/web/editors.py:0
+#: code:addons/pad/web/editors.py:32
#, python-format
msgid "Ok"
msgstr ""
#. module: pad
-#: code:addons/pad/web/editors.py:0
+#: code:addons/pad/web/editors.py:29
#, python-format
msgid "Name"
msgstr ""
@@ -42,6 +42,12 @@ msgstr ""
msgid "Error! You can not create recursive companies."
msgstr ""
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr ""
+
#. module: pad
#: model:ir.module.module,description:pad.module_meta_information
msgid "\n"
@@ -57,9 +63,7 @@ msgid "Pad root URL"
msgstr ""
#. module: pad
-#: code:addons/pad/web/editors.py:0
#: view:res.company:0
-#, python-format
msgid "Pad"
msgstr ""
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index c1f0dad4910..e4dcfccbe50 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:08+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -61,11 +61,6 @@ msgstr ""
msgid "Add product :"
msgstr ""
-#. module: point_of_sale
-#: report:pos.lines:0
-msgid "Net Total"
-msgstr ""
-
#. module: point_of_sale
#: view:all.closed.cashbox.of.the.day:0
msgid "All Cashboxes Of the day :"
@@ -146,6 +141,11 @@ msgstr ""
msgid "VAT"
msgstr ""
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr ""
+
#. module: point_of_sale
#: report:pos.invoice:0
msgid "Tax"
@@ -249,7 +249,7 @@ msgid "Sales Report"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
#, python-format
msgid "No Order Lines"
msgstr ""
@@ -281,7 +281,8 @@ msgid "Cash register management"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
#, python-format
msgid "No valid pricelist line found !"
msgstr ""
@@ -318,7 +319,7 @@ msgid "Sales by user monthly"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
#, python-format
msgid "You can not open a Cashbox for \"%s\".\n"
"Please close its related cash register."
@@ -475,14 +476,15 @@ msgid "Unit Price"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
#, python-format
msgid "Please check that income account is set to %s"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
-#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:56
+#: code:addons/point_of_sale/wizard/pos_return.py:166
+#: code:addons/point_of_sale/wizard/pos_return.py:327
#: model:ir.actions.act_window,name:point_of_sale.action_add_product
#: model:ir.model,name:point_of_sale.model_pos_add_product
#, python-format
@@ -537,13 +539,19 @@ msgid "Sale by Date and User"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
#, python-format
msgid "Cannot delete a point of sale which is closed or contains confirmed cashboxes!"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
#, python-format
msgid "Cash registers are already closed."
msgstr ""
@@ -605,7 +613,8 @@ msgid "User's Product"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
@@ -617,11 +626,6 @@ msgstr ""
msgid "Subtotal"
msgstr ""
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
#: model:ir.model,name:point_of_sale.model_pos_close_statement
@@ -718,7 +722,7 @@ msgid "Total :"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
#, python-format
msgid "Create line failed !"
msgstr ""
@@ -730,7 +734,7 @@ msgid "Product Name"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -815,6 +819,11 @@ msgstr ""
msgid "Opening Date"
msgstr ""
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr ""
+
#. module: point_of_sale
#: field:report.transaction.pos,disc:0
msgid "Disc."
@@ -868,7 +877,7 @@ msgid "transaction for the pos"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
#, python-format
msgid "UserError "
msgstr ""
@@ -879,7 +888,7 @@ msgid "Pos Box Entries"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
#, python-format
msgid "You can't modify this order. It has already been paid"
msgstr ""
@@ -890,6 +899,11 @@ msgstr ""
msgid "Date End"
msgstr ""
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Your Reference"
+msgstr ""
+
#. module: point_of_sale
#: field:report.transaction.pos,no_trans:0
msgid "Number of Transaction"
@@ -1054,11 +1068,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Document"
-msgstr ""
-
#. module: point_of_sale
#: view:pos.order:0
msgid "POS Orders"
@@ -1070,7 +1079,8 @@ msgid "All Closed CashBox"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -1114,7 +1124,6 @@ msgstr ""
#. module: point_of_sale
#: report:pos.invoice:0
-#: report:pos.lines:0
#: field:pos.order,amount_tax:0
msgid "Taxes"
msgstr ""
@@ -1225,10 +1234,15 @@ msgid "Sale by User"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
#, python-format
msgid "Error !"
msgstr ""
@@ -1255,7 +1269,7 @@ msgid "July"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:544
#, python-format
msgid "Please provide an account for the product: %s"
msgstr ""
@@ -1292,7 +1306,7 @@ msgid "Discount(Amount)"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:51
#, python-format
msgid "Active ID is not found"
msgstr ""
@@ -1340,7 +1354,7 @@ msgid "Point of sale receipt"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
#, python-format
msgid "No order lines defined for this sale "
msgstr ""
@@ -1356,7 +1370,7 @@ msgid "Customer Note"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
#, python-format
msgid "No order lines defined for this sale."
msgstr ""
@@ -1563,7 +1577,7 @@ msgid "Yes"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:743
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1574,9 +1588,8 @@ msgid "The cash register must be opened to be able to execute a payment."
msgstr ""
#. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
-msgid "Mode of Taxes"
+#: report:pos.lines:0
+msgid "Net Total :"
msgstr ""
#. module: point_of_sale
@@ -1665,7 +1678,8 @@ msgid "Invoice Date"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
#, python-format
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."
@@ -1682,9 +1696,9 @@ msgid "Reprint"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
#, python-format
msgid "You have to open at least one cashbox"
msgstr ""
@@ -1700,8 +1714,8 @@ msgid "Pos order"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
#, python-format
msgid "Error!"
msgstr ""
@@ -1828,7 +1842,7 @@ msgid "Supplier Invoice"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
#, python-format
msgid "Modify line failed !"
msgstr ""
@@ -1880,7 +1894,8 @@ msgid "Validation Date"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
#, python-format
msgid "You don't have enough access to validate this sale!"
msgstr ""
@@ -1919,8 +1934,8 @@ msgid "Control for Output Operations"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
#, python-format
msgid "Message"
msgstr ""
@@ -1955,11 +1970,6 @@ msgstr ""
msgid "Invoiced"
msgstr ""
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Must be after setLang()"
-msgstr ""
-
#. module: point_of_sale
#: view:pos.close.statement:0
#: view:pos.confirm:0
@@ -2004,13 +2014,13 @@ msgid "PRO-FORMA"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:852
#, python-format
msgid "There is no receivable account defined for this journal: \"%s\" (id:%d)"
msgstr ""
@@ -2067,7 +2077,13 @@ msgid "POS Orders lines"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
#, python-format
msgid "Error"
msgstr ""
@@ -2083,7 +2099,7 @@ msgid "Refund"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
#, python-format
msgid "Please create an invoice for this sale."
msgstr ""
@@ -2163,7 +2179,7 @@ msgid "Please fill these fields for entries to the box:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
#, python-format
msgid "please check that account is set to %s"
msgstr ""
@@ -2243,7 +2259,7 @@ msgid " Today "
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
#, python-format
msgid "The maximum value you can still withdraw is exceeded. \n"
" Remaining value is equal to %d "
@@ -2300,8 +2316,8 @@ msgid "Account Entry"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
-#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:84
+#: code:addons/point_of_sale/wizard/pos_return.py:407
#: view:pos.make.payment:0
#: view:pos.order:0
#, python-format
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 61e77ec57ab..203e9d3e316 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:09+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index 7e04cb7c6e8..40966dc4c57 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 14:11+0000\n"
+"PO-Revision-Date: 2010-12-31 10:31+0000\n"
"Last-Translator: Wei \"oldrev\" Li \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-12-31 05:24+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index c1ccfd12a4c..e1c08b0a93f 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:15+0000\n"
+"PO-Revision-Date: 2010-12-31 09:47+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: procurement
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 92b93e249e0..2e12cd60aec 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:10+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:10+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
#. module: procurement
#: model:ir.ui.menu,name:procurement.menu_stock_sched
msgid "Schedulers"
@@ -41,7 +46,7 @@ msgid "Draft procurement of the product and location of that orderpoint"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:288
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -57,7 +62,7 @@ msgid "Procurement Method"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:298
#, python-format
msgid "No address defined for the supplier"
msgstr ""
@@ -67,11 +72,6 @@ msgstr ""
msgid "Compute Stock Minimum Rules Only"
msgstr ""
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_action
-msgid "A procurement order is used to record a need in a specific product at a specific location. They are usually created automatically by the sales orders, the Pull Logistics rules or the minimum stock rules. When the procurement order is confirmed, it creates automatically the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc."
-msgstr ""
-
#. module: procurement
#: field:procurement.order,company_id:0
#: field:stock.warehouse.orderpoint,company_id:0
@@ -114,6 +114,11 @@ msgstr ""
msgid "Notes"
msgstr ""
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
#. module: procurement
#: help:procurement.order,message:0
msgid "Exception occurred while computing procurement orders."
@@ -236,11 +241,6 @@ msgstr ""
msgid "Warehouse"
msgstr ""
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
-msgid "You can define your minimum stock rules, so that OpenERP will trigger automatically the propositions of manufacturing or purchase orders according to the stock level. Once the virtual stock of a product (=stock on hand minus all confirmed orders and reservations) is bellow the minimum quantity, OpenERP will generate a procurement request in order to fullfil the stock up to the maximum quantity."
-msgstr ""
-
#. module: procurement
#: selection:stock.warehouse.orderpoint,logic:0
msgid "Best price (not yet active!)"
@@ -268,8 +268,8 @@ msgid "Scheduler Range Days"
msgstr ""
#. module: procurement
-#: view:make.procurement:0
-msgid "Ask New Products"
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid "A procurement order is used to record a need for a specific product at a specific location. A procurement order is usually created automatically from sales orders, a Pull Logistics rule or Minimum Stock Rules. When the procurement order is confirmed, it automatically creates the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc."
msgstr ""
#. module: procurement
@@ -289,13 +289,13 @@ msgid "Quantity"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:370
#, python-format
msgid "Not enough stock and no minimum orderpoint rule defined."
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:137
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -395,6 +395,11 @@ msgstr ""
msgid "Related Procurement Orders"
msgstr ""
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
msgid "Min Quantity"
@@ -411,7 +416,7 @@ msgid "plus"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:319
#, python-format
msgid "Please check the Quantity in Procurement Order(s), it should not be less than 1!"
msgstr ""
@@ -457,21 +462,11 @@ msgstr ""
msgid "This wizard will schedule procurements."
msgstr ""
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_exceptions
-msgid "Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)"
-msgstr ""
-
#. module: procurement
#: view:procurement.order:0
msgid "Status"
msgstr ""
-#. module: procurement
-#: help:res.company,schedule_range:0
-msgid "This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for futur computation."
-msgstr ""
-
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Normal"
@@ -503,7 +498,7 @@ msgid "Exception"
msgstr ""
#. module: procurement
-#: code:addons/procurement/schedulers.py:0
+#: code:addons/procurement/schedulers.py:179
#, python-format
msgid "Automatic OP: %s"
msgstr ""
@@ -559,19 +554,19 @@ msgid "Date Closed"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:372
#, python-format
msgid "Procurement '%s' is in exception: not enough stock."
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:138
#, python-format
msgid "Cannot delete Procurement Order(s) which are in %s State!"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:318
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -746,8 +741,8 @@ msgid "Waiting"
msgstr ""
#. module: procurement
-#: selection:procurement.order,procure_method:0
-msgid "on order"
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid "You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity."
msgstr ""
#. module: procurement
@@ -787,7 +782,7 @@ msgid "Product UoS"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:347
#, python-format
msgid "from stock: products assigned."
msgstr ""
@@ -800,8 +795,8 @@ msgid "Compute Schedulers"
msgstr ""
#. module: procurement
-#: view:procurement.orderpoint.compute:0
-msgid "Wizard checks all the stock minimum rules and generate procurement order."
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid "Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)."
msgstr ""
#. module: procurement
@@ -814,6 +809,11 @@ msgstr ""
msgid "Search Procurement"
msgstr ""
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid "This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for future computation."
+msgstr ""
+
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Very Urgent"
@@ -830,7 +830,7 @@ msgid "Procurement Details"
msgstr ""
#. module: procurement
-#: code:addons/procurement/schedulers.py:0
+#: code:addons/procurement/schedulers.py:180
#, python-format
msgid "SCHEDULER"
msgstr ""
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 4886599278b..bfa17c48c92 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-28 08:57+0000\n"
+"PO-Revision-Date: 2011-01-01 08:01+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-29 04:58+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: procurement
@@ -49,7 +49,7 @@ msgstr ""
#: code:addons/procurement/procurement.py:0
#, python-format
msgid "No supplier defined for this product !"
-msgstr ""
+msgstr "Không có nhà cung cấp nào cho sản phẩm này !"
#. module: procurement
#: field:make.procurement,uom_id:0
@@ -65,7 +65,7 @@ msgstr "Phương pháp mua hàng"
#: code:addons/procurement/procurement.py:0
#, python-format
msgid "No address defined for the supplier"
-msgstr ""
+msgstr "Không có địa chỉ nào được gán cho nhà cung cấp"
#. module: procurement
#: model:ir.actions.act_window,name:procurement.action_procurement_compute
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 6e4f4f5d0c7..fffe0c1f0bc 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-31 00:11+0000\n"
+"PO-Revision-Date: 2010-12-31 09:46+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index df81cc5fa6c..2f43d3963fa 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 08:02+0000\n"
+"PO-Revision-Date: 2010-12-31 09:00+0000\n"
"Last-Translator: Borja López Soilán \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 1bfc1252751..5955fc16469 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-08-03 08:58+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2011-01-01 22:34+0000\n"
+"Last-Translator: Tamás Dénes \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-12-29 04:53+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -75,7 +75,7 @@ msgstr ""
#. module: product
#: field:product.product,incoming_qty:0
msgid "Incoming"
-msgstr ""
+msgstr "Bejövő"
#. module: product
#: field:product.template,mes_type:0
@@ -119,18 +119,18 @@ msgstr ""
#: field:product.product,pricelist_id:0
#: view:product.supplierinfo:0
msgid "Pricelist"
-msgstr ""
+msgstr "Árlista"
#. module: product
#: view:product.product:0
#: view:product.template:0
msgid "Base Prices"
-msgstr ""
+msgstr "Alapárak"
#. module: product
#: field:product.pricelist.item,name:0
msgid "Rule Name"
-msgstr ""
+msgstr "Szabály neve"
#. module: product
#: field:product.product,code:0
@@ -153,12 +153,12 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_24_product_template
msgid "Keyboard"
-msgstr ""
+msgstr "Billentyűzet"
#. module: product
#: model:ir.model,name:product.model_res_partner
msgid "Partner"
-msgstr ""
+msgstr "Partner"
#. module: product
#: help:product.template,supply_method:0
@@ -170,7 +170,7 @@ msgstr ""
#. module: product
#: selection:product.template,cost_method:0
msgid "Average Price"
-msgstr ""
+msgstr "Átlagár"
#. module: product
#: help:product.pricelist.item,name:0
@@ -181,7 +181,7 @@ msgstr ""
#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
msgid "Units of Measure Categories"
-msgstr ""
+msgstr "Mértékegység kategóriák"
#. module: product
#: model:product.template,name:product.product_product_cpu1_product_template
@@ -196,22 +196,22 @@ msgstr ""
#. module: product
#: field:product.price_list,price_list:0
msgid "PriceList"
-msgstr ""
+msgstr "Árlista"
#. module: product
#: view:product.template:0
msgid "UOM"
-msgstr ""
+msgstr "ME"
#. module: product
#: model:product.uom,name:product.product_uom_unit
msgid "PCE"
-msgstr ""
+msgstr "db"
#. module: product
#: view:product.template:0
msgid "Miscelleanous"
-msgstr ""
+msgstr "Egyéb"
#. module: product
#: model:product.template,name:product.product_product_worker0_product_template
@@ -239,7 +239,7 @@ msgstr ""
#: model:product.pricelist.type,name:product.pricelist_type_sale
#: field:res.partner,property_product_pricelist:0
msgid "Sale Pricelist"
-msgstr ""
+msgstr "Értékesítési árlista"
#. module: product
#: view:product.template:0
@@ -256,7 +256,7 @@ msgstr ""
#: code:addons/product/product.py:0
#, python-format
msgid "Products: "
-msgstr ""
+msgstr "Termékek: "
#. module: product
#: field:product.category,parent_id:0
@@ -345,7 +345,7 @@ msgstr ""
#: view:product.template:0
#: field:product.template,state:0
msgid "Status"
-msgstr ""
+msgstr "Állapot"
#. module: product
#: help:product.template,categ_id:0
@@ -366,7 +366,7 @@ msgstr ""
#: model:product.price.type,name:product.list_price
#: field:product.product,lst_price:0
msgid "Public Price"
-msgstr ""
+msgstr "Listaár"
#. module: product
#: field:product.price_list,qty5:0
@@ -381,7 +381,7 @@ msgstr ""
#. module: product
#: field:product.template,product_manager:0
msgid "Product Manager"
-msgstr ""
+msgstr "Termékfelelős"
#. module: product
#: field:product.supplierinfo,product_name:0
@@ -403,7 +403,7 @@ msgstr ""
#: view:product.template:0
#: field:product.template,description_sale:0
msgid "Sale Description"
-msgstr ""
+msgstr "Értékesítési leírás"
#. module: product
#: view:product.product:0
@@ -419,7 +419,7 @@ msgstr ""
#. module: product
#: help:product.template,weight_net:0
msgid "The net weight in Kg."
-msgstr ""
+msgstr "Nettó súly (kg)"
#. module: product
#: help:product.template,state:0
@@ -430,12 +430,12 @@ msgstr ""
#: field:pricelist.partnerinfo,min_quantity:0
#: field:product.supplierinfo,qty:0
msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
#. module: product
#: field:product.packaging,height:0
msgid "Height"
-msgstr ""
+msgstr "Magasság"
#. module: product
#: help:product.pricelist.version,date_end:0
@@ -445,7 +445,7 @@ msgstr ""
#. module: product
#: model:product.category,name:product.cat0
msgid "All products"
-msgstr ""
+msgstr "Minden termék"
#. module: product
#: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -482,7 +482,7 @@ msgstr ""
#. module: product
#: view:res.partner:0
msgid "Sales & Purchases"
-msgstr ""
+msgstr "Beszerzés, értékesítés"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_wtime
@@ -512,7 +512,7 @@ msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
msgid "Product uom categ"
-msgstr ""
+msgstr "Termék ME kategória"
#. module: product
#: model:product.ul,name:product.product_ul_box
@@ -522,12 +522,12 @@ msgstr ""
#. module: product
#: view:product.pricelist.item:0
msgid "Price Computation"
-msgstr ""
+msgstr "Árszámítás"
#. module: product
#: field:product.template,purchase_ok:0
msgid "Can be Purchased"
-msgstr ""
+msgstr "Beszerezhető"
#. module: product
#: model:product.template,name:product.product_product_cpu2_product_template
@@ -556,7 +556,7 @@ msgstr ""
#. module: product
#: field:product.product,virtual_available:0
msgid "Virtual Stock"
-msgstr ""
+msgstr "Felhasználható készlet"
#. module: product
#: selection:product.category,type:0
@@ -577,12 +577,12 @@ msgstr ""
#: constraint:product.packaging:0
#: constraint:product.product:0
msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hiba: Érvénytelen EAN kód"
#. module: product
#: field:product.pricelist.item,min_quantity:0
msgid "Min. Quantity"
-msgstr ""
+msgstr "Min. mennyiség"
#. module: product
#: model:ir.model,name:product.model_product_price_type
@@ -683,7 +683,7 @@ msgstr ""
#. module: product
#: view:product.pricelist.item:0
msgid "New Price ="
-msgstr ""
+msgstr "Új ár ="
#. module: product
#: help:pricelist.partnerinfo,price:0
@@ -718,7 +718,7 @@ msgstr ""
#. module: product
#: view:product.pricelist.item:0
msgid "Min. Margin"
-msgstr "Minimum margó"
+msgstr "Min. árrés"
#. module: product
#: field:product.category,child_id:0
@@ -739,14 +739,14 @@ msgstr ""
#: view:product.product:0
#: field:product.ul,type:0
msgid "Type"
-msgstr ""
+msgstr "Típus"
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_action2
#: model:ir.ui.menu,name:product.menu_product_pricelist_action2
#: model:ir.ui.menu,name:product.menu_product_pricelist_main
msgid "Pricelists"
-msgstr ""
+msgstr "Árlisták"
#. module: product
#: field:product.product,partner_ref:0
@@ -774,6 +774,8 @@ msgid ""
"Set a product if this rule only apply to one product. Keep empty for all "
"products"
msgstr ""
+"Válasszon ki egy terméket, ha a szabály csak arra vonatkozik. Hagyja üresen "
+"minden termékhez."
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
@@ -788,7 +790,7 @@ msgstr ""
#. module: product
#: selection:product.template,state:0
msgid "In Development"
-msgstr ""
+msgstr "Fejlesztés alatt"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -820,14 +822,14 @@ msgstr ""
#: model:process.node,name:product.process_node_supplier0
#: view:product.supplierinfo:0
msgid "Supplier Information"
-msgstr ""
+msgstr "Szállítói információ"
#. module: product
#: field:product.price.type,currency_id:0
#: report:product.pricelist:0
#: field:product.pricelist,currency_id:0
msgid "Currency"
-msgstr ""
+msgstr "Pénznem"
#. module: product
#: model:product.template,name:product.product_product_ram_product_template
@@ -837,7 +839,7 @@ msgstr ""
#. module: product
#: view:product.category:0
msgid "Product Categories"
-msgstr ""
+msgstr "Termékkategóriák"
#. module: product
#: view:product.uom:0
@@ -885,7 +887,7 @@ msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_supplierinfo
msgid "Information about a product supplier"
-msgstr ""
+msgstr "Információ a termék beszállítójáról."
#. module: product
#: view:product.product:0
@@ -897,7 +899,7 @@ msgstr ""
#: view:product.template:0
#: field:product.template,description_purchase:0
msgid "Purchase Description"
-msgstr ""
+msgstr "Beszerzési leírás"
#. module: product
#: constraint:product.pricelist.version:0
@@ -925,17 +927,17 @@ msgstr ""
#. module: product
#: selection:product.template,type:0
msgid "Stockable Product"
-msgstr ""
+msgstr "Készletezhető termék"
#. module: product
#: field:product.packaging,code:0
msgid "Code"
-msgstr ""
+msgstr "Kód"
#. module: product
#: view:product.supplierinfo:0
msgid "Seq"
-msgstr ""
+msgstr "Sorsz."
#. module: product
#: view:product.price_list:0
@@ -1029,7 +1031,7 @@ msgstr ""
#. module: product
#: field:product.product,packaging:0
msgid "Logistical Units"
-msgstr ""
+msgstr "Szállítási egységek"
#. module: product
#: field:product.category,complete_name:0
@@ -1042,7 +1044,7 @@ msgstr ""
#: field:product.uom,name:0
#: field:product.uom.categ,name:0
msgid "Name"
-msgstr ""
+msgstr "Név"
#. module: product
#: view:product.product:0
@@ -1135,7 +1137,7 @@ msgstr ""
#. module: product
#: field:product.template,uos_id:0
msgid "Unit of Sale"
-msgstr ""
+msgstr "Eladási egység"
#. module: product
#: model:ir.module.module,description:product.module_meta_information
@@ -1178,7 +1180,7 @@ msgstr ""
#: model:product.category,name:product.product_category_services
#: view:product.product:0
msgid "Services"
-msgstr ""
+msgstr "Szolgáltatások"
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
@@ -1192,7 +1194,7 @@ msgstr "Alapárlista"
#: model:ir.ui.menu,name:product.menu_products
#: view:product.product:0
msgid "Products"
-msgstr ""
+msgstr "Termékek"
#. module: product
#: help:product.packaging,rows:0
@@ -1219,7 +1221,7 @@ msgstr ""
#. module: product
#: field:product.template,seller_ids:0
msgid "Partners"
-msgstr ""
+msgstr "Partnerek"
#. module: product
#: sql_constraint:res.users:0
@@ -1247,7 +1249,7 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Second UoM"
-msgstr ""
+msgstr "Második mértékegység"
#. module: product
#: code:addons/product/product.py:0
@@ -1261,12 +1263,12 @@ msgstr ""
#: model:ir.ui.menu,name:product.next_id_16
#: view:product.uom:0
msgid "Units of Measure"
-msgstr ""
+msgstr "Mértékegységek"
#. module: product
#: field:product.supplierinfo,min_qty:0
msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minimum mennyiség"
#. module: product
#: model:product.category,name:product.product_category_pc
@@ -1283,7 +1285,7 @@ msgstr ""
#. module: product
#: selection:product.template,procure_method:0
msgid "Make to Stock"
-msgstr ""
+msgstr "Készletre gyártás"
#. module: product
#: field:product.pricelist.item,price_version_id:0
@@ -1306,12 +1308,12 @@ msgstr ""
#. module: product
#: help:product.price.type,currency_id:0
msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "A mezőhöz használt pénznem"
#. module: product
#: help:product.template,weight:0
msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Bruttó súly (kg)"
#. module: product
#: view:product.product:0
@@ -1322,12 +1324,12 @@ msgstr ""
#. module: product
#: field:product.uom,category_id:0
msgid "UoM Category"
-msgstr ""
+msgstr "Mértékegység kategória"
#. module: product
#: field:product.template,loc_rack:0
msgid "Rack"
-msgstr ""
+msgstr "Állvány"
#. module: product
#: field:product.template,uom_po_id:0
@@ -1401,7 +1403,7 @@ msgstr ""
#. module: product
#: field:product.product,qty_available:0
msgid "Real Stock"
-msgstr ""
+msgstr "Valós készlet"
#. module: product
#: model:product.uom,name:product.product_uom_cm
@@ -1411,13 +1413,15 @@ msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_uom
msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Termék mértékegysége"
#. module: product
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
+"Hiba: Az alapértelmezett mennyiségi egységnek és a beszerzési mennyiségi "
+"egységének ugyanabban a kategóriában kell lennie."
#. module: product
#: constraint:res.users:0
@@ -1427,7 +1431,7 @@ msgstr ""
#. module: product
#: field:product.uom,rounding:0
msgid "Rounding Precision"
-msgstr ""
+msgstr "Kerekítési pontosság"
#. module: product
#: view:product.uom:0
@@ -1447,7 +1451,7 @@ msgstr ""
#. module: product
#: view:product.uom.categ:0
msgid "Units of Measure categories"
-msgstr ""
+msgstr "Mennyiségi egység kategóriák"
#. module: product
#: help:product.packaging,weight_ul:0
@@ -1481,7 +1485,7 @@ msgstr ""
#. module: product
#: help:product.packaging,ean:0
msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "A csomagolási egység EAN kódja."
#. module: product
#: field:product.packaging,weight_ul:0
@@ -1496,7 +1500,7 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_type_action
msgid "Pricelists Types"
-msgstr ""
+msgstr "Árlista típusok"
#. module: product
#: help:product.uom,factor:0
@@ -1509,6 +1513,7 @@ msgstr ""
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
msgstr ""
+"A készletezési műveletekhez használatos alapértelmezett mennyiségi egység."
#. module: product
#: model:product.category,name:product.product_category_misc0
@@ -1523,7 +1528,7 @@ msgstr ""
#. module: product
#: field:pricelist.partnerinfo,price:0
msgid "Unit Price"
-msgstr ""
+msgstr "Egységár"
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -1568,12 +1573,12 @@ msgstr ""
#. module: product
#: field:product.packaging,ul_qty:0
msgid "Package by layer"
-msgstr ""
+msgstr "Csomagok száma rétegenként"
#. module: product
#: field:product.template,warranty:0
msgid "Warranty (months)"
-msgstr ""
+msgstr "Szavatosság (hónap)"
#. module: product
#: model:ir.model,name:product.model_product_product
@@ -1586,7 +1591,7 @@ msgstr ""
#: field:product.supplierinfo,product_id:0
#: model:res.request.link,name:product.req_link_product
msgid "Product"
-msgstr ""
+msgstr "Termék"
#. module: product
#: selection:product.template,supply_method:0
@@ -1596,7 +1601,7 @@ msgstr ""
#. module: product
#: selection:product.template,procure_method:0
msgid "Make to Order"
-msgstr ""
+msgstr "Rendelésre gyártás"
#. module: product
#: help:product.packaging,qty:0
@@ -1606,24 +1611,24 @@ msgstr ""
#. module: product
#: field:product.product,variants:0
msgid "Variants"
-msgstr ""
+msgstr "Változatok"
#. module: product
#: model:ir.actions.act_window,name:product.product_category_action
#: model:ir.ui.menu,name:product.menu_products_category
msgid "Products by Category"
-msgstr ""
+msgstr "Termékek kategóriánként"
#. module: product
#: model:ir.actions.act_window,name:product.product_category_action_form
#: model:ir.ui.menu,name:product.menu_product_category_action_form
msgid "Products Categories"
-msgstr ""
+msgstr "Termék kategóriák"
#. module: product
#: field:product.template,uos_coeff:0
msgid "UOM -> UOS Coeff"
-msgstr ""
+msgstr "ME -> EE átváltás"
#. module: product
#: help:product.supplierinfo,sequence:0
@@ -1653,7 +1658,7 @@ msgstr "Kerekítési metódus"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
msgid "Products Labels"
-msgstr ""
+msgstr "Termék címkék"
#. module: product
#: model:product.ul,name:product.product_ul_big_box
@@ -1673,7 +1678,7 @@ msgstr "Csomag magassága"
#. module: product
#: view:product.pricelist:0
msgid "Products Price List"
-msgstr ""
+msgstr "Termék árlisták"
#. module: product
#: field:product.pricelist,company_id:0
@@ -1687,20 +1692,20 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_price_type_action
msgid "Prices Types"
-msgstr ""
+msgstr "Ártípusok"
#. module: product
#: help:product.template,list_price:0
msgid ""
"Base price for computing the customer price. Sometimes called the catalog "
"price."
-msgstr ""
+msgstr "Az eladási ár alapjául szolgál. Szokás katalógusárnak is nevezni."
#. module: product
#: code:addons/product/pricelist.py:0
#, python-format
msgid "Partner section of the product form"
-msgstr ""
+msgstr "A termék űrlap Partner adatai"
#. module: product
#: help:product.price.type,name:0
@@ -1732,7 +1737,7 @@ msgstr ""
#. module: product
#: field:product.packaging,length:0
msgid "Length"
-msgstr ""
+msgstr "Hossz"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_length
@@ -1749,7 +1754,7 @@ msgstr ""
#: field:product.pricelist,type:0
#: view:product.pricelist.type:0
msgid "Pricelist Type"
-msgstr ""
+msgstr "Árlista típus"
#. module: product
#: model:product.category,name:product.product_category_otherproducts0
@@ -1769,12 +1774,12 @@ msgstr ""
#. module: product
#: field:product.template,produce_delay:0
msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Gyártási átfutási idő"
#. module: product
#: field:product.supplierinfo,pricelist_ids:0
msgid "Supplier Pricelist"
-msgstr ""
+msgstr "Beszállítói árlista"
#. module: product
#: field:product.pricelist.item,base:0
@@ -1797,14 +1802,14 @@ msgstr ""
#. module: product
#: field:product.pricelist,name:0
msgid "Pricelist Name"
-msgstr ""
+msgstr "Árlista név"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_version
#: view:product.pricelist:0
#: view:product.pricelist.version:0
msgid "Pricelist Version"
-msgstr ""
+msgstr "Árlista változat"
#. module: product
#: view:product.pricelist.item:0
@@ -1835,7 +1840,7 @@ msgstr ""
#: model:ir.model,name:product.model_product_category
#: field:product.pricelist.item,categ_id:0
msgid "Product Category"
-msgstr ""
+msgstr "Termék kategória"
#. module: product
#: report:product.pricelist:0
@@ -1862,7 +1867,7 @@ msgstr ""
#. module: product
#: selection:product.ul,type:0
msgid "Box"
-msgstr ""
+msgstr "Doboz"
#. module: product
#: model:ir.actions.act_window,help:product.product_ul_form_action
@@ -1911,7 +1916,7 @@ msgstr ""
#. module: product
#: model:product.uom.categ,name:product.product_uom_categ_kgm
msgid "Weight"
-msgstr ""
+msgstr "Súly"
#. module: product
#: model:product.template,name:product.product_product_22_product_template
@@ -1921,7 +1926,7 @@ msgstr ""
#. module: product
#: model:product.template,name:product.product_product_25_product_template
msgid "Mouse"
-msgstr ""
+msgstr "Egér"
#. module: product
#: field:product.uom,uom_type:0
@@ -1944,12 +1949,12 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Descriptions"
-msgstr ""
+msgstr "Leírások"
#. module: product
#: field:product.template,loc_row:0
msgid "Row"
-msgstr ""
+msgstr "Sor"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
@@ -1965,7 +1970,7 @@ msgstr ""
#: view:product.product:0
#: view:product.template:0
msgid "Weigths"
-msgstr ""
+msgstr "Súlyok"
#. module: product
#: constraint:res.partner:0
@@ -1997,7 +2002,7 @@ msgstr ""
#. module: product
#: field:product.pricelist.item,price_round:0
msgid "Price Rounding"
-msgstr ""
+msgstr "Árkerekítés"
#. module: product
#: field:product.pricelist.item,price_max_margin:0
@@ -2025,7 +2030,7 @@ msgstr ""
#: model:product.price.type,name:product.standard_price
#: field:product.template,standard_price:0
msgid "Cost Price"
-msgstr ""
+msgstr "Önköltségi ár"
#. module: product
#: field:product.pricelist.item,price_min_margin:0
@@ -2035,7 +2040,7 @@ msgstr ""
#. module: product
#: field:product.template,weight:0
msgid "Gross weight"
-msgstr ""
+msgstr "Bruttó súly"
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
@@ -2068,7 +2073,7 @@ msgstr ""
#. module: product
#: model:ir.model,name:product.model_product_pricelist_item
msgid "Pricelist item"
-msgstr ""
+msgstr "Árlista tétel"
#. module: product
#: model:product.template,name:product.product_product_21_product_template
@@ -2112,7 +2117,7 @@ msgstr ""
#: view:product.template:0
#: field:product.template,description:0
msgid "Description"
-msgstr ""
+msgstr "Leírás"
#. module: product
#: code:addons/product/pricelist.py:0
@@ -2125,7 +2130,7 @@ msgstr ""
#. module: product
#: view:product.template:0
msgid "Product Description"
-msgstr ""
+msgstr "Termékleírás"
#. module: product
#: view:product.pricelist.item:0
@@ -2142,12 +2147,12 @@ msgstr ""
#. module: product
#: field:product.template,volume:0
msgid "Volume"
-msgstr ""
+msgstr "Térfogat"
#. module: product
#: field:product.template,loc_case:0
msgid "Case"
-msgstr ""
+msgstr "Rekesz"
#. module: product
#: view:product.product:0
@@ -2171,7 +2176,7 @@ msgstr ""
#: field:product.product,product_tmpl_id:0
#: view:product.template:0
msgid "Product Template"
-msgstr ""
+msgstr "Terméksablon"
#. module: product
#: field:product.template,cost_method:0
@@ -2201,7 +2206,7 @@ msgstr ""
#: model:ir.ui.menu,name:product.menu_product_pricelist_action
#: field:product.pricelist,version_id:0
msgid "Pricelist Versions"
-msgstr ""
+msgstr "Árlista változatok"
#. module: product
#: field:product.category,sequence:0
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 4d36296ab2c..d74f410573b 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:12+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -96,7 +96,9 @@ msgid "Fixed"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:186
+#: code:addons/product/pricelist.py:339
+#: code:addons/product/pricelist.py:357
#, python-format
msgid "Warning !"
msgstr ""
@@ -236,7 +238,7 @@ msgid " e.g: 1 * (this unit) = ratio * (reference unit)"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:378
#, python-format
msgid "Products: "
msgstr ""
@@ -370,6 +372,11 @@ msgstr ""
msgid "Medium PC"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_puchased
+msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
#. module: product
#: view:product.pricelist:0
msgid "Products Price Search"
@@ -464,6 +471,11 @@ msgstr ""
msgid "Working Time"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80."
+msgstr ""
+
#. module: product
#: help:product.product,active:0
msgid "If the active field is set to False, it will allow you to hide the product without removing it."
@@ -475,7 +487,7 @@ msgid "Metal Cleats"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:340
#, python-format
msgid "No active version for the selected pricelist !\n"
"Please create or activate one."
@@ -632,11 +644,6 @@ msgstr ""
msgid "To Purchase"
msgstr ""
-#. module: product
-#: model:product.template,name:product.product_product_mb1_product_template
-msgid "Mainboard ASUStek A7N8X"
-msgstr ""
-
#. module: product
#: help:product.supplierinfo,min_qty:0
msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."
@@ -730,6 +737,12 @@ msgstr ""
msgid "Set a product if this rule only apply to one product. Keep empty for all products"
msgstr ""
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr ""
+
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
msgid "Kitchen Design Project"
@@ -800,9 +813,8 @@ msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
msgstr ""
#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Procurement & Locations"
+#: model:ir.actions.act_window,help:product.product_uom_form_action
+msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category."
msgstr ""
#. module: product
@@ -863,8 +875,8 @@ msgid "Lead time in days between the confirmation of the purchase order and the
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action2
-msgid "A pricelist contains rules to be evaluated in order to compute the purchase or sale price for all the partners assigned to a pricelist. Pricelists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of this category of product will be based on the supplier price multiplied by 1.80."
+#: model:ir.actions.act_window,help:product.product_pricelist_action
+msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc."
msgstr ""
#. module: product
@@ -897,16 +909,6 @@ msgstr ""
msgid "Partner Information"
msgstr ""
-#. module: product
-#: model:ir.actions.act_window,help:product.product_normal_action
-msgid "You must define a Product for everything you buy or sell. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information of your products related to procurement logistics, sales price, product category, suppliers and so on."
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_res_users
-msgid "res.users"
-msgstr ""
-
#. module: product
#: selection:product.ul,type:0
#: model:product.uom.categ,name:product.product_uom_categ_unit
@@ -934,6 +936,11 @@ msgstr ""
msgid "Price List Items"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
+msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days."
+msgstr ""
+
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
@@ -960,8 +967,8 @@ msgid "Price Surcharge"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_form_action
-msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate to be used between the several Unit of Measure within the same category."
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
msgstr ""
#. module: product
@@ -975,6 +982,7 @@ msgstr ""
#: field:product.pricelist.type,name:0
#: field:product.pricelist.version,name:0
#: view:product.product:0
+#: field:product.product,name_template:0
#: field:product.template,name:0
#: field:product.ul,name:0
#: field:product.uom,name:0
@@ -992,6 +1000,11 @@ msgstr ""
msgid "Wood Lintel 4m"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action
+msgid "You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
#. module: product
#: model:product.uom,name:product.product_uom_kgm
msgid "kg"
@@ -1137,7 +1150,7 @@ msgid "Pallet Dimension"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:603
#, python-format
msgid " (copy)"
msgstr ""
@@ -1147,21 +1160,11 @@ msgstr ""
msgid "Partners"
msgstr ""
-#. module: product
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
#. module: product
#: help:product.template,sale_delay:0
msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
msgstr ""
-#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
-msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measures are in the same category, they can be converted within each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days."
-msgstr ""
-
#. module: product
#: view:product.product:0
#: view:product.template:0
@@ -1169,7 +1172,7 @@ msgid "Second UoM"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:142
#, python-format
msgid "Error !"
msgstr ""
@@ -1249,13 +1252,13 @@ msgid "Purchase Unit of Measure"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_category_action
-msgid "Here is a list of all your products classified by category. You can click on a category to get the list of all products linked to this category or to a child of this category."
+#: field:product.template,supply_method:0
+msgid "Supply method"
msgstr ""
#. module: product
-#: field:product.template,supply_method:0
-msgid "Supply method"
+#: model:ir.actions.act_window,help:product.product_category_action
+msgid "Here is a list of all your products classified by category. You can click a category to get the list of all products linked to this category or to a child of this category."
msgstr ""
#. module: product
@@ -1269,7 +1272,7 @@ msgid "Regular processor config"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:142
#, python-format
msgid "Conversion from Product UoM m to Default UoM PCE is not possible as they both belong to different Category!."
msgstr ""
@@ -1319,11 +1322,6 @@ msgstr ""
msgid "Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
-#. module: product
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-
#. module: product
#: field:product.uom,rounding:0
msgid "Rounding Precision"
@@ -1395,6 +1393,7 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
msgid "Pricelists Types"
msgstr ""
@@ -1424,11 +1423,6 @@ msgstr ""
msgid "Unit Price"
msgstr ""
-#. module: product
-#: model:ir.actions.act_window,help:product.product_normal_action_puchased
-msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information on your products related to procurement logistics, sales price, product category, suppliers and so on."
-msgstr ""
-
#. module: product
#: model:product.category,name:product.product_category_7
#: model:product.template,name:product.product_product_1_product_template
@@ -1470,6 +1464,11 @@ msgstr ""
msgid "Warranty (months)"
msgstr ""
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
+msgstr ""
+
#. module: product
#: model:ir.model,name:product.model_product_product
#: model:ir.ui.menu,name:product.prod_config_main
@@ -1590,7 +1589,7 @@ msgid "Base price for computing the customer price. Sometimes called the catalog
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:515
#, python-format
msgid "Partner section of the product form"
msgstr ""
@@ -1988,7 +1987,7 @@ msgid "Description"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:358
#, python-format
msgid "Could not resolve product category, you have defined cyclic categories of products!"
msgstr ""
@@ -2029,7 +2028,7 @@ msgid "Shelves"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:514
#, python-format
msgid "Other Pricelist"
msgstr ""
@@ -2099,23 +2098,13 @@ msgid "Coefficient to convert UOM to UOS\n"
" uos = uom * coeff"
msgstr ""
-#. module: product
-#: field:product.pricelist.item,price_discount:0
-msgid "Price Discount"
-msgstr ""
-
#. module: product
#: help:product.template,volume:0
msgid "The volume in m3."
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action
-msgid "There can be more than one version of a pricelist. If you need to create new versions of a pricelist, you can do it and manage them from here. Some examples of versions: 2010, 2011, Promotion of February 2010, etc."
-msgstr ""
-
-#. module: product
-#: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
msgstr ""
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index cffe3d42fb7..7bdcf020a2f 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 14:10+0000\n"
+"PO-Revision-Date: 2010-12-31 08:37+0000\n"
"Last-Translator: Cristiano Korndörfer \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 8b0f2b256c4..142fd87f1f6 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 02:44+0000\n"
+"PO-Revision-Date: 2010-12-31 10:15+0000\n"
"Last-Translator: Wei \"oldrev\" Li \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:03+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/product.py b/addons/product/product.py
index 7c0cf118ce2..eabd9494908 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -789,21 +789,3 @@ class pricelist_partnerinfo(osv.osv):
_order = 'min_quantity asc'
pricelist_partnerinfo()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-class res_users(osv.osv):
- _inherit = 'res.users'
- def _get_group(self, cr, uid, context=None):
- result = super(res_users, self)._get_group(cr, uid, context=context)
- dataobj = self.pool.get('ir.model.data')
- try:
- dummy,group_id = dataobj.get_object_reference(cr, 1, 'product', 'group_product_manager')
- result.append(group_id)
- except ValueError:
- # If these groups does not exists anymore
- pass
- return result
-
- _defaults = {
- 'groups_id': _get_group,
- }
-res_users()
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index aa629f6deba..7aab02c055d 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:12+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index c2a8ffae19c..d187880675e 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 237b0d0b0e4..d42dd84770f 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -234,7 +234,7 @@ msgid "Sales"
msgstr ""
#. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:0
+#: code:addons/product_margin/wizard/product_margin.py:73
#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
#: view:product.product:0
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index 55efe21ab24..3356bd97fc5 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:17+0000\n"
+"PO-Revision-Date: 2010-12-31 10:56+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index f474a0dd451..4e360eda35e 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-28 08:26+0000\n"
+"PO-Revision-Date: 2011-01-01 07:19+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"\n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_visible_discount
@@ -49,18 +49,17 @@ msgid ""
msgstr ""
"\n"
" Este módulo permite calcular descuentos en las líneas del Pedido de "
-"Ventas y en las de la Factura basados en la lista de precios del proveedor.\n"
-" Para esto, una nueva casilla de selección llamada \"Descuento visible\" "
-"se añade al formulario de la lista de precios.\n"
+"Ventas y en las de la Factura basados en la tarifa de la empresa.\n"
+" Para ello se añade al formulario de la tarifa una nueva opción llamada "
+"\"Descuento visible\".\n"
" Ejemplo:\n"
-" Para el producto PC1 y el proveedor \"Asustek\": si el precio de "
-"lista es 450 y el precio calculado con la lista de precios de Asustek es "
-"225\n"
-" Si la casilla de selección está activada, en la línea del pedido "
-"aparecerá: precio unicario=450, Descuento=50,00, Precio neto=225\n"
-" Si la casilla de selección está desactivada, en la línea del pedido "
-"y en la factura aparecerá: Precio unitario=225, Descuento=0,00, Precio "
-"neto=225\n"
+" Para el producto PC1 y la empresa \"Asustek\": si el precio de venta "
+"es 450 y el precio calculado con la tarifa de Asustek es 225:\n"
+" Si la opción \"Descuento visible\" está activada, en la línea del "
+"pedido aparecerá: precio unitario=450, Descuento=50,00, Precio neto=225\n"
+" Si la opción \"Descuento visible\" está desactivada, en la línea del "
+"pedido y en la factura aparecerá: Precio unitario=225, Descuento=0,00, "
+"Precio neto=225\n"
" "
#. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index e6581f5570a..6846df363d1 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:147
#, python-format
msgid "No Purchase Pricelist Found !"
msgstr ""
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:155
#, python-format
msgid "No Sale Pricelist Found "
msgstr ""
@@ -51,7 +51,7 @@ msgid "Invoice Line"
msgstr ""
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:155
#, python-format
msgid "You must first define a pricelist for Customer !"
msgstr ""
@@ -62,7 +62,7 @@ msgid "Pricelist"
msgstr ""
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:147
#, python-format
msgid "You must first define a pricelist for Supplier !"
msgstr ""
diff --git a/addons/profile_tools/i18n/de.po b/addons/profile_tools/i18n/de.po
index 99e4d2f1c0f..4c7e0e7ab1b 100644
--- a/addons/profile_tools/i18n/de.po
+++ b/addons/profile_tools/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:16+0000\n"
+"PO-Revision-Date: 2010-12-31 11:01+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: profile_tools
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
index 474b5c2cff3..807891ec80f 100644
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ b/addons/profile_tools/i18n/profile_tools.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,24 +25,19 @@ msgstr ""
msgid "Allows you to give restricted access to your OpenERP documents to external users, such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc."
msgstr ""
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Here are applications that can help you improve your organization without being key in its management."
-msgstr ""
-
#. module: profile_tools
#: help:misc_tools.installer,lunch:0
msgid "A simple module to help you to manage Lunch orders."
msgstr ""
#. module: profile_tools
-#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
-msgid "Tools Configuration"
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
msgstr ""
#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure Extra Tools"
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
msgstr ""
#. module: profile_tools
@@ -52,6 +47,11 @@ msgid "Installs tools for lunch,survey,subscription and audittrail\n"
" "
msgstr ""
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools are applications that can help you improve your organization although they are not key for company management."
+msgstr ""
+
#. module: profile_tools
#: view:misc_tools.installer:0
msgid "Configure"
@@ -93,8 +93,13 @@ msgid "Helps to generate automatically recurring documents."
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
msgstr ""
#. module: profile_tools
@@ -103,8 +108,8 @@ msgid "Survey"
msgstr ""
#. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
msgstr ""
#. module: profile_tools
@@ -113,8 +118,8 @@ msgid "Configuration Progress"
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Native pad integration"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
msgstr ""
#. module: profile_tools
@@ -127,8 +132,3 @@ msgstr ""
msgid "Web Share"
msgstr ""
-#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index e0e20c5208e..4a21aec6aab 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:17+0000\n"
+"PO-Revision-Date: 2010-12-31 10:21+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:22+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index 3551c7db3ad..cf2be51504b 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 18:14+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:58+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:22+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index ad2be7f43eb..8479d639beb 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:55+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:55+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,17 @@ msgid "Reinclude the description of the task in the task of the user"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:657
#, python-format
msgid "The task '%s' has been delegated to %s."
msgstr ""
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid "This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
#. module: project
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
@@ -47,13 +53,17 @@ msgid "Deadlines"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:121
#, python-format
msgid "Operation Not Permitted !"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_delegate.py:0
+#: code:addons/project/wizard/project_task_delegate.py:55
+#: code:addons/project/wizard/project_task_delegate.py:56
+#: code:addons/project/wizard/project_task_delegate.py:63
+#: code:addons/project/wizard/project_task_delegate.py:64
+#: code:addons/project/wizard/project_task_delegate.py:67
#, python-format
msgid "CHECK: "
msgstr ""
@@ -91,7 +101,7 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:86
#, python-format
msgid "Task '%s' Closed"
msgstr ""
@@ -224,7 +234,7 @@ msgid "Day"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:570
#, python-format
msgid "The task '%s' is done"
msgstr ""
@@ -409,7 +419,7 @@ msgid "Reactivate Project"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:552
#, python-format
msgid "Task '%s' closed"
msgstr ""
@@ -426,8 +436,8 @@ msgid "Done by"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_task_type_form
-msgid "Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue."
+#: view:project.task:0
+msgid "Planning"
msgstr ""
#. module: project
@@ -459,16 +469,12 @@ msgid "Error! You can not create recursive analytic accounts."
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:224
+#: code:addons/project/project.py:245
#, python-format
msgid " (copy)"
msgstr ""
-#. module: project
-#: field:project.task,user_id:0
-msgid "Responsible"
-msgstr ""
-
#. module: project
#: help:project.installer,hr_timesheet_sheet:0
msgid "Tracks and helps employees encode and validate timesheets and attendances."
@@ -490,6 +496,11 @@ msgstr ""
msgid "Reevaluate Task"
msgstr ""
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
#. module: project
#: view:project.project:0
msgid "Date Stop: %(date)s"
@@ -552,8 +563,9 @@ msgid "Percent of tasks closed according to the total of tasks todo."
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.action_view_task
-msgid "A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to antoher user. If you delegate a task to another user, you get a new task in pending state, which will be re-opened when you have to review the work achieved. If you install the project_timesheet module, tasks works can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed."
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
msgstr ""
#. module: project
@@ -593,7 +605,7 @@ msgid "Reevaluate"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:530
#, python-format
msgid "Send Email after close task"
msgstr ""
@@ -683,7 +695,7 @@ msgid "Starting Date"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:266
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.ui.menu,name:project.menu_open_view_project_all
#: view:project.project:0
@@ -700,12 +712,12 @@ msgid "Stage"
msgstr ""
#. module: project
-#: field:report.project.task.user,user_id:0
-msgid "Assigned To"
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid "Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue."
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:621
#, python-format
msgid "The task '%s' is opened."
msgstr ""
@@ -799,7 +811,7 @@ msgid "My Board"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:79
#, python-format
msgid "Please specify the email address of Project Manager."
msgstr ""
@@ -843,6 +855,11 @@ msgstr ""
msgid "Task Delegate"
msgstr ""
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid "A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed."
+msgstr ""
+
#. module: project
#: selection:report.project.task.user,month:0
msgid "September"
@@ -929,8 +946,8 @@ msgid "Gives the sequence order when displaying a list of task"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
msgstr ""
#. module: project
@@ -1061,11 +1078,6 @@ msgstr ""
msgid "New state of your own task. Pending will be reopened automatically when the delegated task is closed"
msgstr ""
-#. module: project
-#: field:project.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
#. module: project
#: selection:report.project.task.user,month:0
msgid "June"
@@ -1089,7 +1101,7 @@ msgid "Project Dashboard"
msgstr ""
#. module: project
-#: view:project.project:0
+#: field:project.project,parent_id:0
msgid "Parent Project"
msgstr ""
@@ -1119,7 +1131,7 @@ msgid "Customer Email"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:189
#, python-format
msgid "The project '%s' has been closed."
msgstr ""
@@ -1160,7 +1172,7 @@ msgid "When task is completed, it will come into the done state."
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:211
#, python-format
msgid "The project '%s' has been opened."
msgstr ""
@@ -1176,13 +1188,15 @@ msgid "Dashboard"
msgstr ""
#. module: project
-#: help:res.company,project_time_mode_id:0
-msgid "This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:79
+#: code:addons/project/wizard/project_task_close.py:82
+#: code:addons/project/wizard/project_task_close.py:91
+#: code:addons/project/wizard/project_task_close.py:111
#, python-format
msgid "Error"
msgstr ""
@@ -1203,7 +1217,7 @@ msgid "_Delegate"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:91
#, python-format
msgid "Couldn't send mail because your email address is not configured!"
msgstr ""
@@ -1282,7 +1296,7 @@ msgid "This report allows you to analyse the performance of your projects and us
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:581
#, python-format
msgid "Task '%s' set in progress"
msgstr ""
@@ -1328,7 +1342,7 @@ msgid "Open"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:121
#, python-format
msgid "You can not delete a project with tasks. I suggest you to deactivate it."
msgstr ""
@@ -1347,7 +1361,7 @@ msgid "In Progress"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:82
#, python-format
msgid "Please specify the email address of Customer."
msgstr ""
@@ -1369,9 +1383,8 @@ msgid "Current Activity"
msgstr ""
#. module: project
-#: view:project.task.delegate:0
-#: field:project.task.delegate,new_task_description:0
-msgid "New Task Description"
+#: field:project.task,user_id:0
+msgid "Responsible"
msgstr ""
#. module: project
@@ -1402,11 +1415,6 @@ msgstr ""
msgid "Very Low"
msgstr ""
-#. module: project
-#: view:project.task:0
-msgid "Planning"
-msgstr ""
-
#. module: project
#: field:project.project,warn_manager:0
#: field:project.task.close,manager_warn:0
@@ -1571,7 +1579,7 @@ msgid "Task By Days"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:111
#, python-format
msgid "Couldn't send mail! Check the email ids and smtp configuration settings"
msgstr ""
@@ -1644,7 +1652,7 @@ msgid "Spent Hours"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:664
#, python-format
msgid "The task '%s' is pending."
msgstr ""
@@ -1693,6 +1701,11 @@ msgstr ""
msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
msgstr ""
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section."
+msgstr ""
+
#. module: project
#: field:project.project,total_hours:0
msgid "Total Time"
@@ -1704,7 +1717,7 @@ msgid "Validation State"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:601
#, python-format
msgid "Task '%s' cancelled"
msgstr ""
@@ -1730,7 +1743,7 @@ msgid "Create Date"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:609
#, python-format
msgid "The task '%s' is cancelled."
msgstr ""
diff --git a/addons/project_caldav/i18n/de.po b/addons/project_caldav/i18n/de.po
index 617dff3ddf6..4739104eabb 100644
--- a/addons/project_caldav/i18n/de.po
+++ b/addons/project_caldav/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:17+0000\n"
+"PO-Revision-Date: 2010-12-31 11:01+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_caldav
diff --git a/addons/project_caldav/i18n/es.po b/addons/project_caldav/i18n/es.po
index a5b4318857e..08a542bbde8 100644
--- a/addons/project_caldav/i18n/es.po
+++ b/addons/project_caldav/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:44+0000\n"
+"PO-Revision-Date: 2010-12-31 08:51+0000\n"
"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_caldav
diff --git a/addons/project_caldav/i18n/lv.po b/addons/project_caldav/i18n/lv.po
index 3c150efee01..614a62aa37b 100644
--- a/addons/project_caldav/i18n/lv.po
+++ b/addons/project_caldav/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 18:41+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:23+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_caldav
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index 50784e517f7..99e7cb2ef64 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
msgid "Monthly"
msgstr ""
+#. module: project_caldav
+#: help:project.task,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
#. module: project_caldav
#: selection:project.task,week_list:0
msgid "Sunday"
@@ -86,11 +91,6 @@ msgstr ""
msgid "All Day"
msgstr ""
-#. module: project_caldav
-#: field:project.task,vtimezone:0
-msgid "Timezone"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,show_as:0
msgid "Free"
@@ -121,21 +121,16 @@ msgstr ""
msgid "No Repeat"
msgstr ""
-#. module: project_caldav
-#: view:project.task:0
-msgid "Exclude range"
-msgstr ""
-
-#. module: project_caldav
-#: selection:project.task,freq:0
-msgid "Minutes"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,rrule_type:0
msgid "Yearly"
msgstr ""
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Option"
+msgstr ""
+
#. module: project_caldav
#: field:project.task,tu:0
msgid "Tue"
@@ -146,17 +141,17 @@ msgstr ""
msgid "Repeat Until"
msgstr ""
-#. module: project_caldav
-#: help:project.task,interval:0
-msgid "Repeat every x"
-msgstr ""
-
#. module: project_caldav
#: field:project.task,organizer:0
#: field:project.task,organizer_id:0
msgid "Organizer"
msgstr ""
+#. module: project_caldav
+#: help:project.task,edit_all:0
+msgid "Edit all Occurrences of recurrent Meeting."
+msgstr ""
+
#. module: project_caldav
#: field:project.task,sa:0
msgid "Sat"
@@ -202,11 +197,6 @@ msgstr ""
msgid "Confidential"
msgstr ""
-#. module: project_caldav
-#: selection:project.task,freq:0
-msgid "Seconds"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,freq:0
msgid "Hours"
@@ -227,6 +217,11 @@ msgstr ""
msgid "Thu"
msgstr ""
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat x times"
+msgstr ""
+
#. module: project_caldav
#: selection:project.task,rrule_type:0
msgid "Daily"
@@ -237,6 +232,11 @@ msgstr ""
msgid "Mark as"
msgstr ""
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Repeat"
+msgstr ""
+
#. module: project_caldav
#: help:project.task,rrule_type:0
msgid "Let the event automatically repeat at that interval"
@@ -248,7 +248,7 @@ msgid "First"
msgstr ""
#. module: project_caldav
-#: code:addons/project_caldav/project_caldav.py:0
+#: code:addons/project_caldav/project_caldav.py:67
#, python-format
msgid "Tasks"
msgstr ""
@@ -279,13 +279,8 @@ msgid "CalDAV for task management"
msgstr ""
#. module: project_caldav
-#: view:project.task:0
-msgid "Custom Recurrency Rule"
-msgstr ""
-
-#. module: project_caldav
-#: help:project.task,count:0
-msgid "Repeat max that times"
+#: field:project.task,vtimezone:0
+msgid "Timezone"
msgstr ""
#. module: project_caldav
@@ -294,7 +289,7 @@ msgid "Weekly"
msgstr ""
#. module: project_caldav
-#: view:project.task:0
+#: field:project.task,edit_all:0
msgid "Edit All"
msgstr ""
@@ -363,11 +358,6 @@ msgstr ""
msgid "November"
msgstr ""
-#. module: project_caldav
-#: field:project.task,count:0
-msgid "Count"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,month_list:0
msgid "October"
@@ -388,6 +378,11 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#. module: project_caldav
+#: view:project.task:0
+msgid "Repeat Times"
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
msgid "To"
@@ -403,6 +398,11 @@ msgstr ""
msgid "Frequency"
msgstr ""
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
msgid "of"
@@ -413,6 +413,11 @@ msgstr ""
msgid "Busy"
msgstr ""
+#. module: project_caldav
+#: field:project.task,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
#: field:project.task,rrule_type:0
@@ -424,11 +429,6 @@ msgstr ""
msgid "Thursday"
msgstr ""
-#. module: project_caldav
-#: selection:project.task,rrule_type:0
-msgid "Custom"
-msgstr ""
-
#. module: project_caldav
#: field:project.task,exrule:0
msgid "Exception Rule"
@@ -470,6 +470,11 @@ msgstr ""
msgid "Assign Task"
msgstr ""
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Rule"
+msgstr ""
+
#. module: project_caldav
#: selection:project.task,month_list:0
msgid "February"
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index 9412eeb598a..322dc2b2033 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:42+0000\n"
+"PO-Revision-Date: 2010-12-31 10:32+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
diff --git a/addons/project_gtd/i18n/lv.po b/addons/project_gtd/i18n/lv.po
new file mode 100644
index 00000000000..162b5c40a2b
--- /dev/null
+++ b/addons/project_gtd/i18n/lv.po
@@ -0,0 +1,286 @@
+# Latvian 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2011-01-01 22:09+0000\n"
+"Last-Translator: Vladimirs Kuzmins \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_gtd
+#: help:project.task,timebox_id:0
+msgid "Time-laps during which task has to be treated"
+msgstr "Laika sprīži, kad jātiek galā ar uzdevumu"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_timebox
+msgid "project.gtd.timebox"
+msgstr "project.gtd.timebox"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Reactivate"
+msgstr "Aktivizēt atkal"
+
+#. module: project_gtd
+#: help:project.gtd.timebox,sequence:0
+msgid "Gives the sequence order when displaying a list of timebox."
+msgstr "Attēlo laika sprīžu sarakstu secībā pēc kārtas."
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_travel
+msgid "Travel"
+msgstr "Ceļojumi"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "Timebox Empty Process Completed Successfully."
+msgstr "Laika sprīža iztukšošanas process noslēdzies veiksmīgi."
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#, python-format
+msgid "No timebox child of this one !"
+msgstr "Šim laika sprīdima nav pakarātotā!"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid ""
+"Timeboxes are defined in the \"Getting Things Done\" methodology. It defines "
+"a period of time in order to categorize your tasks: today, this week, this "
+"month, long term."
+msgstr ""
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "GTD"
+msgstr "GTD"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_lt
+msgid "Long Term"
+msgstr "Ilgtermiņa"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_empty
+msgid "Project Timebox Empty"
+msgstr "Projekta laika sprīdis tukšs"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_daily
+msgid "Today"
+msgstr "Šodien"
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+#: field:project.gtd.timebox,name:0
+#: view:project.task:0
+#: field:project.task,timebox_id:0
+msgid "Timebox"
+msgstr "Laika sprīdis"
+
+#. module: project_gtd
+#: model:ir.module.module,shortdesc:project_gtd.module_meta_information
+msgid "Getting Things Done - Time Management Module"
+msgstr "Getting Things Done - Laika vadības modulis"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_to_id:0
+msgid "Set to Timebox"
+msgstr "Iestatīt par laika sprīdi"
+
+#. module: project_gtd
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#, python-format
+msgid "Error !"
+msgstr "Kļūda!"
+
+#. module: project_gtd
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "_Cancel"
+msgstr "_Atcelt"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_empty
+#: view:project.timebox.empty:0
+msgid "Empty Timebox"
+msgstr "Iztīrīt laika sprīdi"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
+msgstr "Šajā nedēļā"
+
+#. module: project_gtd
+#: model:project.gtd.timebox,name:project_gtd.timebox_monthly
+msgid "This Month"
+msgstr "Šajā mēnesī"
+
+#. module: project_gtd
+#: field:project.gtd.timebox,icon:0
+msgid "Icon"
+msgstr "Ikona"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
+msgid "Project Timebox Fill"
+msgstr "Projekta laika sprīža aizpildīšana"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_gtd
+#: view:project.timebox.fill.plan:0
+msgid "Add to Timebox"
+msgstr "Pievienot laika sprīdīm"
+
+#. module: project_gtd
+#: field:project.timebox.empty,name:0
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
+msgid "Contexts"
+msgstr "Konteksts"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_car
+msgid "Car"
+msgstr "Mašīna"
+
+#. module: project_gtd
+#: model:ir.module.module,description:project_gtd.module_meta_information
+msgid ""
+"\n"
+"This module implements all concepts defined by the Getting Things Done\n"
+"methodology. This world-wide used methodology is used for personal\n"
+"time management improvement.\n"
+"\n"
+"Getting Things Done (commonly abbreviated as GTD) is an action management\n"
+"method created by David Allen, and described in a book of the same name.\n"
+"\n"
+"GTD rests on the principle that a person needs to move tasks out of the mind "
+"by\n"
+"recording them externally. That way, the mind is freed from the job of\n"
+"remembering everything that needs to be done, and can concentrate on "
+"actually\n"
+"performing those tasks.\n"
+" "
+msgstr ""
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
+#: view:project.timebox.fill.plan:0
+msgid "Plannify Timebox"
+msgstr "Plānot laika sprīdi"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
+#: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_timeboxes
+#: view:project.gtd.timebox:0
+msgid "Timeboxes"
+msgstr "Laika sprīži"
+
+#. module: project_gtd
+#: model:ir.model,name:project_gtd.model_project_gtd_context
+#: view:project.gtd.context:0
+#: field:project.gtd.context,name:0
+#: field:project.task,context_id:0
+msgid "Context"
+msgstr "Konteksts"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Next"
+msgstr "Nākamais"
+
+#. module: project_gtd
+#: view:project.timebox.empty:0
+msgid "_Ok"
+msgstr "_Labi"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "Getting Things Done"
+msgstr "Getting Things Done"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_office
+msgid "Office"
+msgstr "Birojs"
+
+#. module: project_gtd
+#: field:project.gtd.context,sequence:0
+#: field:project.gtd.timebox,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid ""
+"Contexts are defined in the \"Getting Things Done\" methodology. It allows "
+"you to categorize your tasks according to the context in which they have to "
+"be done: at office, at home, when I take my car, etc."
+msgstr ""
+
+#. module: project_gtd
+#: help:project.gtd.context,sequence:0
+msgid "Gives the sequence order when displaying a list of contexts."
+msgstr "Attēlo kontekstu sarakstu secībā pēc kārtas."
+
+#. module: project_gtd
+#: view:project.gtd.timebox:0
+msgid "Timebox Definition"
+msgstr "Laika sprīža definīcija"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,task_ids:0
+msgid "Tasks selection"
+msgstr "Uzdevumu izvēlēšanās"
+
+#. module: project_gtd
+#: code:addons/project_gtd/project_gtd.py:0
+#, python-format
+msgid "Inbox"
+msgstr "Ienākošie"
+
+#. module: project_gtd
+#: field:project.timebox.fill.plan,timebox_id:0
+msgid "Get from Timebox"
+msgstr "Paņemt no laika sprīža"
+
+#. module: project_gtd
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
+msgstr "Konteksta vieta, kur lietotājam jātiek galā ar uzdevumu"
+
+#. module: project_gtd
+#: model:project.gtd.context,name:project_gtd.context_home
+msgid "Home"
+msgstr "Mājas"
+
+#. module: project_gtd
+#: view:project.task:0
+msgid "Previous"
+msgstr "Iepriekšējais"
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index 926df07cbde..d50deaa3d6a 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,18 +46,13 @@ msgid "Timebox Empty Process Completed Successfully."
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
#, python-format
msgid "No timebox child of this one !"
msgstr ""
#. module: project_gtd
-#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
-msgid "Timeboxes are defined in the \"Getting Things Done\" methodology. It defines a period of time in order to categorize your tasks: today, this week, this month, long term."
-msgstr ""
-
-#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:112
#, python-format
msgid "GTD"
msgstr ""
@@ -96,7 +91,7 @@ msgid "Set to Timebox"
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
#, python-format
msgid "Error !"
msgstr ""
@@ -117,6 +112,11 @@ msgstr ""
msgid "Empty Timebox"
msgstr ""
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid "Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term."
+msgstr ""
+
#. module: project_gtd
#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
msgid "This Week"
@@ -212,7 +212,7 @@ msgid "_Ok"
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:110
#, python-format
msgid "Getting Things Done"
msgstr ""
@@ -228,11 +228,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: project_gtd
-#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
-msgid "Contexts are defined in the \"Getting Things Done\" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc."
-msgstr ""
-
#. module: project_gtd
#: help:project.gtd.context,sequence:0
msgid "Gives the sequence order when displaying a list of contexts."
@@ -249,7 +244,7 @@ msgid "Tasks selection"
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:111
#, python-format
msgid "Inbox"
msgstr ""
@@ -269,6 +264,11 @@ msgstr ""
msgid "Home"
msgstr ""
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid "Contexts are defined in the \"Getting Things Done\" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc."
+msgstr ""
+
#. module: project_gtd
#: view:project.task:0
msgid "Previous"
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index d7200cc7636..c339a0a6d01 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:43+0000\n"
+"PO-Revision-Date: 2010-12-31 10:25+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 7cde11a1d5f..852d9802d9e 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 10:01+0000\n"
+"PO-Revision-Date: 2010-12-31 10:26+0000\n"
"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 81d90de9a1e..e1058f16d04 100644
--- a/addons/project_issue/i18n/lv.po
+++ b/addons/project_issue/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 18:19+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:59+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 93a06e9e31c..1dae8050454 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgid "Days to Open"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:360
#, python-format
msgid "You cannot escalate this issue.\n"
"The relevant Project has not configured the Escalation Project!"
@@ -154,7 +154,7 @@ msgid "Cancelled"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:360
#, python-format
msgid "Warning !"
msgstr ""
@@ -203,7 +203,7 @@ msgid "Partner"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:464
#, python-format
msgid " (copy)"
msgstr ""
@@ -213,11 +213,6 @@ msgstr ""
msgid "Previous"
msgstr ""
-#. module: project_issue
-#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
-msgid "Issues such as system bugs, client complains, material breakdowns are collected here. You can define the stages assigned to the resolution of the issue on the project. (analysis, development, done) Using the mailgateway module, the issues can be integrated to an email address (example: support@mycompany.com)"
-msgstr ""
-
#. module: project_issue
#: view:project.issue:0
msgid "Statistics"
@@ -404,7 +399,7 @@ msgid "You can use the issues tracker in OpenERP to handle bugs in the software
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:283
#, python-format
msgid "Tasks"
msgstr ""
@@ -447,7 +442,7 @@ msgid "project.issue.report"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:362
#: view:project.issue:0
#, python-format
msgid "Escalate"
@@ -738,6 +733,11 @@ msgstr ""
msgid "Current"
msgstr ""
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid "Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+
#. module: project_issue
#: view:project.issue:0
msgid "Details"
@@ -815,7 +815,7 @@ msgid "February"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:61
#, python-format
msgid "Issue '%s' has been opened."
msgstr ""
@@ -841,7 +841,7 @@ msgid "Month-1"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:76
#, python-format
msgid "Issue '%s' has been closed."
msgstr ""
@@ -867,7 +867,7 @@ msgid "ID"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:377
#, python-format
msgid "No Title"
msgstr ""
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index 7c0763684e5..c6a461a8055 100644
--- a/addons/project_issue_sheet/i18n/fr.po
+++ b/addons/project_issue_sheet/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 07:36+0000\n"
-"Last-Translator: Aline (OpenERP) \n"
+"PO-Revision-Date: 2010-12-31 11:01+0000\n"
+"Last-Translator: OpenERP Administrators \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-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/lv.po b/addons/project_issue_sheet/i18n/lv.po
index 5389270f7c6..2b2da0f8ca3 100644
--- a/addons/project_issue_sheet/i18n/lv.po
+++ b/addons/project_issue_sheet/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 18:43+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:58+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 9b903251abe..657e79b7e2a 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index d61ad1f0227..9c4a72f7a7c 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:18+0000\n"
+"PO-Revision-Date: 2010-12-31 14:22+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_long_term
@@ -187,7 +187,8 @@ msgstr "Ende Datum"
#. module: project_long_term
#: help:project.phase,date_end:0
-msgid "It's computed by the scheduler according to the start date and the duration.
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
msgstr "Ende Datum d. Phase"
#. module: project_long_term
@@ -540,7 +541,10 @@ msgstr "Phase"
#. module: project_long_term
#: help:project.phase,date_start:0
-msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
msgstr "Beginn der Phase"
#. module: project_long_term
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index 2e961b5d93f..97294142262 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 09:54+0000\n"
+"PO-Revision-Date: 2010-12-31 10:23+0000\n"
"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_long_term
@@ -167,8 +167,9 @@ msgstr "Fecha de fin"
#. module: project_long_term
#: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
-msgstr "Fecha de fin de la fase"
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
@@ -507,7 +508,10 @@ msgstr "Fase"
#. module: project_long_term
#: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
msgstr ""
#. module: project_long_term
@@ -614,3 +618,6 @@ msgstr "Por defecto en días"
#: field:project.phase,duration:0
msgid "Duration"
msgstr "Duración"
+
+#~ msgid "Ending Date of the phase"
+#~ msgstr "Fecha de fin de la fase"
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index b66650adf71..3b7d111daac 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-24 22:25+0000\n"
+"PO-Revision-Date: 2010-12-31 11:08+0000\n"
"Last-Translator: lolivier \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-12-25 04:52+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_long_term
@@ -164,7 +164,8 @@ msgstr "Date de fin"
#. module: project_long_term
#: help:project.phase,date_end:0
-msgid "It's computed by the scheduler according to the start date and the duration."
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
msgstr "Date de fin de la phase"
#. module: project_long_term
@@ -518,7 +519,10 @@ msgstr "Phase"
#. module: project_long_term
#: help:project.phase,date_start:0
-msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
msgstr "Date de début de la phase"
#. module: project_long_term
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 276527c2e23..508efda1634 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 22:20+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:24+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_long_term
@@ -165,8 +165,9 @@ msgstr "Beigu Datums"
#. module: project_long_term
#: help:project.phase,date_end:0
-msgid "Ending Date of the phase"
-msgstr "Fāzes beigu datums"
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
+msgstr ""
#. module: project_long_term
#: view:project.phase:0
@@ -504,8 +505,11 @@ msgstr "Fāze"
#. module: project_long_term
#: help:project.phase,date_start:0
-msgid "Starting Date of the phase"
-msgstr "Fāzes sākuma datums"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
+msgstr ""
#. module: project_long_term
#: help:project.phase,state:0
@@ -611,3 +615,9 @@ msgstr "Pēc noklusējuma dienās"
#: field:project.phase,duration:0
msgid "Duration"
msgstr "Ilgums"
+
+#~ msgid "Ending Date of the phase"
+#~ msgstr "Fāzes beigu datums"
+
+#~ msgid "Starting Date of the phase"
+#~ msgstr "Fāzes sākuma datums"
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index 85f801f47ec..7f9ba5b37ef 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-11-05 09:42+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-31 11:08+0000\n"
+"Last-Translator: Sbh (Open ERP) \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_long_term
@@ -165,7 +165,8 @@ msgstr "Data końcowa"
#. module: project_long_term
#: help:project.phase,date_end:0
-msgid "It's computed by the scheduler according to the start date and the duration."
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
msgstr "Końcowa data fazy"
#. module: project_long_term
@@ -505,8 +506,11 @@ msgstr "Faza"
#. module: project_long_term
#: help:project.phase,date_start:0
-msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phasesStarting Date of the phase"
-msgstr "Data rozpoczęcia fazy"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
+msgstr ""
#. module: project_long_term
#: help:project.phase,state:0
@@ -641,3 +645,9 @@ msgstr "Czas trwania"
#~ msgstr ""
#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
#~ "specjalnych !"
+
+#~ msgid ""
+#~ "It's computed according to the phases order : the start date of the 1st "
+#~ "phase is set by you while the other start dates depend on the end date of "
+#~ "their previous phasesStarting Date of the phase"
+#~ msgstr "Data rozpoczęcia fazy"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index c6090f8fce5..cfacf155fc5 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,6 +57,11 @@ msgstr ""
msgid "Resources Allocation"
msgstr ""
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr ""
+
#. module: project_long_term
#: field:project.compute.phases,target_project:0
msgid "Schedule"
@@ -94,7 +99,7 @@ msgid "Error! You cannot assign escalation to the same project!"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:130
#, python-format
msgid "Day"
msgstr ""
@@ -120,6 +125,17 @@ msgstr ""
msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
msgstr ""
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:489
+#, python-format
+msgid "Resources should be allocated to your phases and Members should be assigned to your Project!"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid " It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+
#. module: project_long_term
#: model:ir.model,name:project_long_term.model_project_project
#: field:project.compute.phases,project_id:0
@@ -133,7 +149,7 @@ msgid "Project"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
#, python-format
msgid "Error!"
msgstr ""
@@ -144,7 +160,7 @@ msgid "Cancelled"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:426
#, python-format
msgid "No tasks to compute for Project '%s'."
msgstr ""
@@ -154,11 +170,6 @@ msgstr ""
msgid "Ending Date"
msgstr ""
-#. module: project_long_term
-#: help:project.phase,date_end:0
-msgid "It's computed by the scheduler according to the start date and the duration."
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
msgid "Planning"
@@ -182,12 +193,13 @@ msgid "Compute Phase Scheduling"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:192
#, python-format
msgid " (copy)"
msgstr ""
#. module: project_long_term
+#: view:project.phase:0
#: view:project.resource.allocation:0
#: field:project.resource.allocation,useability:0
msgid "Availability"
@@ -292,6 +304,11 @@ msgstr ""
msgid "_Ok"
msgstr ""
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
msgid "Month"
@@ -307,6 +324,11 @@ msgstr ""
msgid "project.schedule.tasks"
msgstr ""
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on the project."
+msgstr ""
+
#. module: project_long_term
#: field:project.phase,date_start:0
#: field:project.resource.allocation,date_start:0
@@ -329,11 +351,6 @@ msgstr ""
msgid "Draft"
msgstr ""
-#. module: project_long_term
-#: model:ir.actions.act_window,help:project_long_term.act_project_phase
-msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it."
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
#: selection:project.phase,state:0
@@ -350,6 +367,11 @@ msgstr ""
msgid "User"
msgstr ""
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
msgid "Task Detail"
@@ -366,29 +388,23 @@ msgid "Project Compute Tasks"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:244
#, python-format
msgid "No responsible person assigned !"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:489
#, python-format
msgid "Error"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:244
#, python-format
msgid "You must assign a responsible person for phase '%s' !"
msgstr ""
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
-#, python-format
-msgid "Should have Resources Allocation or Project Members!"
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
msgid "Constraints"
@@ -431,11 +447,6 @@ msgstr ""
msgid "Remaining Hours"
msgstr ""
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Other Info"
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,responsible_id:0
@@ -458,7 +469,7 @@ msgid "Start Phase"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
#, python-format
msgid "Please Specify Project to be schedule"
msgstr ""
@@ -484,11 +495,6 @@ msgstr ""
msgid "Phase"
msgstr ""
-#. module: project_long_term
-#: help:project.phase,date_start:0
-msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
-msgstr ""
-
#. module: project_long_term
#: help:project.phase,state:0
msgid "If the phase is created the state 'Draft'.\n"
@@ -514,6 +520,11 @@ msgstr ""
msgid "Name"
msgstr ""
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr ""
+
#. module: project_long_term
#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
msgid "Working Period"
@@ -526,12 +537,11 @@ msgstr ""
#. module: project_long_term
#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-#: view:project.phase:0
msgid "Scheduling"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:329
#, python-format
msgid "No tasks to compute for Phase '%s'."
msgstr ""
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 3ca11d8d557..2d24cac1e7a 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-12 09:19+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-12-31 11:07+0000\n"
+"Last-Translator: Sbh (Open ERP) \n"
"Language-Team: Portuguese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:57+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_long_term
@@ -165,7 +165,8 @@ msgstr "Data de fim"
#. module: project_long_term
#: help:project.phase,date_end:0
-msgid "It's computed by the scheduler according to the start date and the duration."
+msgid ""
+"It's computed by the scheduler according to the start date and the duration."
msgstr "Data de fim da fase"
#. module: project_long_term
@@ -504,7 +505,10 @@ msgstr "Fase"
#. module: project_long_term
#: help:project.phase,date_start:0
-msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgid ""
+"It's computed according to the phases order : the start date of the 1st "
+"phase is set by you while the other start dates depend on the end date of "
+"their previous phases"
msgstr "Data de início da fase"
#. module: project_long_term
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index c8dbcdf0dcd..45d75b16b05 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -19,7 +19,7 @@
#
##############################################################################
-from datetime import datetime
+from datetime import datetime, timedelta
from dateutil.relativedelta import relativedelta
from tools.translate import _
from osv import fields, osv
@@ -246,8 +246,10 @@ class project_phase(osv.osv):
if not start_date:
start_date = phase.project_id.date_start or phase.date_start or datetime.now().strftime("%Y-%m-%d")
start_date = datetime.strftime((datetime.strptime(start_date, "%Y-%m-%d")), "%Y-%m-%d")
- phase_resource_obj = resource_pool.generate_resources(cr, uid, [phase.responsible_id.id], calendar_id, context=context)
+ phase_resource_obj = self.generate_resources(cr, uid, [phase.id], context=context)[phase.id]
avg_days = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration, day_uom_id)
+ if not phase_resource_obj: #TOCHECK: why need this ?
+ avg_days = avg_days - 1
duration = str(avg_days) + 'd'
# Create a new project for each phase
def Project():
@@ -295,10 +297,10 @@ class project_phase(osv.osv):
'date_end': end_date.strftime('%Y-%m-%d')
}, context=ctx)
# Recursive call till all the next phases scheduled
- for phase in phase.next_phase_ids:
- if phase.state in ['draft', 'open', 'pending']:
- id_cal = phase.project_id.resource_calendar_id and phase.project_id.resource_calendar_id.id or False
- self.generate_schedule(cr, uid, [phase.id], date_start, id_cal, context=context)
+ for next_phase in phase.next_phase_ids:
+ if next_phase.state in ['draft', 'open', 'pending']:
+ id_cal = next_phase.project_id.resource_calendar_id and next_phase.project_id.resource_calendar_id.id or False
+ self.generate_schedule(cr, uid, [next_phase.id], date_start+timedelta(days=1), id_cal, context=context)
else:
continue
return True
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7eaed6e120c..61e0a7dd7f9 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -190,14 +190,14 @@
-
+
-
+
diff --git a/addons/project_mailgate/i18n/de.po b/addons/project_mailgate/i18n/de.po
index 0bec9b7e97a..a0f821fbe21 100644
--- a/addons/project_mailgate/i18n/de.po
+++ b/addons/project_mailgate/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:44+0000\n"
+"PO-Revision-Date: 2010-12-31 10:37+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mailgate
diff --git a/addons/project_mailgate/i18n/lv.po b/addons/project_mailgate/i18n/lv.po
index 506f8fdd383..89e69f4a559 100644
--- a/addons/project_mailgate/i18n/lv.po
+++ b/addons/project_mailgate/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:28+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:38+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mailgate
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
index 69d0149689a..b19f8349cd8 100644
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ b/addons/project_mailgate/i18n/project_mailgate.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgid "Messages"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:123
#, python-format
msgid "Draft"
msgstr ""
@@ -66,25 +66,25 @@ msgid "Details"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:149
#, python-format
msgid "Cancel"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:143
#, python-format
msgid "Done"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:129
#, python-format
msgid "Open"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:135
#, python-format
msgid "Pending"
msgstr ""
diff --git a/addons/project_messages/i18n/de.po b/addons/project_messages/i18n/de.po
index 6611a5d0347..08b03bcf4be 100644
--- a/addons/project_messages/i18n/de.po
+++ b/addons/project_messages/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:44+0000\n"
+"PO-Revision-Date: 2010-12-31 10:23+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_messages
diff --git a/addons/project_messages/i18n/lv.po b/addons/project_messages/i18n/lv.po
index f5cc64942ab..8c0e5fead5b 100644
--- a/addons/project_messages/i18n/lv.po
+++ b/addons/project_messages/i18n/lv.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-30 23:31+0000\n"
-"Last-Translator: Vladimirs Kuzmins \n"
+"PO-Revision-Date: 2010-12-31 10:25+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_messages
diff --git a/addons/project_messages/i18n/project_messages.pot b/addons/project_messages/i18n/project_messages.pot
index ffdf87d8d0a..1b9f7e2dffb 100644
--- a/addons/project_messages/i18n/project_messages.pot
+++ b/addons/project_messages/i18n/project_messages.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgid "Communication Messages"
msgstr ""
#. module: project_messages
-#: help:project.messages,to_id:0
-msgid "Keep this empty to broadcast the message."
+#: view:project.messages:0
+msgid "Group By..."
msgstr ""
#. module: project_messages
@@ -52,8 +52,8 @@ msgid "Today"
msgstr ""
#. module: project_messages
-#: model:ir.actions.act_window,help:project_messages.messages_form
-msgid "An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis."
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
msgstr ""
#. module: project_messages
@@ -73,8 +73,8 @@ msgid "Project"
msgstr ""
#. module: project_messages
-#: view:project.messages:0
-msgid "Group By..."
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid "An in-project messaging system allows for an efficient and trackable communication between project members. The messages are stored in the system and can be used for post analysis."
msgstr ""
#. module: project_messages
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index abaea45ae51..315d6313365 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:44+0000\n"
-"PO-Revision-Date: 2010-12-29 08:54+0000\n"
+"PO-Revision-Date: 2010-12-31 10:39+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
diff --git a/addons/project_mrp/i18n/lv.po b/addons/project_mrp/i18n/lv.po
new file mode 100644
index 00000000000..b90f62cde33
--- /dev/null
+++ b/addons/project_mrp/i18n/lv.po
@@ -0,0 +1,134 @@
+# Latvian 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: 2010-12-21 19:44+0000\n"
+"PO-Revision-Date: 2011-01-01 22:15+0000\n"
+"Last-Translator: Vladimirs Kuzmins \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_procuretasktask0
+msgid "For each product, on type service and on order"
+msgstr "Katram produktam uz tipu pakalpojumus un pasūtījumu"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_procuretask0
+msgid "Procurement Task"
+msgstr "Sagādes uzdevums"
+
+#. module: project_mrp
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
+msgstr "Sagādes un projektu vadības integrācija"
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_createtask0
+msgid "Product type is service, then its creates the task."
+msgstr "Produkta tips ir pakalpojums, tad tas veido uzdevumu."
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_procuretask0
+msgid "if product type is 'service' then it creates the task."
+msgstr "Produkta tips ir pakalpojums, tad tas veido uzdevumu."
+
+#. module: project_mrp
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_product_product
+msgid "Product"
+msgstr "Produkts"
+
+#. module: project_mrp
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Kļūda: nederīgs EAN kods"
+
+#. module: project_mrp
+#: field:product.product,project_id:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_procurement_order
+#: field:project.task,procurement_id:0
+msgid "Procurement"
+msgstr "Sagāde"
+
+#. module: project_mrp
+#: model:ir.model,name:project_mrp.model_project_task
+#: model:process.node,name:project_mrp.process_node_mrptask0
+#: model:process.node,name:project_mrp.process_node_procuretasktask0
+#: field:procurement.order,task_id:0
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
+msgstr "Ir izveidots uzdevums, lai nodrošinātu pakalpojumu."
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_ordertask0
+msgid "Order Task"
+msgstr "Pasūtījuma uzdevums"
+
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sale Order Task"
+msgstr "Klienta pasūtījuma uzdevums"
+
+#. module: project_mrp
+#: model:process.transition,name:project_mrp.process_transition_createtask0
+msgid "Create Task"
+msgstr "Izveidot uzdevumu"
+
+#. module: project_mrp
+#: model:ir.module.module,description:project_mrp.module_meta_information
+msgid ""
+"\n"
+"This module creates a link between procurement orders\n"
+"containing \"service\" lines and project management tasks.\n"
+"\n"
+"When installed, this module will automatically create a new task\n"
+"for each procurement order line, when the corresponding product\n"
+"meets the following characteristics:\n"
+" * Type = Service\n"
+" * Procurement method (Order fulfillment) = MTO (make to order)\n"
+" * Supply/Procurement method = Produce\n"
+"\n"
+"The new task is created outside of any existing project, but\n"
+"can be added to a project manually.\n"
+"\n"
+"When the project task is completed or cancelled, the workflow of the "
+"corresponding\n"
+"procurement line is updated accordingly.\n"
+"\n"
+"This module is useful to be able to invoice services based on tasks\n"
+"automatically created via sale orders.\n"
+"\n"
+msgstr ""
+
+#. module: project_mrp
+#: model:process.transition,note:project_mrp.process_transition_ordertask0
+msgid "If procurement method is Make to order and supply method is produce"
+msgstr ""
+"Ja sagādes metode ir veidot uz pasūtījuma un piegādes metode ir ražot"
+
+#. module: project_mrp
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sale order"
+msgstr "Gadījumā, ja tiek pārdoti pakalpojumi uz klientu pasūtījumu"
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index bad17ead34f..0e2da82a283 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_planning/i18n/lv.po b/addons/project_planning/i18n/lv.po
new file mode 100644
index 00000000000..37f69da8f05
--- /dev/null
+++ b/addons/project_planning/i18n/lv.po
@@ -0,0 +1,571 @@
+# Latvian 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: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2010-12-31 09:34+0000\n"
+"Last-Translator: Vladimirs Kuzmins \n"
+"Language-Team: Latvian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,tasks:0
+#: help:report_account_analytic.planning.user,tasks:0
+msgid ""
+"This value is given by the sum of work remaining to do on the task for this "
+"planning, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_stat_form
+#: model:ir.ui.menu,name:project_planning.menu_board_planning
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning_stat
+msgid "Planning Statistics"
+msgstr "Plānošanas statistika"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_line
+#: view:report_account_analytic.planning.line:0
+msgid "Planning Line"
+msgstr "Plānošanas rinda"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Unallocated Time"
+msgstr "Neiedalītais laiks kopā"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,name:0
+msgid "Planning Name"
+msgstr "Plānošanas nosaukums"
+
+#. module: project_planning
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
+
+#. module: project_planning
+#: view:board.board:0
+msgid "My Project's planning"
+msgstr "Manu projektu plānošanas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,timesheet:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,sum_amount_real:0
+#: field:report_account_analytic.planning.user,timesheet:0
+msgid "Timesheet"
+msgstr "Darba laika uzskaites Tabele"
+
+#. module: project_planning
+#: model:ir.module.module,shortdesc:project_planning.module_meta_information
+msgid "Planning Management Module"
+msgstr "Plānošanas vadības modulis"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,account_id:0
+msgid "Account"
+msgstr "Konts"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_project_task
+msgid "Task"
+msgstr "Uzdevums"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Notes"
+msgstr "Piezīmes"
+
+#. module: project_planning
+#: field:account.analytic.account,planning_ids:0
+#: model:ir.actions.act_window,name:project_planning.action_account_analytic_planning_form
+#: model:ir.ui.menu,name:project_planning.menu_report_account_analytic_planning
+msgid "Plannings"
+msgstr "Plānošanas"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Project"
+msgstr "Projekts"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Start Task"
+msgstr "Sākt Uzdevumu"
+
+#. module: project_planning
+#: selection:report_account_analytic.planning,state:0
+msgid "Cancelled"
+msgstr "Atcelts"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+#: view:report_account_analytic.planning.line:0
+msgid "Total Planned (in Days)"
+msgstr "Plānots kopā (dienās)"
+
+#. module: project_planning
+#: constraint:report_account_analytic.planning:0
+msgid ""
+"Invalid planning ! Planning dates can't overlap for the same responsible. "
+msgstr ""
+"Nekorekta plānošana! Plānotas dienas nedrīkst pārklāties vienam "
+"atbildīgajām. "
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_account:0
+msgid "Planning By Account"
+msgstr "Plānošana pēc konta"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Time without"
+msgstr "Laiks bez"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Current Plannings"
+msgstr "Aktīvas plānošanas"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reset to Draft"
+msgstr "Atstatīt uz melnrakstu"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Extra Info"
+msgstr "Papildus Info"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr "Plānots kopā"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,timesheet:0
+#: help:report_account_analytic.planning.user,timesheet:0
+msgid ""
+"This value is given by the sum of all work encoded in the timesheet(s) "
+"between the 'Date From' and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Kļūda! Nedrīkst veidot rekursīvus analītiskos kontus"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_open:0
+#: field:report_account_analytic.planning.user,plan_open:0
+msgid "Time Allocation without Tasks"
+msgstr "Laika iedalīšana bez uzdevumiem"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From"
+msgstr "No"
+
+#. module: project_planning
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,account_id:0
+#: field:report_account_analytic.planning.line,account_id:0
+msgid "Analytic account"
+msgstr "Analītiskais konts"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to FALSE, expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Miscelleanous"
+msgstr "Dažādi"
+
+#. module: project_planning
+#: help:res.company,planning_time_mode_id:0
+msgid "This will set the unit of measure used in plannings."
+msgstr "Šis iestatīts mērvienību, ko lietos plānošanā."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "HR Planning"
+msgstr "HR plānošana"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,tasks:0
+#: field:report_account_analytic.planning.user,tasks:0
+msgid "Remaining Tasks"
+msgstr "Atlikušie uzdevumi"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: model:ir.actions.report.xml,name:project_planning.report_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning
+#: model:ir.ui.menu,name:project_planning.next_id_85
+#: field:project.task,planning_line_id:0
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.account,planning_id:0
+#: field:report_account_analytic.planning.line,planning_id:0
+#: field:report_account_analytic.planning.stat,planning_id:0
+#: field:report_account_analytic.planning.user,planning_id:0
+msgid "Planning"
+msgstr "Plānošana"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Time Encoding"
+msgstr "Laika kodēšana"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,free:0
+msgid "Unallocated Time"
+msgstr "Neiedalīts laiks"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
+#: view:report_account_analytic.planning:0
+msgid "Planning by Account"
+msgstr "Plānošana pēc konta"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_open:0
+msgid ""
+"This value is given by the sum of time allocation without task(s) linked, "
+"expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Delegate"
+msgstr "Deleģēt"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
+msgstr "Plānošanas anlīze"
+
+#. module: project_planning
+#: help:report_account_analytic.planning,business_days:0
+msgid ""
+"Set here the number of working days within this planning for one person full "
+"time"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,planning_user_ids:0
+msgid "Planning By User"
+msgstr "Plānošana pēc lietotāja"
+
+#. module: project_planning
+#: model:ir.actions.act_window,name:project_planning.act_task_of_lines
+#: view:report_account_analytic.planning:0
+#: field:report_account_analytic.planning.stat,sum_amount_tasks:0
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By Account (in Days)"
+msgstr "Plānošana pēc konta (dienās)"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
+msgstr "Sākuma datums"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total Planned Tasks"
+msgstr "Plānotie uzdevumi kopā"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,total_free:0
+msgid "Total Free"
+msgstr "Brīvs kopā"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.account,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with the checkbox "
+"'Assigned in Taks' set to TRUE expressed in days."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "tasks"
+msgstr "uzdevumi"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,free:0
+msgid ""
+"Computed as Business Days - (Time Allocation of Tasks + Time Allocation "
+"without Tasks + Holiday Leaves)"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_unit:0
+msgid "Qty UoM"
+msgstr "Daudz. mērv."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,note:0
+msgid "Note"
+msgstr "Piezīme"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Draft"
+msgstr "Melnraksts"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
+msgstr "Plānošanas rindas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Pending"
+msgstr "Neizlemts"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,sum_amount:0
+msgid "Planned Days"
+msgstr "Plānotas dienas"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,state:0
+msgid "Status"
+msgstr "Statuss"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,holiday:0
+msgid ""
+"This value is given by the total of validated leaves into the 'Date From' "
+"and 'Date To' of the planning."
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,user_id:0
+#: report:report_account_analytic.planning.print:0
+#: field:report_account_analytic.planning.stat,user_id:0
+#: field:report_account_analytic.planning.user,user_id:0
+msgid "User"
+msgstr "Lietotājs"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Remaining Tasks"
+msgstr "Atlikušie uzdevumi kopā"
+
+#. module: project_planning
+#: model:ir.module.module,description:project_planning.module_meta_information
+msgid ""
+"\n"
+"This module helps you to manage your plannings.\n"
+"\n"
+"This module is based on the analytic accounting and is totally integrated "
+"with\n"
+"* the timesheets encoding\n"
+"* the holidays management\n"
+"* the project management\n"
+"\n"
+"So that, each department manager can know if someone in his team has still "
+"unallocated time for a given planning (taking in consideration the validated "
+"leaves) or if he still needs to encode tasks.\n"
+"\n"
+"At the end of the month, the planning manager can also check if the encoded "
+"timesheets are respecting the planned time on each analytic account.\n"
+msgstr ""
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_res_company
+msgid "Companies"
+msgstr "Uzņēmumi"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount_in_base_uom:0
+msgid "Quantity in base uom"
+msgstr "Daudzums bāzes mērv."
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,plan_tasks:0
+msgid "Time Planned on Tasks"
+msgstr "Plānotais laiks uz uzdevumiem"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,amount:0
+msgid "Quantity"
+msgstr "Daudzums"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,code:0
+msgid "Code"
+msgstr "Kods"
+
+#. module: project_planning
+#: view:account.analytic.account:0
+#: field:report_account_analytic.planning,line_ids:0
+msgid "Planning lines"
+msgstr "Plānošanas rindas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Planning By User (in Days)"
+msgstr "Plānošana pēc lietotāja (dienās)"
+
+#. module: project_planning
+#: view:report_account_analytic.planning.stat:0
+msgid "Planning statistics"
+msgstr "Plānošanas statistika"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+#: selection:report_account_analytic.planning,state:0
+msgid "Open"
+msgstr "Atvērts"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_user
+#: view:report_account_analytic.planning:0
+msgid "Planning by User"
+msgstr "Plānošana pēc lietotāja"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Information"
+msgstr "Informācija"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,business_days:0
+msgid "Business Days"
+msgstr "Darba dienas"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Reactivate"
+msgstr "Aktivizēt atkal"
+
+#. module: project_planning
+#: field:report_account_analytic.planning,user_id:0
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible"
+msgstr "Atbildīgais"
+
+#. module: project_planning
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_stat
+msgid "Planning stat"
+msgstr "Plānošanas stat."
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "To"
+msgstr "Līdz"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.account,plan_tasks:0
+msgid "Time Allocation of Tasks"
+msgstr "Uzdevumu laika iedalīšana"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by user"
+msgstr "Kopsavilkums pēc lietotāja"
+
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid ""
+"With its commun system for scheduling all resources of a company (people and "
+"materials), OpenERP allows you to encode then compute automatically tasks "
+"and phases scheduling, track resources allocation and availibility."
+msgstr ""
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation without Tasks"
+msgstr "Laika iedalīšana bez uzdevumiem kopā"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.user,holiday:0
+msgid "Leaves"
+msgstr "Prombūtne"
+
+#. module: project_planning
+#: view:report_account_analytic.planning:0
+msgid "Total Time Allocation of Tasks"
+msgstr ""
+
+#. module: project_planning
+#: field:report_account_analytic.planning,date_to:0
+msgid "End Date"
+msgstr "Beigu datums"
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Remaining tasks"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Summary by project"
+msgstr "Kopsavilkums pēc projekta"
+
+#. module: project_planning
+#: field:res.company,planning_time_mode_id:0
+msgid "Planning Time Unit"
+msgstr "Plānošanas laika vienība"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.line,task_ids:0
+msgid "Planning Tasks"
+msgstr "Plānošanas uzdevumi"
+
+#. module: project_planning
+#: field:report_account_analytic.planning.stat,manager_id:0
+msgid "Manager"
+msgstr "Vadītājs"
+
+#. module: project_planning
+#: help:report_account_analytic.planning.user,plan_tasks:0
+msgid ""
+"This value is given by the sum of time allocation with task(s) linked, "
+"expressed in days."
+msgstr ""
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
index 22bd2ef0e20..0f9639b6939 100644
--- a/addons/project_planning/i18n/project_planning.pot
+++ b/addons/project_planning/i18n/project_planning.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
#. module: project_planning
#: help:report_account_analytic.planning.account,tasks:0
#: help:report_account_analytic.planning.user,tasks:0
@@ -67,6 +72,16 @@ msgstr ""
msgid "Planning Management Module"
msgstr ""
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid "With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr ""
+
#. module: project_planning
#: field:report_account_analytic.planning.stat,account_id:0
msgid "Account"
@@ -123,11 +138,6 @@ msgstr ""
msgid "Planning By Account"
msgstr ""
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without"
-msgstr ""
-
#. module: project_planning
#: view:report_account_analytic.planning:0
msgid "Current Plannings"
@@ -149,8 +159,8 @@ msgid "Extra Info"
msgstr ""
#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
msgstr ""
#. module: project_planning
@@ -171,8 +181,9 @@ msgid "Time Allocation without Tasks"
msgstr ""
#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From"
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
msgstr ""
#. module: project_planning
@@ -226,6 +237,11 @@ msgstr ""
msgid "Planning"
msgstr ""
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr ""
+
#. module: project_planning
#: view:report_account_analytic.planning:0
msgid "Time Encoding"
@@ -236,12 +252,6 @@ msgstr ""
msgid "Unallocated Time"
msgstr ""
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
#. module: project_planning
#: help:report_account_analytic.planning.user,plan_open:0
msgid "This value is given by the sum of time allocation without task(s) linked, expressed in days."
@@ -253,8 +263,8 @@ msgid "Delegate"
msgstr ""
#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
+#: help:report_account_analytic.planning.user,free:0
+msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
msgstr ""
#. module: project_planning
@@ -262,6 +272,16 @@ msgstr ""
msgid "Set here the number of working days within this planning for one person full time"
msgstr ""
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr ""
+
#. module: project_planning
#: field:report_account_analytic.planning,planning_user_ids:0
msgid "Planning By User"
@@ -280,13 +300,13 @@ msgid "Planning By Account (in Days)"
msgstr ""
#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
msgstr ""
#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total Planned Tasks"
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
msgstr ""
#. module: project_planning
@@ -300,13 +320,8 @@ msgid "This value is given by the sum of time allocation with the checkbox 'Assi
msgstr ""
#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "tasks"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
msgstr ""
#. module: project_planning
@@ -326,9 +341,9 @@ msgid "Draft"
msgstr ""
#. module: project_planning
-#: view:account.analytic.account:0
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
+msgid "Planning by Account"
msgstr ""
#. module: project_planning
@@ -461,7 +476,6 @@ msgstr ""
#. module: project_planning
#: field:report_account_analytic.planning,user_id:0
-#: report:report_account_analytic.planning.print:0
msgid "Responsible"
msgstr ""
@@ -470,11 +484,6 @@ msgstr ""
msgid "Planning stat"
msgstr ""
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To"
-msgstr ""
-
#. module: project_planning
#: field:report_account_analytic.planning.account,plan_tasks:0
msgid "Time Allocation of Tasks"
@@ -485,11 +494,6 @@ msgstr ""
msgid "Summary by user"
msgstr ""
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid "With its commun system for scheduling all resources of a company (people and materials), OpenERP allows you to encode then compute automatically tasks and phases scheduling, track resources allocation and availibility."
-msgstr ""
-
#. module: project_planning
#: view:report_account_analytic.planning:0
msgid "Total Time Allocation without Tasks"
@@ -520,6 +524,16 @@ msgstr ""
msgid "Summary by project"
msgstr ""
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr ""
+
#. module: project_planning
#: field:res.company,planning_time_mode_id:0
msgid "Planning Time Unit"
diff --git a/addons/project_retro_planning/i18n/de.po b/addons/project_retro_planning/i18n/de.po
index 6a29a51a848..5753ab4dd61 100644
--- a/addons/project_retro_planning/i18n/de.po
+++ b/addons/project_retro_planning/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:02+0000\n"
+"PO-Revision-Date: 2010-12-31 10:22+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:27+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
index 2cfcb9529b6..eb12e7c454d 100644
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ b/addons/project_retro_planning/i18n/project_retro_planning.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:20+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
index 8d881c93fb2..27ac755a1f5 100644
--- a/addons/project_scrum/i18n/de.po
+++ b/addons/project_scrum/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 12:26+0000\n"
+"PO-Revision-Date: 2010-12-31 10:27+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_scrum
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
index 4c0db3dd429..f9b0a3339ae 100644
--- a/addons/project_scrum/i18n/es.po
+++ b/addons/project_scrum/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 10:08+0000\n"
-"Last-Translator: Borja López Soilán \n"
+"PO-Revision-Date: 2011-01-01 15:01+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) \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-12-31 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_scrum
@@ -214,6 +214,7 @@ msgstr ""
#, python-format
msgid "Please provide email address for product owner defined on sprint."
msgstr ""
+"Intruduze una dirección de correo del producto para definir el esprint."
#. module: project_scrum
#: code:addons/project_scrum/project_scrum.py:0
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
index 4f08cbb9bbd..b29e9db8794 100644
--- a/addons/project_scrum/i18n/project_scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -73,6 +73,11 @@ msgstr ""
msgid "What did you do since the last meeting?"
msgstr ""
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
+msgid "The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner."
+msgstr ""
+
#. module: project_scrum
#: view:project.scrum.meeting:0
#: view:project.scrum.product.backlog:0
@@ -103,7 +108,7 @@ msgid "Scrum Master"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:83
#, python-format
msgid "The sprint '%s' has been opened."
msgstr ""
@@ -157,7 +162,7 @@ msgid "Merge Backlogs"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:53
#, python-format
msgid "Scrum Meeting : %s"
msgstr ""
@@ -203,19 +208,20 @@ msgid "The scrum agile methodology is used in software development projects. In
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:316
#, python-format
msgid "Please provide email address for product owner defined on sprint."
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:327
#, python-format
msgid "Scrum Meeting of %s"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
#: view:project.scrum.product.backlog:0
#: field:project.task,product_backlog_id:0
@@ -240,13 +246,15 @@ msgid "Start Task"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:90
+#: code:addons/project_scrum/wizard/project_scrum_email.py:93
+#: code:addons/project_scrum/wizard/project_scrum_email.py:96
#, python-format
msgid "None"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "*Blocks encountered:"
msgstr ""
@@ -278,7 +286,7 @@ msgid "Computed using the sum of the task work done."
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:91
#, python-format
msgid "Task for Today"
msgstr ""
@@ -299,7 +307,7 @@ msgid "Starting Date"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:94
#, python-format
msgid "Blocking points encountered:"
msgstr ""
@@ -344,7 +352,7 @@ msgid "Sprints"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:314
#, python-format
msgid "Email notification could not be sent to the product owner %s"
msgstr ""
@@ -383,7 +391,7 @@ msgid "Daily Scrum"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
#, python-format
msgid "for the Sprint"
msgstr ""
@@ -401,7 +409,10 @@ msgid "Product Backlogs"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:301
+#: code:addons/project_scrum/project_scrum.py:303
+#: code:addons/project_scrum/project_scrum.py:314
+#: code:addons/project_scrum/project_scrum.py:316
#, python-format
msgid "Error !"
msgstr ""
@@ -423,7 +434,7 @@ msgid "Scrum"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
#, python-format
msgid "Hello "
msgstr ""
@@ -434,14 +445,15 @@ msgid "Tasks for today"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:88
#: field:project.scrum.meeting,question_yesterday:0
#, python-format
msgid "Tasks since yesterday"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
#, python-format
msgid "Warning"
msgstr ""
@@ -483,7 +495,7 @@ msgid "View project's tasks"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:56
#, python-format
msgid "Hello , \n"
"I am sending you Scrum Meeting : %s for the Sprint '%s' of Project '%s'"
@@ -590,7 +602,7 @@ msgid "The person who is responsible for the product"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "*Tasks since yesterday:"
msgstr ""
@@ -692,7 +704,7 @@ msgid "Backlogs"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:326
#, python-format
msgid "Thank you"
msgstr ""
@@ -728,18 +740,13 @@ msgstr ""
msgid "Merge"
msgstr ""
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid "The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a sprint of developement and can be split into several tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
msgid "View sprint backlog"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "No Blocks"
msgstr ""
@@ -779,7 +786,7 @@ msgid "Backlog Progress"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:301
#, python-format
msgid "Email notification could not be sent to the scrum master %s"
msgstr ""
@@ -823,11 +830,6 @@ msgstr ""
msgid "Information"
msgstr ""
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid "The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (one month) on which the team implement a list of product backlogs. The sprint review is organized when the team presents his work to the customer and product owner."
-msgstr ""
-
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Remaining Hours"
@@ -861,6 +863,11 @@ msgstr ""
msgid "Send Email for Scrum Meeting Details"
msgstr ""
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid "The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
#. module: project_scrum
#: model:process.transition,name:project_scrum.process_transition_backlogtask0
msgid "Backlog Task"
@@ -913,7 +920,7 @@ msgid "Progress (0-100)"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
#, python-format
msgid "I am sending you Daily Meeting Details of date"
msgstr ""
@@ -964,13 +971,13 @@ msgid "This wizard merge backlogs and create one new backlog with draft state (O
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "*Task for Today:"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:303
#, python-format
msgid "Please provide email address for scrum master defined on sprint."
msgstr ""
@@ -1013,19 +1020,19 @@ msgid "Feature Description"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
#, python-format
msgid "Please select any Project."
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:97
#, python-format
msgid "Thank you,"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:90
#, python-format
msgid "The sprint '%s' has been closed."
msgstr ""
@@ -1058,7 +1065,7 @@ msgid "Sprint"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
#, python-format
msgid "Please select at least two product Backlogs"
msgstr ""
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index f6fcecd02a5..738eac50c2f 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:07+0000\n"
+"PO-Revision-Date: 2010-12-31 10:38+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index c3e375d36a2..d1476ad5221 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:49+0000\n"
+"PO-Revision-Date: 2010-12-31 10:57+0000\n"
"Last-Translator: Borja López Soilán \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-12-31 05:26+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index fef8564b39a..949c08a52b7 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.po
@@ -8,20 +8,20 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2009-09-08 13:14+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2011-01-01 13:07+0000\n"
+"Last-Translator: OpenERP Administrators \n"
"Language-Team: Latvian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-24 05:40+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
#, python-format
msgid "No employee defined for user \"%s\". You must create one."
-msgstr ""
+msgstr "Lietotājam '%s' nav definēts darbinieks, kas obligāti jāizveido."
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
@@ -36,12 +36,12 @@ msgstr ""
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_timesheettask0
msgid "Timesheet task"
-msgstr ""
+msgstr "Darba uzsk. tabulas uzdevums"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Meklēta analītikas rindas"
#. module: project_timesheet
#: field:project.task.work,hr_analytic_timesheet_id:0
@@ -51,151 +51,151 @@ msgstr "Saistītās hronoloģijas ID"
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task_work
msgid "Project Task Work"
-msgstr ""
+msgstr "Projekta uzdevuma darbs"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "February"
-msgstr ""
+msgstr "Februāris"
#. module: project_timesheet
#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
msgid "Group By..."
-msgstr ""
+msgstr "Grupēt pēc..."
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
msgid "Trigger invoices from sale order lines"
-msgstr ""
+msgstr "Iniciē rēķinus no klientu pasūtījumu rindām"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "October"
-msgstr ""
+msgstr "Oktobris"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,year:0
msgid "Year"
-msgstr ""
+msgstr "Gads"
#. module: project_timesheet
#: field:report.timesheet.task.user,task_hrs:0
msgid "Task Hours"
-msgstr ""
+msgstr "Uzdevuma stundas"
#. module: project_timesheet
#: constraint:project.project:0
msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Kļūda! Projekta sākuma datumam jābūt mazākam nekā beigu."
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid " Year "
-msgstr ""
+msgstr " Gads "
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Product"
-msgstr ""
+msgstr "Produkts"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "March"
-msgstr ""
+msgstr "Marts"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "August"
-msgstr ""
+msgstr "Augusts"
#. module: project_timesheet
#: model:process.transition,name:project_timesheet.process_transition_taskinvoice0
msgid "Task invoice"
-msgstr ""
+msgstr "Uzdevuma rēķins"
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_taskwork0
msgid "Task Work"
-msgstr ""
+msgstr "Uzdevuma darbi"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "May"
-msgstr ""
+msgstr "Maijs"
#. module: project_timesheet
#: constraint:project.task:0
msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Journal"
-msgstr ""
+msgstr "Žurnāls"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "June"
-msgstr ""
+msgstr "Jūnijs"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "My Entries"
-msgstr ""
+msgstr "Mani ieraksti"
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task
msgid "Task"
-msgstr ""
+msgstr "Uzdevums"
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
msgid "Invoice Tasks Work"
-msgstr ""
+msgstr "Izrakstīt rēķinu par uzdevumu darbu"
#. module: project_timesheet
#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,user_id:0
msgid "User"
-msgstr ""
+msgstr "Lietotājs"
#. module: project_timesheet
#: constraint:project.project:0
msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
+msgstr "Kļūda! Nedrīkst piešķirt eskalāciju uz to pašu projektu!"
#. module: project_timesheet
#: field:report.timesheet.task.user,name:0
msgid "Date"
-msgstr ""
+msgstr "Datums"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "July"
-msgstr ""
+msgstr "Jūlijs"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Extended Filters..."
-msgstr ""
+msgstr "Paplašinātie filtri..."
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_timesheettask0
msgid "Complete Your Timesheet."
-msgstr ""
+msgstr "Aizpildiet savu darba izsk. tabeli"
#. module: project_timesheet
#: view:project.project:0
msgid "Invoiceable"
-msgstr ""
+msgstr "Izrakstāmi rēķini"
#. module: project_timesheet
#: view:project.project:0
msgid "Customer"
-msgstr ""
+msgstr "Klients"
#. module: project_timesheet
#: model:ir.module.module,description:project_timesheet.module_meta_information
@@ -212,47 +212,47 @@ msgstr ""
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Account"
-msgstr ""
+msgstr "Konts"
#. module: project_timesheet
#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
msgid "Bill Tasks Works"
-msgstr ""
+msgstr "Izrakstīt rēķinus par uzdevumu darbu"
#. module: project_timesheet
#: field:report.timesheet.task.user,timesheet_hrs:0
msgid "Timesheet Hours"
-msgstr ""
+msgstr "Darba uzsk. tabeles stundas"
#. module: project_timesheet
#: model:process.transition,name:project_timesheet.process_transition_taskencoding0
msgid "Task encoding"
-msgstr ""
+msgstr "Uzdevumu kodējums"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_filltimesheet0
msgid "Task summary is comes into the timesheet line"
-msgstr ""
+msgstr "Uzdevuma kopsavilkums, kas nonāks darba uzsk. tabeles rindā"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "January"
-msgstr ""
+msgstr "Janvāris"
#. module: project_timesheet
#: model:process.node,name:project_timesheet.process_node_triggerinvoice0
msgid "Trigger Invoice"
-msgstr ""
+msgstr "Iniciēt rēķinu"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "November"
-msgstr ""
+msgstr "Novembris"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid "Tasks by User"
-msgstr ""
+msgstr "Uzdevumi pēc lietotāja"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
@@ -268,27 +268,27 @@ msgstr ""
#: view:account.analytic.line:0
#: model:ir.model,name:project_timesheet.model_project_project
msgid "Project"
-msgstr ""
+msgstr "Projekts"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "April"
-msgstr ""
+msgstr "Aprīlis"
#. module: project_timesheet
#: view:project.project:0
msgid "Invoicing Data"
-msgstr ""
+msgstr "Dati rēķinu izrakstišanai"
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Fin.Account"
-msgstr ""
+msgstr "Fin. konts"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid " Month "
-msgstr ""
+msgstr " Mēnesis "
#. module: project_timesheet
#: view:report.timesheet.task.user:0
@@ -304,43 +304,43 @@ msgstr "Nepareiza konfigurācija!"
#. module: project_timesheet
#: model:ir.ui.menu,name:project_timesheet.menu_project_billing
msgid "Invoicing"
-msgstr ""
+msgstr "Rēķinu izrakstīšana"
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_taskwork0
msgid "Work on task"
-msgstr ""
+msgstr "Darbs pie uzdevuma"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
msgid " Month-1 "
-msgstr ""
+msgstr " Mēnesis-1 "
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "September"
-msgstr ""
+msgstr "Septembris"
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "December"
-msgstr ""
+msgstr "Decembris"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_taskinvoice0
msgid "After task is completed, Create its invoice."
-msgstr ""
+msgstr "Pēc uzdevuma pabeigšanas izveidot tam rēķinu."
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
msgid "report.timesheet.task.user"
-msgstr ""
+msgstr "report.timesheet.task.user"
#. module: project_timesheet
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,month:0
msgid "Month"
-msgstr ""
+msgstr "Mēnesis"
#. module: project_timesheet
#: model:ir.module.module,shortdesc:project_timesheet.module_meta_information
@@ -350,12 +350,12 @@ msgstr "Projekta darbu uzskaites Tabele"
#. module: project_timesheet
#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
msgid "Encode how much time u spent on your task"
-msgstr ""
+msgstr "Iekodējiet cik daudz laika esat patērējis savam uzdevumam"
#. module: project_timesheet
#: view:project.project:0
msgid "Invoice Task Work"
-msgstr ""
+msgstr "Izrakstīt rēķinu par uzdevuma darbu"
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:0
@@ -371,12 +371,12 @@ msgstr ""
#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
#: view:report.timesheet.task.user:0
msgid "Task Hours Per Month"
-msgstr ""
+msgstr "Uzdevuma stundas mēnesī"
#. module: project_timesheet
#: model:process.transition,name:project_timesheet.process_transition_filltimesheet0
msgid "Fill Timesheet"
-msgstr ""
+msgstr "Aizpildiet darba uzsk. tabeli"
#. module: project_timesheet
#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index 8bcf42dd13a..8006a8156f0 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:53
#, python-format
msgid "No employee defined for user \"%s\". You must create one."
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:61
#, python-format
msgid "No journal defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
@@ -34,8 +34,8 @@ msgid "Timesheet task"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Search Analytic Lines"
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
msgstr ""
#. module: project_timesheet
@@ -49,19 +49,18 @@ msgid "Project Task Work"
msgstr ""
#. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "February"
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
msgid "Group By..."
msgstr ""
#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
msgstr ""
#. module: project_timesheet
@@ -75,6 +74,11 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr ""
+
#. module: project_timesheet
#: field:report.timesheet.task.user,task_hrs:0
msgid "Task Hours"
@@ -91,8 +95,14 @@ msgid " Year "
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Product"
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:229
+#, python-format
+msgid "Cannot delete Partner which is Assigned to project !"
msgstr ""
#. module: project_timesheet
@@ -126,8 +136,9 @@ msgid "Error ! You cannot create recursive tasks."
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Journal"
+#: code:addons/project_timesheet/project_timesheet.py:229
+#, python-format
+msgid "Invalid action !"
msgstr ""
#. module: project_timesheet
@@ -135,11 +146,6 @@ msgstr ""
msgid "June"
msgstr ""
-#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "My Entries"
-msgstr ""
-
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task
msgid "Task"
@@ -151,7 +157,6 @@ msgid "Invoice Tasks Work"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,user_id:0
msgid "User"
@@ -172,11 +177,6 @@ msgstr ""
msgid "July"
msgstr ""
-#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Extended Filters..."
-msgstr ""
-
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_timesheettask0
msgid "Complete Your Timesheet."
@@ -202,8 +202,8 @@ msgid "\n"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Account"
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
msgstr ""
#. module: project_timesheet
@@ -247,7 +247,7 @@ msgid "Tasks by User"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:57
#, python-format
msgid "No product defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
@@ -270,8 +270,8 @@ msgid "Invoicing Data"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Fin.Account"
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
msgstr ""
#. module: project_timesheet
@@ -285,7 +285,10 @@ msgid "Timesheet/Task hours Report Per Month"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:52
+#: code:addons/project_timesheet/project_timesheet.py:56
+#: code:addons/project_timesheet/project_timesheet.py:60
+#: code:addons/project_timesheet/project_timesheet.py:67
#, python-format
msgid "Bad Configuration !"
msgstr ""
@@ -321,8 +324,8 @@ msgid "After task is completed, Create its invoice."
msgstr ""
#. module: project_timesheet
-#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
-msgid "report.timesheet.task.user"
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
msgstr ""
#. module: project_timesheet
@@ -336,18 +339,13 @@ msgstr ""
msgid "Project Timesheet"
msgstr ""
-#. module: project_timesheet
-#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
-msgid "Encode how much time u spent on your task"
-msgstr ""
-
#. module: project_timesheet
#: view:project.project:0
msgid "Invoice Task Work"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:68
#, python-format
msgid "No product and product category property account defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 42b9c4733ba..b6ec7d069bd 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -111,7 +111,7 @@ class project_work(osv.osv):
# Compute based on pricetype
amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
- prod_id, amount, False, unit, context=context)
+ prod_id, amount, False, unit, vals_line['journal_id'], context=context)
if amount_unit and 'amount' in amount_unit.get('value',{}):
updv = { 'amount': amount_unit['value']['amount'] }
obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
@@ -158,7 +158,7 @@ class project_work(osv.osv):
# Compute based on pricetype
amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
prod_id=prod_id, company_id=False,
- unit_amount=vals_line['unit_amount'], unit=False, context=context)
+ unit_amount=vals_line['unit_amount'], unit=False, journal_id=vals_line['journal_id'], context=context)
if amount_unit and 'amount' in amount_unit.get('value',{}):
vals_line['amount'] = amount_unit['value']['amount']
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index b2c909df237..7d55ca419be 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -50,7 +50,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 538a037c4a7..2ebbbc6f7b0 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-30 23:09+0000\n"
+"PO-Revision-Date: 2010-12-31 10:36+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index f2618d4263b..e73811f21d0 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:22+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "The buyer has to approve the RFQ before being sent to the supplier. The R
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:282
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -39,7 +39,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:710
#, python-format
msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
msgstr ""
@@ -49,11 +49,21 @@ msgstr ""
msgid "Date on which this document has been created"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid "You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding."
+msgstr ""
+
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "From Picking"
msgstr ""
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr ""
+
#. module: purchase
#: field:purchase.order,dest_address_id:0
msgid "Destination Address"
@@ -80,20 +90,25 @@ msgid "Do you want to generate the supplier invoices ?"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid "Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:722
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
#, python-format
msgid "Supplier Invoices"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-msgid "Purchase Orders Statistics"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
msgstr ""
#. module: purchase
@@ -103,7 +118,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:649
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -128,11 +143,6 @@ msgstr ""
msgid "Company"
msgstr ""
-#. module: purchase
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
-msgstr ""
-
#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -187,7 +197,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:286
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -206,19 +216,23 @@ msgid "Approved"
msgstr ""
#. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase"
+#: view:purchase.report:0
+msgid "Reference UOM"
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.order:0
+msgid "Origin"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
-#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
-msgid "Receptions Analysis"
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
msgstr ""
#. module: purchase
@@ -230,7 +244,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:649
#, python-format
msgid "You have to select a pricelist or a supplier in the purchase form !\n"
"Please set one before choosing a product."
@@ -301,7 +315,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:305
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -324,8 +338,8 @@ msgid "Shipping Exception"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Origin"
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
msgstr ""
#. module: purchase
@@ -355,7 +369,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:237
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -366,8 +380,8 @@ msgid "Dest. Address Contact Name"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
-msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you did not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
msgstr ""
#. module: purchase
@@ -377,7 +391,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:334
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -394,8 +408,9 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_order_group.py:0
+#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
msgstr ""
@@ -431,7 +446,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:710
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -475,6 +490,11 @@ msgstr ""
msgid "Supplier Reference"
msgstr ""
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
#. module: purchase
#: model:process.transition,note:purchase.process_transition_productrecept0
msgid "A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
@@ -521,7 +541,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:651
#, python-format
msgid "No Partner!"
msgstr ""
@@ -539,11 +559,12 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
-msgid "To be Invoiced"
+msgid "Untaxed amount"
msgstr ""
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
msgid "Pricelists"
msgstr ""
@@ -565,8 +586,10 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
msgstr ""
@@ -617,7 +640,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:237
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -662,6 +685,11 @@ msgstr ""
msgid "Validated by"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid "Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it."
+msgstr ""
+
#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -684,7 +712,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:363
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -695,7 +723,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:400
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -718,9 +746,13 @@ msgid "Approbation"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_res_partner
-#: field:purchase.order.line,partner_id:0
-msgid "Partner"
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
msgstr ""
#. module: purchase
@@ -749,6 +781,11 @@ msgstr ""
msgid "Purchase Requisition"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
@@ -941,9 +978,8 @@ msgid "It indicates that an invoice has been paid"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_form_action
-msgid "From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.\n"
-""
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
@@ -988,7 +1024,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:308
#, python-format
msgid "Somebody has just confirmed a purchase with an amount over the defined limit"
msgstr ""
@@ -1004,25 +1040,20 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:408
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_invoice_pending
-msgid "Use this menu to control the invoices to be received by your supplier. OpenERP pre-generates draft of invoices based on your purchase orders or your receptions. Once you receive a supplier invoice, you can control it according to the draft of invoice and validate it."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/wizard/purchase_order_group.py:0
+#: code:addons/purchase/wizard/purchase_order_group.py:48
#, python-format
msgid "Please select multiple order to merge in the list view."
msgstr ""
@@ -1061,7 +1092,7 @@ msgid "\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
msgstr ""
@@ -1103,8 +1134,8 @@ msgid "Products Value"
msgstr ""
#. module: purchase
-#: help:purchase.order,amount_tax:0
-msgid "The tax amount"
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
msgstr ""
#. module: purchase
@@ -1125,8 +1156,8 @@ msgid "History"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
-msgid "Purchases"
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
msgstr ""
#. module: purchase
@@ -1312,7 +1343,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:407
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1328,17 +1359,13 @@ msgstr ""
msgid "Delivery & Invoicing"
msgstr ""
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_rfq
-msgid "With the Requests for quotation menu you can create new request for quotations, review existing one and confirm them to order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, invoice to control."
-msgstr ""
-
#. module: purchase
#: field:purchase.order.line,date_planned:0
msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
#: field:purchase.order,product_id:0
#: view:purchase.order.line:0
#: field:purchase.order.line,product_id:0
@@ -1361,8 +1388,8 @@ msgid "Description"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
msgstr ""
#. module: purchase
@@ -1370,6 +1397,12 @@ msgstr ""
msgid "Expected Delivery address:"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
#. module: purchase
#: help:purchase.order,amount_untaxed:0
msgid "The amount without tax"
@@ -1377,12 +1410,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
-msgid "Access your supplier records and maintain your relationship with them. You can track all your interactions with them through the history tab: emails, orders, meeting, etc."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,invoice_lines:0
-msgid "Invoice Lines"
+msgid "Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc."
msgstr ""
#. module: purchase
@@ -1398,7 +1426,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_uom:0
-#: view:purchase.report:0
msgid "Product UOM"
msgstr ""
@@ -1425,7 +1452,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:399
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1440,6 +1467,11 @@ msgstr ""
msgid "February"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
@@ -1511,8 +1543,9 @@ msgid " Please note that: \n"
msgstr ""
#. module: purchase
-#: field:purchase.report,product_uom:0
-msgid "Product UoM"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
msgstr ""
#. module: purchase
@@ -1555,7 +1588,7 @@ msgid " * The 'Draft' state is set automatically when purchase order in draft st
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:414
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1618,13 +1651,18 @@ msgid "The invoice is created automatically if the Invoice control of the purcha
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,name:0
-msgid "Year"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
#, python-format
msgid "You have to select a partner in the purchase form !\n"
"Please set one partner before choosing a product."
@@ -1641,13 +1679,14 @@ msgid "Partial Move"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_stock_move
-msgid "Stock Move"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
msgstr ""
#. module: purchase
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 672c398dbd5..ebca800c5e3 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-21 13:34+0000\n"
+"PO-Revision-Date: 2011-01-01 13:38+0000\n"
"Last-Translator: Chertykov Denis \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-12-24 05:05+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
@@ -595,7 +595,7 @@ msgstr "Счет будет выставлен"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
msgid "Pricelists"
-msgstr ""
+msgstr "Каталоги"
#. module: purchase
#: field:purchase.report,partner_address_id:0
@@ -616,7 +616,7 @@ msgstr ""
#. module: purchase
#: help:purchase.order,invoice_ids:0
msgid "Invoices generated for a purchase order"
-msgstr ""
+msgstr "Счета созданные для заказа на закупку"
#. module: purchase
#: code:addons/purchase/purchase.py:0
@@ -840,7 +840,7 @@ msgstr "Снабжение"
#: view:purchase.order:0
#: field:purchase.order,invoice_ids:0
msgid "Invoices"
-msgstr ""
+msgstr "Счета"
#. module: purchase
#: model:process.node,note:purchase.process_node_purchaseorder0
@@ -1152,6 +1152,8 @@ msgid ""
"The selected supplier has a minimal quantity set to %s, you cannot purchase "
"less."
msgstr ""
+"Минимальное закупаемое количество у выбранного поставщика: %s. Нельзя купить "
+"меньше."
#. module: purchase
#: selection:purchase.report,month:0
@@ -1685,7 +1687,7 @@ msgstr "Всего"
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
msgid "Pricelist Versions"
-msgstr ""
+msgstr "Версии каталогов"
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index 6771bed9710..769f4e3b3da 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_analytic_plans/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:13+0000\n"
+"PO-Revision-Date: 2010-12-31 10:22+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \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-12-31 05:23+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index 1ae353896a9..60c17d6a572 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_analytic_plans/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-09-29 08:45+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2011-01-01 21:55+0000\n"
+"Last-Translator: Roberto Onnis \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-12-24 04:59+0000\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase_analytic_plans
@@ -29,7 +29,7 @@ msgstr "Gestione della distribuzione analitica degli acquisti"
#. module: purchase_analytic_plans
#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
msgid "Purchase Order Line"
-msgstr ""
+msgstr "Riga Ordine di Acquisto"
#. module: purchase_analytic_plans
#: model:ir.module.module,description:purchase_analytic_plans.module_meta_information
@@ -38,11 +38,16 @@ msgid ""
" The base module to manage analytic distribution and purchase orders.\n"
" "
msgstr ""
+"\n"
+" \\n\n"
+" Il modulo di base per gestire le distribuzioni analitiche e gli ordini "
+"di acquisto.\\n\n"
+" "
#. module: purchase_analytic_plans
#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
msgid "Purchase Order"
-msgstr ""
+msgstr "Ordine di acquisto"
#~ msgid "Invalid XML for View Architecture!"
#~ msgstr "XML non valido per Visualizzazione Architettura!"
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 1f66b471ddf..75b4a5b2e34 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:23+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:23+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,19 +15,29 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: purchase_analytic_plans
#: field:purchase.order.line,analytics_id:0
msgid "Analytic Distribution"
msgstr ""
#. module: purchase_analytic_plans
-#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
-msgid "Purchase Analytic Distribution Management"
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
msgstr ""
#. module: purchase_analytic_plans
-#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
-msgid "Purchase Order Line"
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
msgstr ""
#. module: purchase_analytic_plans
@@ -37,8 +47,3 @@ msgid "\n"
" "
msgstr ""
-#. module: purchase_analytic_plans
-#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
-msgid "Purchase Order"
-msgstr ""
-
diff --git a/addons/purchase_double_validation/i18n/purchase_double_validation.pot b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
new file mode 100644
index 00000000000..bfd6d52a319
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
@@ -0,0 +1,80 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * purchase_double_validation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58:23+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:23+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid "\n"
+" This module modifies the purchase workflow in order to validate purchases that exceeds minimum amount set by configuration wizard\n"
+" "
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
+
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index 70c04921ded..9637ffd642d 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:17+0000\n"
+"PO-Revision-Date: 2010-12-31 10:31+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org) \n"
"Language-Team: German \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase_requisition
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index 173b2ba2bad..6937aca97f8 100644
--- a/addons/purchase_requisition/i18n/es.po
+++ b/addons/purchase_requisition/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:51+0000\n"
+"PO-Revision-Date: 2010-12-31 10:19+0000\n"
"Last-Translator: Borja López Soilán \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-31 05:28+0000\n"
+"X-Launchpad-Export-Date: 2011-01-01 05:05+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase_requisition
diff --git a/addons/purchase_requisition/i18n/it.po b/addons/purchase_requisition/i18n/it.po
new file mode 100644
index 00000000000..5bfba50a3e9
--- /dev/null
+++ b/addons/purchase_requisition/i18n/it.po
@@ -0,0 +1,424 @@
+# Italian 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: 2010-12-21 19:45+0000\n"
+"PO-Revision-Date: 2011-01-01 23:13+0000\n"
+"Last-Translator: Roberto Onnis \n"
+"Language-Team: Italian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-01-02 05:02+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "In Progress"
+msgstr "In progresso"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "No Product in Tender"
+msgstr "Nessun prodotto in offerta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm"
+msgstr "Conferma"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
+msgstr "Responsabile"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid ""
+"A purchase requisition is a step before the request for quotation. In a "
+"purchase requisition (or purchase tender), you can record the products you "
+"need to buy and trigger the creation of RfQs to supplier. After the "
+"negotiation, once you have reviewed all the supplier's offers, you can "
+"validate some and cancel others."
+msgstr ""
+"Una richiesta di vendita rappresenta un passo antecedente al preventivo. In "
+"un richiesta di vendita (o offerta di vendita), è possibile registrare i "
+"prodotti che si desidera comprare ed innescare la creazione di una richiesta "
+"preventivo per il fornitore. Dopo che la negoziazione è terminata, non "
+"appena quindi tutte le offerte dei fornitori sono state valutate, è "
+"possibile confermarne alcune e cancellarne altre."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: field:purchase.requisition,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Supplier"
+msgstr "Fornitore"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
+msgstr "Tipo richiesta"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Product Detail"
+msgstr "Dettaglio prodotto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,date_start:0
+msgid "Requisition Date"
+msgstr "Data richiesta"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_partner
+#: model:ir.actions.report.xml,name:purchase_requisition.report_purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition
+#: field:product.product,purchase_requisition:0
+#: field:purchase.order,requisition_id:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition.line,requisition_id:0
+#: view:purchase.requisition.partner:0
+msgid "Purchase Requisition"
+msgstr "Richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
+msgstr "Linea di richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr "Quotazioni"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,description:0
+msgid "Description"
+msgstr "Descrizioni"
+
+#. module: purchase_requisition
+#: help:product.product,purchase_requisition:0
+msgid ""
+"Check this box so that requisitions generates purchase requisitions instead "
+"of directly requests for quotations."
+msgstr ""
+"Spuntare questa opzione se si desidera che le richieste generino richieste "
+"d'acquisto invece di creare direttamente dei preventivi."
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Request a Quotation"
+msgstr "Richiedi preventivo"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
+msgstr "Più richieste"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
+msgstr "Approvato dal fornitore"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
+msgstr "Reimposta come bozza"
+
+#. module: purchase_requisition
+#: model:ir.module.module,description:purchase_requisition.module_meta_information
+msgid ""
+"\n"
+" This module allows you to manage your Purchase Requisition.\n"
+" When a purchase order is created, you now have the opportunity to save "
+"the related requisition.\n"
+" This new object will regroup and will allow you to easily keep track and "
+"order all your purchase orders.\n"
+msgstr ""
+"\n"
+" Questo modulo permette di gestire le proprie richieste di acquisto.\n"
+" Ora, quando un ordine di acquisto viene creato, si ha l'opportunità di "
+"legare ad esso una richiesta.\n"
+" Questo nuovo oggetto raggrupperà tutti i propri ordini di acquisto e "
+"permetterà quindi di tenerne traccia ed ordinarli facilmente.\n"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_address_id:0
+msgid "Address"
+msgstr "Indirizzo"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Order Reference"
+msgstr "Riferimento ordine"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Start Date"
+msgstr "Data inizio"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr "Richieste di acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "End Date"
+msgstr "Data fine"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
+msgstr "Riferimento richiesta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
+msgstr "Prodotti da acquistare"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
+msgstr "Termine richiesta"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Search Purchase Requisition"
+msgstr "Cerca richieste d'acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Notes"
+msgstr "Note"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Date Ordered"
+msgstr "Data ordine"
+
+#. module: purchase_requisition
+#: help:purchase.requisition,exclusive:0
+msgid ""
+"Purchase Requisition (exclusive): On the confirmation of a purchase order, "
+"it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple): It allows to have multiple purchase "
+"orders.On confirmation of a purchase order it does not cancel the remaining "
+"orders"
+msgstr ""
+"Richiesta d'acquisto(esclusiva): durante la conferma dell'ordine di acquisto "
+"cancella il rimanente ordine di acquisto.\n"
+"Richiesta d'acquisto(multipla): permette di avere diversi ordini di "
+"acquisto. Durante la conferma di un ordine di acquisto non cancella gli "
+"ordini rimanenti"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel Purchase Order"
+msgstr "Cancella ordine di acquisto"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
+#: view:purchase.requisition:0
+msgid "Purchase Order"
+msgstr "Ordine di Acquisto"
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#, python-format
+msgid "Error!"
+msgstr "Errore!"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product UoM"
+msgstr "UoM prodotto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Products"
+msgstr "Prodotti"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Order Date"
+msgstr "Data ordine"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
+msgstr "Cancellato"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "["
+msgstr "["
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
+msgstr "Partner richiesta ordine"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "]"
+msgstr "]"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr "Dettaglio preventivo"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
+msgstr "Acquisto per richieste"
+
+#. module: purchase_requisition
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
+msgstr "Ordini di acquisto"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+#: view:purchase.requisition:0
+#: field:purchase.requisition,origin:0
+msgid "Origin"
+msgstr "Origine"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Reference"
+msgstr "Riferimento"
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
+msgstr "Approvvigionamento"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
+#. module: purchase_requisition
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
+msgstr "Ultima richiesta"
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Qty"
+msgstr "Q.tà"
+
+#. module: purchase_requisition
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
+msgstr "Richiesta d'acquisto (esclusiva)"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
+msgstr "Crea preventivo"
+
+#. module: purchase_requisition
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Errore: codice ean non valido"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Done"
+msgstr "Fatto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition.partner:0
+msgid "_Cancel"
+msgstr "_Cancella"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr "Conferma ordine di acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: purchase_requisition
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: purchase_requisition
+#: model:ir.module.module,shortdesc:purchase_requisition.module_meta_information
+msgid "Purchase - Purchase Requisition"
+msgstr "Acquisto- Richiesta d'acquisto"
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Unassigned"
+msgstr "Non assegnato"
+
+#. module: purchase_requisition
+#: view:purchase.order:0
+msgid "Requisition"
+msgstr "Richiesta"
+
+#. module: purchase_requisition
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
+msgstr "Ordini di acquisto"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 5af7c176be8..56beeb7aca8 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "In Progress"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
#, python-format
msgid "No Product in Tender"
msgstr ""
@@ -38,11 +38,6 @@ msgstr ""
msgid "Responsible"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
-msgid "A purchase requisition is a step before the request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to supplier. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others."
-msgstr ""
-
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Group By..."
@@ -105,8 +100,8 @@ msgid "Product"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
msgstr ""
#. module: purchase_requisition
@@ -175,6 +170,11 @@ msgstr ""
msgid "Start Date"
msgstr ""
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others."
+msgstr ""
+
#. module: purchase_requisition
#: field:purchase.requisition.line,product_qty:0
msgid "Quantity"
@@ -240,7 +240,7 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
#, python-format
msgid "Error!"
msgstr ""
@@ -323,6 +323,11 @@ msgstr ""
msgid "Latest Requisition"
msgstr ""
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
#. module: purchase_requisition
#: report:purchase.requisition:0
msgid "Qty"
diff --git a/addons/report_designer/i18n/de.po b/addons/report_designer/i18n/de.po
index 3d4bbfa0e83..fb4edd8dfb8 100644
--- a/addons/report_designer/i18n/de.po
+++ b/addons/report_designer/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-29 09:20+0000\n"
+"PO-Revision-Date: 2010-12-31 10:29+0000\n"
"Last-Translator: Thorsten Vocks (OpenBig.org)