diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 2a9f24e953c..a71884e6d54 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:18+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -163,6 +163,12 @@ msgstr ""
msgid "If the active field is set to False, it will allow you to hide the payment term without removing it."
msgstr ""
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Warning!"
+msgstr ""
+
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
@@ -195,16 +201,6 @@ msgstr ""
msgid "Tax Templates"
msgstr ""
-#. module: account
-#: view:account.invoice.report:0
-msgid "supplier"
-msgstr ""
-
-#. module: account
-#: model:account.journal,name:account.refund_expenses_journal
-msgid "Expenses Credit Notes Journal - (test)"
-msgstr ""
-
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
@@ -647,9 +643,13 @@ msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
#. module: account
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
+#: view:account.account:0
+#: selection:account.aged.trial.balance,result_selection:0
+#: selection:account.common.partner.report,result_selection:0
+#: selection:account.partner.balance,result_selection:0
+#: selection:account.partner.ledger,result_selection:0
+#: model:ir.actions.act_window,name:account.action_aged_receivable
+msgid "Receivable Accounts"
msgstr ""
#. module: account
@@ -829,11 +829,6 @@ msgstr ""
msgid "Due"
msgstr ""
-#. module: account
-#: report:account.overdue:0
-msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
-msgstr ""
-
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,price_total_tax:0
@@ -862,6 +857,11 @@ msgstr ""
msgid "Consolidation"
msgstr ""
+#. module: account
+#: model:account.account.type,name:account.account_type_liability
+msgid "Liability"
+msgstr ""
+
#. module: account
#: view:account.analytic.line:0
#: view:account.entries.report:0
@@ -1220,6 +1220,9 @@ msgid "Journal Items Analysis"
msgstr ""
#. module: account
+#: model:ir.actions.act_window,name:account.action_partner_all
+#: model:ir.ui.menu,name:account.menu_partners
+#: model:ir.ui.menu,name:account.menu_partners_partners
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
msgstr ""
@@ -1374,6 +1377,11 @@ msgstr ""
msgid "Template for Fiscal Position"
msgstr ""
+#. module: account
+#: model:account.tax.code,name:account.account_tax_code_0
+msgid "Tax Code Test"
+msgstr ""
+
#. module: account
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
@@ -1798,16 +1806,6 @@ msgstr ""
msgid "Image"
msgstr ""
-#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-msgid "Receivable Accounts"
-msgstr ""
-
#. module: account
#: report:account.move.voucher:0
msgid "Canceled"
@@ -1852,11 +1850,6 @@ msgstr ""
msgid "Open Entries"
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree4
-msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
-msgstr ""
-
#. module: account
#: field:account.automatic.reconcile,account_ids:0
msgid "Accounts to Reconcile"
@@ -1886,11 +1879,6 @@ msgstr ""
msgid "Validations"
msgstr ""
-#. module: account
-#: model:account.journal,name:account.close_journal
-msgid "End of Year"
-msgstr ""
-
#. module: account
#: view:account.entries.report:0
msgid "This F.Year"
@@ -2147,6 +2135,11 @@ msgstr ""
msgid "Gives the sequence order when displaying a list of invoice tax."
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "A supplier refund is a credit note from your supplier indicating that he refunds part or totality of the invoice sent to you."
+msgstr ""
+
#. module: account
#: field:account.tax,base_sign:0
#: field:account.tax,ref_base_sign:0
@@ -3291,6 +3284,12 @@ msgstr ""
msgid "#Entries"
msgstr ""
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
+
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
@@ -3346,11 +3345,6 @@ msgstr ""
msgid "Journal for analytic entries"
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree3
-msgid "Customer Refunds helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form."
-msgstr ""
-
#. module: account
#: model:ir.ui.menu,name:account.menu_finance
#: model:process.node,name:account.process_node_accountingentries0
@@ -3641,6 +3635,7 @@ msgstr ""
#: selection:account.common.partner.report,target_move:0
#: selection:account.common.report,target_move:0
#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
#: selection:account.partner.balance,target_move:0
#: selection:account.partner.ledger,target_move:0
#: selection:account.pl.report,target_move:0
@@ -3770,6 +3765,11 @@ msgstr ""
msgid "Account Journal Select"
msgstr ""
+#. module: account
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
+
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
@@ -3897,20 +3897,9 @@ msgid "Closing balance based on cashBox"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/wizard/account_invoice_state.py:0
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
-#: code:addons/account/wizard/account_state_open.py:0
-#: code:addons/account/wizard/account_validate_account_move.py:0
-#, python-format
-msgid "Warning"
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
msgstr ""
#. module: account
@@ -4022,6 +4011,13 @@ msgstr ""
msgid "Invoices"
msgstr ""
+#. module: account
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
#. module: account
#: view:account.invoice:0
#: field:account.invoice,user_id:0
@@ -4255,6 +4251,7 @@ msgstr ""
#: field:account.general.journal,target_move:0
#: report:account.general.ledger:0
#: report:account.journal.period.print:0
+#: field:account.move.journal,target_move:0
#: report:account.partner.balance:0
#: field:account.partner.balance,target_move:0
#: field:account.partner.ledger,target_move:0
@@ -4291,12 +4288,6 @@ msgstr ""
msgid "Python Code (reverse)"
msgstr ""
-#. module: account
-#: view:account.journal.column:0
-#: model:ir.model,name:account.model_account_journal_column
-msgid "Journal Column"
-msgstr ""
-
#. module: account
#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
msgid "Define your company's fiscal year depending on the period you have chosen to follow. A fiscal year is a 1 year period over which a company budgets its spending. It may run over any period of 12 months. The fiscal year is referred to by the date in which it ends. For example, if a company's fiscal year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. Not using the actual calendar year gives many companies an advantage, allowing them to close their books at a time which is most convenient for them."
@@ -4560,11 +4551,6 @@ msgstr ""
msgid "Bank Journal "
msgstr ""
-#. module: account
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
#. module: account
#: view:account.journal:0
msgid "Entry Controls"
@@ -4887,6 +4873,8 @@ msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
+#: code:addons/account/account_move_line.py:0
+#, python-format
msgid "Write-Off"
msgstr ""
@@ -4901,16 +4889,17 @@ msgid "account.analytic.line.extended"
msgstr ""
#. module: account
-#: selection:account.bank.statement.line,type:0
-#: view:account.invoice:0
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Supplier"
+#: model:account.account.type,name:account.account_type_income
+msgid "Income"
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_asset
-msgid "Bilanzkonten - Aktiva - Vermögenskonten"
+#: selection:account.bank.statement.line,type:0
+#: view:account.invoice:0
+#: view:account.invoice.report:0
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Supplier"
msgstr ""
#. module: account
@@ -5853,6 +5842,7 @@ msgstr ""
#: selection:account.common.partner.report,target_move:0
#: selection:account.common.report,target_move:0
#: selection:account.general.journal,target_move:0
+#: selection:account.move.journal,target_move:0
#: selection:account.partner.balance,target_move:0
#: selection:account.partner.ledger,target_move:0
#: selection:account.pl.report,target_move:0
@@ -5963,11 +5953,6 @@ msgstr ""
msgid "Child Codes"
msgstr ""
-#. module: account
-#: model:account.journal,name:account.refund_sales_journal
-msgid "Sales Credit Note Journal - (test)"
-msgstr ""
-
#. module: account
#: code:addons/account/invoice.py:0
#: code:addons/account/wizard/account_invoice_refund.py:0
@@ -5992,8 +5977,9 @@ msgid "Sales"
msgstr ""
#. module: account
-#: model:account.journal,name:account.cash_journal
-msgid "Cash Journal - (test)"
+#: view:account.journal.column:0
+#: model:ir.model,name:account.model_account_journal_column
+msgid "Journal Column"
msgstr ""
#. module: account
@@ -6045,12 +6031,6 @@ msgstr ""
msgid "Taxes:"
msgstr ""
-#. module: account
-#: help:account.invoice,partner_bank_id:0
-msgid "The partner bank account to pay\n"
-"Keep empty to use the default"
-msgstr ""
-
#. module: account
#: help:account.tax,amount:0
msgid "For taxes of type percentage, enter % ratio between 0-1."
@@ -6100,11 +6080,6 @@ msgstr ""
msgid "Lines"
msgstr ""
-#. module: account
-#: model:account.journal,name:account.bank_journal
-msgid "Bank Journal - (test)"
-msgstr ""
-
#. module: account
#: code:addons/account/invoice.py:0
#, python-format
@@ -6131,11 +6106,6 @@ msgstr ""
msgid "Parent Account Template"
msgstr ""
-#. module: account
-#: model:account.account.type,name:account.account_type_income
-msgid "Erfolgskonten - Erlöse"
-msgstr ""
-
#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement.line,statement_id:0
@@ -6212,6 +6182,11 @@ msgstr ""
msgid "Unknown Partner"
msgstr ""
+#. module: account
+#: view:account.bank.statement:0
+msgid "Opening Balance"
+msgstr ""
+
#. module: account
#: help:account.journal,centralisation:0
msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
@@ -6247,6 +6222,11 @@ msgstr ""
msgid "Confirm"
msgstr ""
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid "Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number."
+msgstr ""
+
#. module: account
#: help:account.tax,domain:0
#: help:account.tax.template,domain:0
@@ -6354,6 +6334,11 @@ msgstr ""
msgid "You can not have two open register for the same journal"
msgstr ""
+#. module: account
+#: report:account.invoice:0
+msgid "Must be after setLang()"
+msgstr ""
+
#. module: account
#: view:account.payment.term.line:0
msgid " day of the month= -1"
@@ -6447,11 +6432,6 @@ msgstr ""
msgid "No piece number !"
msgstr ""
-#. module: account
-#: model:account.journal,name:account.expenses_journal
-msgid "Expenses Journal - (test)"
-msgstr ""
-
#. module: account
#: view:product.product:0
#: view:product.template:0
@@ -6526,11 +6506,6 @@ msgstr ""
msgid "Sale Taxes"
msgstr ""
-#. module: account
-#: model:account.journal,name:account.sales_journal
-msgid "Sales Journal - (test)"
-msgstr ""
-
#. module: account
#: model:account.account.type,name:account.account_type_cash_moves
#: selection:account.analytic.journal,type:0
@@ -6600,6 +6575,16 @@ msgstr ""
msgid " number of days: 14"
msgstr ""
+#. module: account
+#: model:account.account.type,name:account.account_type_asset
+msgid "Asset"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid " 7 Days "
+msgstr ""
+
#. module: account
#: field:account.partner.reconcile.process,progress:0
msgid "Progress"
@@ -6691,11 +6676,6 @@ msgstr ""
msgid "Amount (in words) :"
msgstr ""
-#. module: account
-#: model:account.account.type,name:account.account_type_other
-msgid "Jahresabschlusskonten u. Statistik"
-msgstr ""
-
#. module: account
#: field:account.bank.statement.line,partner_id:0
#: view:account.entries.report:0
@@ -6928,11 +6908,6 @@ msgstr ""
msgid "Accounting and Financial Management"
msgstr ""
-#. module: account
-#: model:process.node,name:account.process_node_manually0
-msgid "Manually"
-msgstr ""
-
#. module: account
#: field:account.automatic.reconcile,period_id:0
#: view:account.bank.statement:0
@@ -7055,6 +7030,11 @@ msgstr ""
msgid "Account Common Report"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid "This menu helps you manage the credit notes issued/to be issued for your customers. A refund invoice is a document that cancels an invoice or a part of it. You can easily generate refunds and reconcile them from the invoice form."
+msgstr ""
+
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
msgid "Automatic import of the bank sta"
@@ -7315,6 +7295,16 @@ msgstr ""
msgid "Unique number of the invoice, computed automatically when the invoice is created."
msgstr ""
+#. module: account
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_expense
+msgid "Expense"
+msgstr ""
+
#. module: account
#: code:addons/account/account_move_line.py:0
#, python-format
@@ -8566,8 +8556,13 @@ msgid "End period"
msgstr ""
#. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid "Warning"
msgstr ""
#. module: account
@@ -8704,8 +8699,8 @@ msgid "Account Tax Code Template"
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_expense
-msgid "Erfolgskonten - Aufwendungen"
+#: model:process.node,name:account.process_node_manually0
+msgid "Manually"
msgstr ""
#. module: account
@@ -8760,11 +8755,6 @@ msgstr ""
msgid "Billing"
msgstr ""
-#. module: account
-#: model:account.journal,name:account.check_journal
-msgid "Checks Journal - (test)"
-msgstr ""
-
#. module: account
#: view:account.account:0
msgid "Parent Account"
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index 43c1c0b6236..d173ea2eaab 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,14 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: account_accountant
+#: model:ir.module.module,description:account_accountant.module_meta_information
+msgid "\n"
+"This module gives the admin user the access to all the accounting features like the journal\n"
+"items and the chart of accounts.\n"
+" "
+msgstr ""
+
#. module: account_accountant
#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
msgid "Accountant"
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index 3b7199e52b5..b32bfc2a40c 100644
--- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,6 +46,18 @@ msgstr ""
msgid "Date of the last invoice created for this analytic account."
msgstr ""
+#. module: account_analytic_analysis
+#: model:ir.module.module,description:account_analytic_analysis.module_meta_information
+msgid "\n"
+"This module is for modifying account analytic view to show\n"
+"important data to project manager of services companies.\n"
+"Adds menu to show relevant information to each manager..\n"
+"\n"
+"You can also view the report of account analytic summary\n"
+"user-wise as well as month wise.\n"
+""
+msgstr ""
+
#. module: account_analytic_analysis
#: field:account.analytic.account,last_invoice_date:0
msgid "Last Invoice Date"
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index 82d696158ae..f75a5d720e9 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -67,11 +67,6 @@ msgstr ""
msgid "select a company which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this company, it will automatically take this as an analytical account)"
msgstr ""
-#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_sale_order_line
-msgid "Sale Order Line"
-msgstr ""
-
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytical Account"
@@ -122,6 +117,18 @@ msgstr ""
msgid "Analytic Defaults"
msgstr ""
+#. module: account_analytic_default
+#: model:ir.module.module,description:account_analytic_default.module_meta_information
+msgid "\n"
+"Allows to automatically select analytic accounts based on criterions:\n"
+"* Product\n"
+"* Partner\n"
+"* User\n"
+"* Company\n"
+"* Date\n"
+" "
+msgstr ""
+
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
msgid "select a product which will use analytical account specified in analytic default (eg. create new cutomer invoice or Sale order if we select this product, it will automatically take this as an analytical account)"
@@ -164,3 +171,8 @@ msgstr ""
msgid "Gives the sequence order when displaying a list of analytic distribution"
msgstr ""
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index 60fe4bf9f86..a92c5097bbd 100644
--- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot
+++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,18 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account4_ids:0
-msgid "Account4 Id"
+#: view:analytic.plan.create.model:0
+msgid "This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
msgstr ""
#. module: account_analytic_plans
@@ -28,26 +38,6 @@ msgstr ""
msgid "Crossovered Analytic"
msgstr ""
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account5_ids:0
-msgid "Account5 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date2:0
-msgid "End Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,rate:0
-msgid "Rate (%)"
-msgstr ""
-
#. module: account_analytic_plans
#: view:account.analytic.plan:0
#: field:account.analytic.plan,name:0
@@ -59,95 +49,8 @@ msgid "Analytic Plan"
msgstr ""
#. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "This distribution model has been saved.You will be able to reuse it later."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Please put a name and a code before saving the model !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
-msgid "Analytic Instance Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-msgid "Print"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "To Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,plan_id:0
-msgid "Plan Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
-msgid "Analytic Distribution's Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Account Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,code:0
-msgid "Distribution Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_sale_order_line
-msgid "Sale Order Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,empty_line:0
-msgid "Dont show empty lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "A model having this name and code already exists !"
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
msgstr ""
#. module: account_analytic_plans
@@ -157,27 +60,125 @@ msgstr ""
msgid "Analytic Journal"
msgstr ""
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "100.00%"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Currency"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account :"
-msgstr ""
-
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
msgid "Analytic Plan Line"
msgstr ""
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr ""
+
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
@@ -185,30 +186,8 @@ msgid "No analytic plan defined !"
msgstr ""
#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account Reference:"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan,default_instance_id:0
-msgid "Default Entries"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Error"
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
msgstr ""
#. module: account_analytic_plans
@@ -224,66 +203,14 @@ msgstr ""
msgid "User Error"
msgstr ""
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
-msgid "analytic.plan.create.model"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account1_ids:0
-msgid "Account1 Id"
-msgstr ""
-
#. module: account_analytic_plans
#: field:account.analytic.plan.line,max_required:0
msgid "Maximum Allowed (%)"
msgstr ""
#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#: view:analytic.plan.create.model:0
-#, python-format
-msgid "Distribution Model Saved"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
-msgid "Analytic Plan Instance"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
-msgid "Distribution Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "Ok"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
msgstr ""
#. module: account_analytic_plans
@@ -292,49 +219,69 @@ msgid "Analytic Plan Lines"
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
msgstr ""
#. module: account_analytic_plans
#: code:addons/account_analytic_plans/account_analytic_plans.py:0
#, python-format
-msgid "The Total Should be Between %s and %s"
+msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
-msgid "Bank Statement Line"
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
msgstr ""
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
-msgid "Print Crossovered Analytic"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
+msgid "Analytic Account :"
msgstr ""
#. module: account_analytic_plans
@@ -371,6 +318,53 @@ msgid "This module allows to use several analytic plans, according to the genera
" "
msgstr ""
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr ""
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
+msgstr ""
+
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
msgid "Save This Distribution as a Model"
@@ -382,29 +376,14 @@ msgid "Quantity"
msgstr ""
#. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
-msgid "Multi Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account_ids:0
-msgid "Account Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_journal
-msgid "Journal"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
#, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
msgstr ""
#. module: account_analytic_plans
@@ -413,24 +392,71 @@ msgstr ""
msgid "No Analytic Journal !"
msgstr ""
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
-msgid "Invoice Line"
-msgstr ""
-
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
msgid "Bank Statement"
msgstr ""
#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
msgstr ""
#. module: account_analytic_plans
@@ -445,40 +471,39 @@ msgid "Analytic Distribution"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "Value Error"
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
msgstr ""
#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
msgstr ""
#. module: account_analytic_plans
-#: field:account.crossovered.analytic,ref:0
-msgid "Analytic Account Reference"
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
msgstr ""
#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice
-msgid "Invoice"
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
msgstr ""
#. module: account_analytic_plans
#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
+msgid "The name of the journal must be unique per company !"
msgstr ""
#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-#: view:analytic.plan.create.model:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "Value Error"
msgstr ""
#. module: account_analytic_plans
@@ -486,18 +511,3 @@ msgstr ""
msgid "You can not create move line on view account."
msgstr ""
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "at"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Company"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "From Date"
-msgstr ""
-
diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
index 4c490b924f1..f96013a9b3a 100644
--- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
+++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
+#: view:product.category:0
+msgid " Accounting Property"
msgstr ""
#. module: account_anglo_saxon
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
msgstr ""
#. module: account_anglo_saxon
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index 98dd022769e..e2ea514a5cf 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -118,6 +118,7 @@ msgid "Status"
msgstr ""
#. module: account_budget
+#: report:account.budget:0
#: report:crossovered.budget.report:0
msgid "%"
msgstr ""
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index d6c036e31f1..ed064edbdf1 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid "\n"
+" Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices.\n"
+" "
+msgstr ""
+
#. module: account_cancel
#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
msgid "Account Cancel"
diff --git a/addons/account_chart/i18n/account_chart.pot b/addons/account_chart/i18n/account_chart.pot
index 0bf5b9ad036..bd19519e330 100644
--- a/addons/account_chart/i18n/account_chart.pot
+++ b/addons/account_chart/i18n/account_chart.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,3 +20,8 @@ msgstr ""
msgid "Remove minimal account chart"
msgstr ""
+#. module: account_chart
+#: model:ir.module.module,shortdesc:account_chart.module_meta_information
+msgid "Charts of Accounts"
+msgstr ""
+
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot
index 2c8a3d548e0..899ae288af1 100644
--- a/addons/account_coda/i18n/account_coda.pot
+++ b/addons/account_coda/i18n/account_coda.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:39+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:39+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -154,6 +154,14 @@ msgstr ""
msgid "Import Coda Statement"
msgstr ""
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid "\n"
+" Module provides functionality to import\n"
+" bank statements from coda files.\n"
+" "
+msgstr ""
+
#. module: account_coda
#: view:account.coda:0
msgid "Statements"
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index e30aaca5f2f..21661cfbf8e 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -54,9 +54,13 @@ msgid "Group By..."
msgstr ""
#. module: account_followup
-#: view:res.company:0
-#: field:res.company,follow_up_msg:0
-msgid "Follow-up Message"
+#: code:addons/account_followup/wizard/account_followup_print.py:0
+#, python-format
+msgid "\n"
+"\n"
+"E-Mail sent to following Partners successfully. !\n"
+"\n"
+""
msgstr ""
#. module: account_followup
@@ -145,6 +149,12 @@ msgstr ""
msgid "%(heading)s: Move line header"
msgstr ""
+#. module: account_followup
+#: view:res.company:0
+#: field:res.company,follow_up_msg:0
+msgid "Follow-up Message"
+msgstr ""
+
#. module: account_followup
#: field:account.followup.print,followup_id:0
msgid "Follow-up"
diff --git a/addons/account_invoice_layout/i18n/account_invoice_layout.pot b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
index ad33fb6a6fa..f274428d5e0 100644
--- a/addons/account_invoice_layout/i18n/account_invoice_layout.pot
+++ b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,8 +72,18 @@ msgid "Unit Price"
msgstr ""
#. module: account_invoice_layout
-#: model:notify.message,msg:account_invoice_layout.demo_message1
-msgid "Be Expert with the Experts..."
+#: model:ir.module.module,description:account_invoice_layout.module_meta_information
+msgid "\n"
+" This module provides some features to improve the layout of the invoices.\n"
+"\n"
+" It gives you the possibility to\n"
+" * order all the lines of an invoice\n"
+" * add titles, comment lines, sub total lines\n"
+" * draw horizontal lines and put page breaks\n"
+"\n"
+" Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions...\n"
+"\n"
+" "
msgstr ""
#. module: account_invoice_layout
@@ -114,6 +124,11 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
#. module: account_invoice_layout
#: help:account.invoice.line,sequence:0
msgid "Gives the sequence order when displaying a list of invoice lines."
@@ -143,8 +158,8 @@ msgid "Source Account"
msgstr ""
#. module: account_invoice_layout
-#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
-msgid "Write Messages"
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
msgstr ""
#. module: account_invoice_layout
@@ -304,8 +319,8 @@ msgid "Fax :"
msgstr ""
#. module: account_invoice_layout
-#: view:account.invoice.special.msg:0
-msgid "Cancel"
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "Be Expert with the Experts..."
msgstr ""
#. module: account_invoice_layout
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index e6fea3a69df..0a27f881a59 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,15 @@ msgstr ""
msgid "Group By..."
msgstr ""
+#. module: account_payment
+#: model:ir.module.module,description:account_payment.module_meta_information
+msgid "\n"
+"This module provides :\n"
+"* a more efficient way to manage invoice payment.\n"
+"* a basic mechanism to easily plug various automated payment.\n"
+" "
+msgstr ""
+
#. module: account_payment
#: field:payment.order,line_ids:0
msgid "Payment lines"
diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot
index 42f81e83cbc..4d32e3e4cc2 100644
--- a/addons/account_sequence/i18n/account_sequence.pot
+++ b/addons/account_sequence/i18n/account_sequence.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,6 +47,13 @@ msgstr ""
msgid "Increment Number"
msgstr ""
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid "\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+
#. module: account_sequence
#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
msgid "Entries Sequence Numbering"
@@ -63,8 +70,8 @@ msgid "Configure Your Account Sequence Application"
msgstr ""
#. module: account_sequence
-#: view:account.sequence.installer:0
-msgid "Configure"
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
msgstr ""
#. module: account_sequence
@@ -139,8 +146,8 @@ msgid "account.sequence.installer"
msgstr ""
#. module: account_sequence
-#: field:account.sequence.installer,progress:0
-msgid "Configuration Progress"
+#: view:account.sequence.installer:0
+msgid "Configure"
msgstr ""
#. module: account_sequence
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index 9421681b8ee..d08e78fa72a 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,12 @@ msgstr ""
msgid "Unreconciliation transactions"
msgstr ""
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:0
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Ref"
@@ -31,7 +37,6 @@ msgid "Open Customer Journal Entries"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Particulars"
msgstr ""
@@ -47,11 +52,6 @@ msgstr ""
msgid "Cannot delete Voucher(s) which are already opened or paid !"
msgstr ""
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-msgid "Ref. :"
-msgstr ""
-
#. module: account_voucher
#: view:account.voucher:0
msgid "Supplier"
@@ -117,6 +117,11 @@ msgstr ""
msgid "Set to Draft"
msgstr ""
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr ""
+
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
msgid "Unreconcile entries"
@@ -225,12 +230,6 @@ msgstr ""
msgid "Date payment"
msgstr ""
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Receiver's Signature"
-msgstr ""
-
#. module: account_voucher
#: model:ir.model,name:account_voucher.model_account_bank_statement_line
msgid "Bank Statement Line"
@@ -254,35 +253,26 @@ msgid "Tax"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,writeoff_journal_id:0
-msgid "Write-Off journal"
-msgstr ""
-
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Amount (in words) :"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,analytic_id:0
#: field:account.voucher.line,account_analytic_id:0
msgid "Analytic Account"
msgstr ""
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-msgid "Journal:"
-msgstr ""
-
#. module: account_voucher
#: constraint:account.move.line:0
msgid "You can not create move line on receivable/payable account without partner"
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Payment Information"
+#: help:account.voucher,state:0
+msgid " * The 'Draft' state is used when a user is encoding a new and unconfirmed Voucher. \n"
+"* The 'Pro-forma' when voucher is in Pro-forma state,voucher does not have an voucher number. \n"
+"* The 'Posted' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \n"
+"* The 'Cancelled' state is used when user cancel voucher."
msgstr ""
#. module: account_voucher
@@ -309,8 +299,8 @@ msgid "You have to configure account base code and account tax code on the '%s'
msgstr ""
#. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Later or Group Funds"
msgstr ""
#. module: account_voucher
@@ -319,18 +309,21 @@ msgid "Receipt"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "On Account of :"
msgstr ""
+#. module: account_voucher
+#: field:account.voucher,writeoff_amount:0
+msgid "Write-Off Amount"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Sales Lines"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Date:"
msgstr ""
@@ -375,9 +368,8 @@ msgid "Vouchers Entries"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Authorised Signatory"
+#: field:account.voucher,name:0
+msgid "Memo"
msgstr ""
#. module: account_voucher
@@ -404,9 +396,8 @@ msgid "Unreconciliation"
msgstr ""
#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "supplier Payment"
+#: field:account.voucher,tax_amount:0
+msgid "Tax Amount"
msgstr ""
#. module: account_voucher
@@ -423,8 +414,8 @@ msgid "No Account Base Code and Account Tax Code!"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,tax_amount:0
-msgid "Tax Amount"
+#: view:account.voucher:0
+msgid "Payment Information"
msgstr ""
#. module: account_voucher
@@ -437,6 +428,16 @@ msgstr ""
msgid "Paid Amount"
msgstr ""
+#. module: account_voucher
+#: field:account.voucher,payment_option:0
+msgid "Payment Difference"
+msgstr ""
+
+#. module: account_voucher
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
#. module: account_voucher
#: selection:account.voucher,pay_now:0
msgid "Pay Directly"
@@ -470,21 +471,20 @@ msgid "Payable and Receivables"
msgstr ""
#. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Later or Group Funds"
+#: report:voucher.print:0
+msgid "Account :"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Draft"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,writeoff_acc_id:0
-msgid "Write-Off account"
+#: field:account.voucher,type:0
+msgid "Default Type"
msgstr ""
#. module: account_voucher
@@ -493,7 +493,6 @@ msgid "Currency:"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "PRO-FORMA"
msgstr ""
@@ -518,11 +517,6 @@ msgstr ""
msgid "Audit Complete ?"
msgstr ""
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "supplier"
-msgstr ""
-
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Terms"
@@ -550,8 +544,8 @@ msgid "Extended Filters..."
msgstr ""
#. module: account_voucher
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
+#: report:voucher.print:0
+msgid "Number:"
msgstr ""
#. module: account_voucher
@@ -559,6 +553,11 @@ msgstr ""
msgid "Amount reconciled"
msgstr ""
+#. module: account_voucher
+#: field:account.voucher,analytic_id:0
+msgid "Write-Off Analytic Account"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Expense Lines"
@@ -569,11 +568,6 @@ msgstr ""
msgid "Previous Payments ?"
msgstr ""
-#. module: account_voucher
-#: field:account.voucher,comment:0
-msgid "Comment"
-msgstr ""
-
#. module: account_voucher
#: model:ir.actions.act_window,name:account_voucher.action_voucher_list
#: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
@@ -587,7 +581,6 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher.line,type:0
-#: report:voucher.cash_receipt.drcr:0
msgid "Credit"
msgstr ""
@@ -598,14 +591,14 @@ msgid "Please define a sequence on the journal !"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Through :"
msgstr ""
#. module: account_voucher
-#: selection:account.voucher,payment_option:0
-msgid "Without Write-off"
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
@@ -624,9 +617,8 @@ msgid "Bill Date"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
msgstr ""
#. module: account_voucher
@@ -655,14 +647,8 @@ msgstr ""
msgid "Sales Information"
msgstr ""
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "Open supplier Journal Entries"
-msgstr ""
-
#. module: account_voucher
#: field:account.voucher.line,voucher_id:0
-#: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
#: model:res.request.link,name:account_voucher.req_link_voucher
msgid "Voucher"
msgstr ""
@@ -723,7 +709,6 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher.line,type:0
-#: report:voucher.cash_receipt.drcr:0
msgid "Debit"
msgstr ""
@@ -732,6 +717,11 @@ msgstr ""
msgid "Are you sure to confirm this record ?"
msgstr ""
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Reconcile with Write-Off"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Method"
@@ -743,16 +733,10 @@ msgid "Description"
msgstr ""
#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Canceled"
msgstr ""
-#. module: account_voucher
-#: view:account.voucher:0
-msgid "supplier Invoices and Outstanding transactions"
-msgstr ""
-
#. module: account_voucher
#: field:account.statement.from.invoice,journal_ids:0
#: view:account.voucher:0
@@ -760,16 +744,6 @@ msgstr ""
msgid "Journal"
msgstr ""
-#. module: account_voucher
-#: field:account.voucher,payment_option:0
-msgid "Payment Option"
-msgstr ""
-
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-msgid "-"
-msgstr ""
-
#. module: account_voucher
#: view:account.voucher:0
msgid "Internal Notes"
@@ -782,12 +756,6 @@ msgid "Credits"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,writeoff_amount:0
-msgid "Writeoff Amount"
-msgstr ""
-
-#. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "State:"
msgstr ""
@@ -804,7 +772,6 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
-#: report:voucher.cash_receipt.drcr:0
#: report:voucher.print:0
msgid "Posted"
msgstr ""
@@ -815,13 +782,18 @@ msgid "Customer"
msgstr ""
#. module: account_voucher
-#: selection:account.voucher,payment_option:0
-msgid "With Write-off"
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,type:0
-msgid "Default Type"
+#: view:account.voucher:0
+msgid "Supplier Invoices and Outstanding transactions"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
msgstr ""
#. module: account_voucher
@@ -840,6 +812,11 @@ msgstr ""
msgid "Effective date for accounting entries"
msgstr ""
+#. module: account_voucher
+#: selection:account.voucher,payment_option:0
+msgid "Keep Open"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher.unreconcile:0
msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
@@ -862,11 +839,6 @@ msgstr ""
msgid "Total"
msgstr ""
-#. module: account_voucher
-#: field:account.voucher,name:0
-msgid "Memo"
-msgstr ""
-
#. module: account_voucher
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index a8a20895e33..b7168d550db 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -61,6 +61,18 @@ msgstr ""
msgid "Debit"
msgstr ""
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid "* When an account is created its in 'Draft' state. \n"
+"* If any associated partner is there, it can be in 'Open' state. \n"
+"* If any pending balance is there it can be in 'Pending'. \n"
+"* And finally when all the transactions are over, it can be in 'Close' state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. If its in 'Running' state it is a normal project. \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
#. module: analytic
#: field:account.analytic.account,type:0
msgid "Account Type"
diff --git a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
index a7dc4543796..b60207b0480 100644
--- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+++ b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,17 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: analytic_journal_billing_rate
+#: model:ir.module.module,description:analytic_journal_billing_rate.module_meta_information
+msgid "\n"
+"\n"
+" This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.\n"
+"\n"
+" Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations.\n"
+"\n"
+" "
+msgstr ""
+
#. module: analytic_journal_billing_rate
#: field:analytic_journal_rate_grid,journal_id:0
msgid "Analytic Journal"
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index fde40a298a6..ff2e4d75cf5 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -60,8 +60,14 @@ msgid "Relation table between users and products on a analytic account"
msgstr ""
#. module: analytic_user_function
-#: constraint:account.analytic.account:0
-msgid "Error! You can not create recursive analytic accounts."
+#: model:ir.module.module,description:analytic_user_function.module_meta_information
+msgid "\n"
+"\n"
+" This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available.\n"
+"\n"
+" Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations.\n"
+"\n"
+" "
msgstr ""
#. module: analytic_user_function
@@ -69,6 +75,11 @@ msgstr ""
msgid "Analytic User Function"
msgstr ""
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
#. module: analytic_user_function
#: view:analytic_user_funct_grid:0
msgid "User's Product for this Analytic Account"
diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot
index 7fe0dfc2d9e..589397256a6 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -86,6 +86,7 @@ msgid "Expenses Tracking"
msgstr ""
#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
#: view:profile.association.config.install_modules_wizard:0
msgid "Association Application Configuration"
msgstr ""
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 92dc5cc4a3c..2366d44d9d5 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:45+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:45+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1795,6 +1795,24 @@ msgstr ""
msgid "Estimation"
msgstr ""
+#. module: auction
+#: model:ir.module.module,description:auction.module_meta_information
+msgid "\n"
+" This module manages the records of the artists,\n"
+" the articles to be put up for auction,the buyers and\n"
+" sellers.\n"
+"\n"
+" It completely manages an auction such as managing bids,\n"
+" keeping track of the sold articles along with the paid\n"
+" and unpaid objects including delivery of the articles.\n"
+" Dashboards for auction that includes:\n"
+" * My Latest Objects (list)\n"
+" * My Latest Deposits (list)\n"
+" * Objects Statistics (list)\n"
+" * My Objects By Day (list)\n"
+" "
+msgstr ""
+
#. module: auction
#: view:auction.taken:0
msgid "OK"
diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot
index 06d97b42a7e..2ed7f56e9cc 100644
--- a/addons/audittrail/i18n/audittrail.pot
+++ b/addons/audittrail/i18n/audittrail.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:04:46+0000\n"
-"PO-Revision-Date: 2010-12-15 15:04:46+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -205,6 +205,18 @@ msgstr ""
msgid "Log Workflow"
msgstr ""
+#. module: audittrail
+#: model:ir.module.module,description:audittrail.module_meta_information
+msgid "\n"
+" This module gives the administrator the rights\n"
+" to track every user operation on all the objects\n"
+" of the system.\n"
+"\n"
+" Administrator can subscribe rules for read,write and\n"
+" delete on objects and can check logs.\n"
+" "
+msgstr ""
+
#. module: audittrail
#: field:audittrail.rule,log_read:0
msgid "Log Reads"
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index b7a65cea8a2..d2cf7a727e8 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:00+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:00+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:45+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:45+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -366,6 +366,11 @@ msgstr ""
msgid "%(partner_email)s = Partner Email"
msgstr ""
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr ""
+
#. module: base_action_rule
#: view:base.action.rule:0
msgid "%(object_user_email)s = Responsible Email"
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 219fbb8c42d..2a3288152e2 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:02+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:02+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -582,11 +582,6 @@ msgstr ""
msgid "Created"
msgstr ""
-#. module: base_calendar
-#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
-msgid "Set Exclude range"
-msgstr ""
-
#. module: base_calendar
#: selection:calendar.event,class:0
#: selection:calendar.todo,class:0
@@ -827,6 +822,7 @@ msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
msgid "Set Exrule"
msgstr ""
@@ -913,11 +909,9 @@ msgid "User"
msgstr ""
#. module: base_calendar
-#: field:calendar.alarm,active:0
-#: field:calendar.event,active:0
-#: field:calendar.todo,active:0
-#: field:res.alarm,active:0
-msgid "Active"
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
msgstr ""
#. module: base_calendar
@@ -1024,9 +1018,11 @@ msgid "Summary"
msgstr ""
#. module: base_calendar
-#: view:calendar.event:0
-#: field:calendar.event,date:0
-msgid "Date"
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
msgstr ""
#. module: base_calendar
@@ -1515,6 +1511,13 @@ msgstr ""
msgid "Accept"
msgstr ""
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
#. module: base_calendar
#: view:calendar.attendee:0
msgid "Invitation To"
@@ -1555,10 +1558,10 @@ msgid "Trigger Date"
msgstr ""
#. module: base_calendar
-#: selection:base.calendar.set.exrule,week_list:0
-#: selection:calendar.event,week_list:0
-#: selection:calendar.todo,week_list:0
-msgid "Saturday"
+#: help:calendar.alarm,attach:0
+msgid "* Points to a sound resource, which is rendered when the alarm is triggered for audio,\n"
+" * File which is intended to be sent as message attachments for email,\n"
+" * Points to a procedure resource, which is invoked when the alarm is triggered for procedure."
msgstr ""
#. module: base_calendar
diff --git a/addons/base_contact/i18n/base_contact.pot b/addons/base_contact/i18n/base_contact.pot
index 07ed51bcf0e..054498cbe45 100644
--- a/addons/base_contact/i18n/base_contact.pot
+++ b/addons/base_contact/i18n/base_contact.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:02+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:02+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -123,6 +123,24 @@ msgstr ""
msgid "If the active field is set to False, it will allow you to hide the partner contact without removing it."
msgstr ""
+#. module: base_contact
+#: model:ir.module.module,description:base_contact.module_meta_information
+msgid "\n"
+" This module allows you to manage your contacts entirely.\n"
+"\n"
+" It lets you define\n"
+" *contacts unrelated to a partner,\n"
+" *contacts working at several addresses (possibly for different partners),\n"
+" *contacts with possibly different functions for each of its job's addresses\n"
+"\n"
+" It also adds new menu items located in\n"
+" Partners \\ Contacts\n"
+" Partners \\ Functions\n"
+"\n"
+" Pay attention that this module converts the existing addresses into \"addresses + contacts\". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.\n"
+" "
+msgstr ""
+
#. module: base_contact
#: model:ir.module.module,shortdesc:base_contact.module_meta_information
#: model:process.process,name:base_contact.process_process_basecontactprocess0
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index c6ac6a13e2c..f63798c1745 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,6 +51,14 @@ msgstr ""
msgid "bic"
msgstr ""
+#. module: base_iban
+#: model:ir.module.module,description:base_iban.module_meta_information
+msgid "\n"
+"This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity\n"
+"\n"
+" "
+msgstr ""
+
#. module: base_iban
#: model:res.partner.bank.type.field,name:base_iban.bank_iban_field
msgid "iban"
@@ -67,11 +75,6 @@ msgstr ""
msgid "IBAN"
msgstr ""
-#. module: base_iban
-#: sql_constraint:res.partner.bank:0
-msgid "The BVR adherent number must be unique !"
-msgstr ""
-
#. module: base_iban
#: model:res.partner.bank.type,name:base_iban.bank_iban
msgid "IBAN Account"
diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
index b34f55bba6c..3a2ad652ffe 100644
--- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
+++ b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,8 +41,13 @@ msgid "Please choose a file where the Technical Guide will be written."
msgstr ""
#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
+#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
+msgid "\n"
+" * This module generates the Technical Guides of selected modules in Restructured Text format (RST)\n"
+" * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
+" * It creates a tarball (.tgz file suffix) containing an index file and one file per module\n"
+" * Generates Relationship Graph\n"
+" "
msgstr ""
#. module: base_module_doc_rst
@@ -67,6 +72,11 @@ msgstr ""
msgid "Relationship Graph"
msgstr ""
+#. module: base_module_doc_rst
+#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
+msgid "Module"
+msgstr ""
+
#. module: base_module_doc_rst
#: wizard_field:tech.guide.rst,init,rst_file:0
msgid "file"
diff --git a/addons/base_module_quality/i18n/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot
index 64d2369dfbf..1ddd822cdc7 100644
--- a/addons/base_module_quality/i18n/base_module_quality.pot
+++ b/addons/base_module_quality/i18n/base_module_quality.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -427,6 +427,14 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#. module: base_module_quality
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#, python-format
+msgid "\n"
+"PEP-8 Test , copyright of py files check, method can not call from loops\n"
+""
+msgstr ""
+
#. module: base_module_quality
#: field:module.quality.check,final_score:0
msgid "Final Score (%)"
diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot
index 86bc4190d82..364cefca5ab 100644
--- a/addons/base_module_record/i18n/base_module_record.pot
+++ b/addons/base_module_record/i18n/base_module_record.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:04+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:04+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -264,3 +264,24 @@ msgstr ""
msgid "Created & Modified"
msgstr ""
+#. module: base_module_record
+#: model:ir.module.module,description:base_module_record.module_meta_information
+msgid "\n"
+"This module allows you to create a new module without any development.\n"
+"It records all operations on objects during the recording session and\n"
+"produce a .ZIP module. So you can create your own module directly from\n"
+"the OpenERP client.\n"
+"\n"
+"This version works for creating and updating existing records. It recomputes\n"
+"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
+"It also support workflows and demo/update data.\n"
+"\n"
+"This should help you to easily create reusable and publishable modules\n"
+"for custom configurations and demo/testing data.\n"
+"\n"
+"How to use it:\n"
+"Run Administration/Customization/Module Creation/Export Customizations As a Module wizard.\n"
+"Select datetime criteria of recording and objects to be recorded and Record module.\n"
+" "
+msgstr ""
+
diff --git a/addons/base_report_creator/i18n/base_report_creator.pot b/addons/base_report_creator/i18n/base_report_creator.pot
index a1fc33f1592..c51b850f21c 100644
--- a/addons/base_report_creator/i18n/base_report_creator.pot
+++ b/addons/base_report_creator/i18n/base_report_creator.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:04+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:04+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -169,6 +169,7 @@ msgid "Form"
msgstr ""
#. module: base_report_creator
+#: selection:base_report_creator.report,view_type2:0
#: selection:base_report_creator.report,view_type3:0
#: selection:base_report_creator.report.fields,calendar_mode:0
#: selection:base_report_creator.report.fields,graph_mode:0
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
index 3a898c8b96b..8caa4b3ec9e 100644
--- a/addons/base_report_designer/i18n/base_report_designer.pot
+++ b/addons/base_report_designer/i18n/base_report_designer.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,19 @@ msgstr ""
msgid "Upload the modified report"
msgstr ""
+#. module: base_report_designer
+#: model:ir.module.module,description:base_report_designer.module_meta_information
+msgid "\n"
+"This module is used along with OpenERP OpenOffice plugin.\n"
+"You have to first install the plugin which is available at\n"
+"http://www.openerp.com\n"
+"\n"
+"This module adds wizards to Import/Export .sxw report that\n"
+"you can modify in OpenOffice.Once you have modified it you can\n"
+"upload the report using the same wizard.\n"
+""
+msgstr ""
+
#. module: base_report_designer
#: view:base.report.file.sxw:0
msgid "The .SXW report"
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index a1403b195f3..fe053c831df 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -169,6 +169,23 @@ msgstr ""
msgid "Knowledge Management"
msgstr ""
+#. module: base_setup
+#: model:ir.module.module,description:base_setup.module_meta_information
+msgid "\n"
+" This module implements a configuration system that helps user\n"
+" to configure the system at the installation of a new database.\n"
+"\n"
+" It allows you to select between a list of profiles to install:\n"
+" * Minimal profile\n"
+" * Accounting only\n"
+" * Services companies\n"
+" * Manufacturing companies\n"
+"\n"
+" It also asks screens to help easily configure your company, the header and\n"
+" footer, the account chart to install and the language.\n"
+" "
+msgstr ""
+
#. module: base_setup
#: help:base.setup.installer,product_expiry:0
msgid "Installs a preselected set of OpenERP applications which will help you manage your industry."
diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot
index 0c8fc5a760b..39cd7a700e6 100644
--- a/addons/base_synchro/i18n/base_synchro.pot
+++ b/addons/base_synchro/i18n/base_synchro.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -164,6 +164,11 @@ msgstr ""
msgid "Synchronized instances"
msgstr ""
+#. module: base_synchro
+#: field:base.synchro.obj,active:0
+msgid "Active"
+msgstr ""
+
#. module: base_synchro
#: view:base.synchro.obj:0
#: field:base.synchro.obj,model_id:0
diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot
index 8be06e1513a..f6e7b0230d3 100644
--- a/addons/base_tools/i18n/base_tools.pot
+++ b/addons/base_tools/i18n/base_tools.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,3 +20,9 @@ msgstr ""
msgid "Common base for tools modules"
msgstr ""
+#. module: base_tools
+#: model:ir.module.module,description:base_tools.module_meta_information
+msgid "\n"
+" "
+msgstr ""
+
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 8dd73472696..74687ff0de1 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,16 @@ msgstr ""
msgid "The Vat does not seems to be correct. You should have entered something like this %s"
msgstr ""
+#. module: base_vat
+#: model:ir.module.module,description:base_vat.module_meta_information
+msgid "\n"
+" Enable the VAT Number for the partner. Check the validity of that VAT Number.\n"
+"\n"
+" This module follows the methods stated at http://sima-pc.com/nif.php for\n"
+" checking the validity of VAT Number assigned to partners in European countries.\n"
+" "
+msgstr ""
+
#. module: base_vat
#: model:ir.module.module,shortdesc:base_vat.module_meta_information
msgid "Base VAT - To check VAT number validity"
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index b7a307f554c..f5555892a60 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:52+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -224,6 +224,11 @@ msgstr ""
msgid "Parent Menu"
msgstr ""
+#. module: board
+#: view:res.log.report:0
+msgid " Month-1 "
+msgstr ""
+
#. module: board
#: selection:res.log.report,month:0
msgid "January"
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
index 92e74c21dcf..4ee66ba785a 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -194,6 +194,29 @@ msgstr ""
msgid "Calendar attributes"
msgstr ""
+#. module: caldav
+#: model:ir.module.module,description:caldav.module_meta_information
+msgid "\n"
+" This module Contains basic functionality for caldav system like: \n"
+" - Webdav server that provides remote access to calendar\n"
+" - Synchronisation of calendar using WebDAV\n"
+" - Customize calendar event and todo attribute with any of OpenERP model\n"
+" - Provides iCal Import/Export functionality\n"
+"\n"
+" To access Calendars using CalDAV clients, point them to:\n"
+" http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
+"\n"
+" To access OpenERP Calendar using WebCal to remote site use the URL like:\n"
+" http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
+"\n"
+" Where,\n"
+" HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
+" PORT : Port on which OpenERP server is running (By Default : 8069)\n"
+" DATABASE_NAME: Name of database on which OpenERP Calendar is created\n"
+" CALENDAR_NAME: Name of calendar to access\n"
+""
+msgstr ""
+
#. module: caldav
#: field:basic.calendar,create_date:0
msgid "Created Date"
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index d428e62b19a..833d0530e69 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:54+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: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr ""
+
#. module: claim_from_delivery
#: model:ir.module.module,description:claim_from_delivery.module_meta_information
msgid "Create Claim from delivery order:\n"
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 57075843603..fc2b38dcfb1 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -38,7 +38,7 @@ CRM_LEAD_PENDING_STATES = (
class crm_lead(crm_case, osv.osv):
""" CRM Lead Case """
_name = "crm.lead"
- _description = "Lead"
+ _description = "Lead/Opportunity"
_order = "date_action, priority, id desc"
_inherit = ['mailgate.thread','res.partner.address']
def _compute_day(self, cr, uid, ids, fields, args, context=None):
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index a3ed5b3ad18..a3e29f91cfc 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:57+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -81,6 +81,7 @@ msgid "Select Opportunities"
msgstr ""
#. module: crm
+#: view:crm.phonecall2opportunity:0
#: view:crm.phonecall2phonecall:0
#: view:crm.send.mail:0
msgid " "
@@ -138,11 +139,6 @@ msgstr ""
msgid "No Repeat"
msgstr ""
-#. module: crm
-#: field:crm.case.section,resource_calendar_id:0
-msgid "Resource's Calendar"
-msgstr ""
-
#. module: crm
#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
#: code:addons/crm/wizard/crm_lead_to_partner.py:0
@@ -692,6 +688,11 @@ msgstr ""
msgid "Defines a rule or repeating pattern of time to exclude from the recurring rule."
msgstr ""
+#. module: crm
+#: field:crm.case.section,resource_calendar_id:0
+msgid "Working Time"
+msgstr ""
+
#. module: crm
#: view:crm.segmentation.line:0
msgid "Partner Segmentation Lines"
@@ -3014,11 +3015,6 @@ msgstr ""
msgid "Daily"
msgstr ""
-#. module: crm
-#: model:res.request.link,name:crm.request_link_meeting
-msgid "Case Meeting"
-msgstr ""
-
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead2
#: model:crm.case.stage,name:crm.stage_opportunity2
@@ -3203,6 +3199,7 @@ msgstr ""
#: view:crm.phonecall:0
#: model:ir.model,name:crm.model_crm_meeting
#: model:process.node,name:crm.process_node_meeting0
+#: model:res.request.link,name:crm.request_link_meeting
#, python-format
msgid "Meeting"
msgstr ""
diff --git a/addons/crm_caldav/i18n/crm_caldav.pot b/addons/crm_caldav/i18n/crm_caldav.pot
index b629309e45d..a375283849c 100644
--- a/addons/crm_caldav/i18n/crm_caldav.pot
+++ b/addons/crm_caldav/i18n/crm_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:58+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,3 +25,11 @@ msgstr ""
msgid "Meeting"
msgstr ""
+#. module: crm_caldav
+#: model:ir.module.module,description:crm_caldav.module_meta_information
+msgid "\n"
+" New Futures in Meeting:\n"
+" * Share meeting with other calendar clients like sunbird\n"
+""
+msgstr ""
+
diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot
index ca6f9393337..bc13ec8ecd2 100644
--- a/addons/crm_claim/i18n/crm_claim.pot
+++ b/addons/crm_claim/i18n/crm_claim.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:11+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:11+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -121,6 +121,11 @@ msgstr ""
msgid "Preventive"
msgstr ""
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Fixed"
+msgstr ""
+
#. module: crm_claim
#: field:crm.claim,partner_address_id:0
msgid "Partner Contact"
@@ -285,7 +290,6 @@ msgid "Stages"
msgstr ""
#. module: crm_claim
-#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
msgid "Claims Analysis"
msgstr ""
@@ -428,6 +432,11 @@ msgstr ""
msgid "User"
msgstr ""
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Awaiting Response"
+msgstr ""
+
#. module: crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
msgid "Claim Categories"
@@ -458,6 +467,15 @@ msgstr ""
msgid "October"
msgstr ""
+#. module: crm_claim
+#: model:ir.module.module,description:crm_claim.module_meta_information
+msgid "\n"
+"This modules allows you to track your customers/suppliers claims and flames.\n"
+"It is fully integrated with the email gateway so that you can create\n"
+"automatically new claims based on incoming emails.\n"
+" "
+msgstr ""
+
#. module: crm_claim
#: selection:crm.claim.report,month:0
msgid "January"
@@ -477,6 +495,7 @@ msgstr ""
#. module: crm_claim
#: view:crm.claim:0
#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
msgid "Claims"
@@ -625,16 +644,6 @@ msgstr ""
msgid "Report a Claim"
msgstr ""
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim2
-msgid "Actions Done"
-msgstr ""
-
-#. module: crm_claim
-#: model:crm.case.stage,name:crm_claim.stage_claim5
-msgid "Actions Defined"
-msgstr ""
-
#. module: crm_claim
#: view:crm.claim:0
msgid "Follow Up"
diff --git a/addons/crm_fundraising/i18n/crm_fundraising.pot b/addons/crm_fundraising/i18n/crm_fundraising.pot
index 13e5aab109f..9129ae0a45b 100644
--- a/addons/crm_fundraising/i18n/crm_fundraising.pot
+++ b/addons/crm_fundraising/i18n/crm_fundraising.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -160,7 +160,6 @@ msgid "Partner"
msgstr ""
#. module: crm_fundraising
-#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
#: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
msgid "Fundraising Analysis"
msgstr ""
@@ -262,6 +261,11 @@ msgstr ""
msgid "Employee Email"
msgstr ""
+#. module: crm_fundraising
+#: view:crm.fundraising.report:0
+msgid " Month-1 "
+msgstr ""
+
#. module: crm_fundraising
#: selection:crm.fundraising,state:0
#: selection:crm.fundraising.report,state:0
@@ -300,6 +304,7 @@ msgstr ""
#. module: crm_fundraising
#: view:crm.fundraising.report:0
+#: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
#: model:ir.module.module,description:crm_fundraising.module_meta_information
msgid "Fundraising"
msgstr ""
diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
index 85a94847ac0..3a6d643c29c 100644
--- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot
+++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:00+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,6 @@ msgid "Partner Contact"
msgstr ""
#. module: crm_helpdesk
-#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
msgid "Helpdesk Analysis"
msgstr ""
@@ -247,6 +246,11 @@ msgstr ""
msgid "Dates"
msgstr ""
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid " Month-1 "
+msgstr ""
+
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
msgid "#Helpdesk"
@@ -518,6 +522,7 @@ msgstr ""
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
msgid "Helpdesk"
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 098b5ce8de0..7a2b29b4819 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -137,6 +137,14 @@ msgstr ""
msgid "Gives the probability to assign a lead to this partner. (0 means no assignation.)"
msgstr ""
+#. module: crm_partner_assign
+#: model:ir.module.module,description:crm_partner_assign.module_meta_information
+msgid "\n"
+"This is the module used by OpenERP SA to redirect customers to his partners,\n"
+"based on geolocalization.\n"
+" "
+msgstr ""
+
#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,state:0
#: selection:crm.lead.report.assign,state:0
diff --git a/addons/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot
index 1ab93187a76..f6029745a3f 100644
--- a/addons/crm_profiling/i18n/crm_profiling.pot
+++ b/addons/crm_profiling/i18n/crm_profiling.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,21 @@ msgstr ""
msgid "Questions List"
msgstr ""
+#. module: crm_profiling
+#: model:ir.module.module,description:crm_profiling.module_meta_information
+msgid "\n"
+" This module allows users to perform segmentation within partners.\n"
+" It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner.\n"
+"\n"
+" It also has been merged with the earlier CRM & SRM segmentation tool because they were overlapping.\n"
+"\n"
+" The menu items related are in \"CRM & SRM\\Configuration\\Segmentations\"\n"
+"\n"
+"\n"
+" * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed.\n"
+" "
+msgstr ""
+
#. module: crm_profiling
#: field:crm_profiling.answer,question_id:0
#: field:crm_profiling.question,name:0
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index 0d4cc30fbad..a613ae9ff27 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:14+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:14+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,14 +21,24 @@ msgid "Digits"
msgstr ""
#. module: decimal_precision
-#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
-msgid "Decimal Precision Configuration"
+#: view:decimal.precision:0
+msgid "Decimal Precision"
msgstr ""
#. module: decimal_precision
#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
-msgid "Decimal Accuracy"
+msgid "Decimal Accuracy Definitions"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.module.module,description:decimal_precision.module_meta_information
+msgid "\n"
+"This module allows to configure the price accuracy you need for different kind\n"
+"of usage: accounting, sales, purchases, ...\n"
+"\n"
+"The decimal precision is configured per company.\n"
+""
msgstr ""
#. module: decimal_precision
@@ -42,8 +52,8 @@ msgid "Only one value can be defined for each given usage!"
msgstr ""
#. module: decimal_precision
-#: view:decimal.precision:0
-msgid "Decimal Precision"
+#: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
+msgid "Decimal Precision Configuration"
msgstr ""
#. module: decimal_precision
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 2d3c61f4984..b903a25b759 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -280,7 +280,7 @@
stock.picking
-
+
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 910f6b6c743..7dd002cbe27 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:15+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:15+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -99,11 +99,6 @@ msgstr ""
msgid "Delivery Order :"
msgstr ""
-#. module: delivery
-#: model:ir.model,name:delivery.model_sale_order
-msgid "Sale Order"
-msgstr ""
-
#. module: delivery
#: field:delivery.grid.line,variable_factor:0
msgid "Variable Factor"
@@ -120,6 +115,7 @@ msgstr ""
#: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form
#: model:ir.ui.menu,name:delivery.menu_action_delivery_carrier_form
#: field:res.partner,property_delivery_carrier:0
+#: field:sale.order,carrier_id:0
msgid "Delivery Method"
msgstr ""
@@ -170,6 +166,11 @@ msgstr ""
msgid "Partner"
msgstr ""
+#. module: delivery
+#: model:ir.model,name:delivery.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
#. module: delivery
#: model:ir.model,name:delivery.model_delivery_grid
msgid "Delivery Grid"
@@ -253,11 +254,6 @@ msgstr ""
msgid "If the active field is set to False, it will allow you to hide the delivery carrier without removing it."
msgstr ""
-#. module: delivery
-#: field:sale.order,carrier_id:0
-msgid "Delivery method"
-msgstr ""
-
#. module: delivery
#: code:addons/delivery/wizard/delivery_sale_order.py:0
#, python-format
@@ -367,6 +363,11 @@ msgstr ""
msgid "The delivery pricelist allows you to compute the cost and sales price of the delivery based on the weight of the products and other criteria. You can define several pricelists for one delivery method, for each region such as countries or a zone in a specific country defined by a zip code range."
msgstr ""
+#. module: delivery
+#: selection:delivery.grid.line,operator:0
+msgid "<="
+msgstr ""
+
#. module: delivery
#: field:delivery.grid.line,standard_price:0
msgid "Cost Price"
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index b6930af2047..05347f35bf3 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:03+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -901,6 +901,7 @@ msgid "April"
msgstr ""
#. module: document
+#: field:report.document.file,nbr:0
#: field:report.document.user,nbr:0
#: field:report.files.partner,nbr:0
msgid "# of Files"
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index 14bddfbbe36..db9204eb64d 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,8 +41,8 @@ msgid "Image"
msgstr ""
#. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "Knowledge Application Configuration"
+#: field:document.ftp.configuration,host:0
+msgid "Address"
msgstr ""
#. module: document_ftp
@@ -104,6 +104,11 @@ msgstr ""
msgid "Document FTP Browse"
msgstr ""
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
#. module: document_ftp
#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
msgid "Document Browse"
diff --git a/addons/document_ics/i18n/document_ics.pot b/addons/document_ics/i18n/document_ics.pot
index 1f8349ea09f..a454116e955 100644
--- a/addons/document_ics/i18n/document_ics.pot
+++ b/addons/document_ics/i18n/document_ics.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -165,6 +165,11 @@ msgstr ""
msgid "Helps you to encode the result of a phone call or to plan a list of phone calls to process."
msgstr ""
+#. module: document_ics
+#: help:document.ics.crm.wizard,document_ics:0
+msgid " Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."
+msgstr ""
+
#. module: document_ics
#: field:document.directory.ics.fields,field_id:0
msgid "OpenERP Field"
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 95b1d17fb25..17127395a27 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:17+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:17+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:05+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,6 +47,26 @@ msgstr ""
msgid "PyWebDAV Import Error!"
msgstr ""
+#. module: document_webdav
+#: model:ir.module.module,description:document_webdav.module_meta_information
+msgid " With this module, the WebDAV server for the documents is activated.\n"
+" You can then use any compatible browser to remotely see the attachments of OpenObject.\n"
+"\n"
+" After installation, the webDAV server can be controlled by a [webdav] section in the server's config.\n"
+" Server Configuration Parameter:\n"
+" [webdav]\n"
+" ; enable = True ; Serve webdav over the http(s) servers\n"
+" ; vdir = webdav ; the directory that webdav will be served at\n"
+" ; this default val means that webdav will be\n"
+" ; on \"http://localhost:8069/webdav/\n"
+" ; verbose = True ; Turn on the verbose messages of webdav\n"
+" ; debug = True ; Turn on the debugging messages of webdav\n"
+" ; since the messages are routed to the python logging, with\n"
+" ; levels \"debug\" and \"debug_rpc\" respectively, you can leave\n"
+" ; these options on\n"
+""
+msgstr ""
+
#. module: document_webdav
#: sql_constraint:document.directory:0
msgid "Directory cannot be parent of itself!"
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index bd2ef444256..49ffd971df4 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:18+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:18+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:06+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -147,6 +147,11 @@ msgstr ""
msgid "HTML code"
msgstr ""
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr ""
+
#. module: email_template
#: help:email_template.account,name:0
msgid "The description is used as the Sender name along with the provided From Email, unless it is already specified in the From Email, e.g: John Doe "
@@ -250,8 +255,8 @@ msgid "Attached Files"
msgstr ""
#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Standard Body"
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
msgstr ""
#. module: email_template
@@ -382,11 +387,22 @@ msgstr ""
msgid "Mail from Account %s successfully Sent."
msgstr ""
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr ""
+
#. module: email_template
#: selection:email.template,template_language:0
msgid "Mako Templates"
msgstr ""
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr ""
+
#. module: email_template
#: code:addons/email_template/email_template.py:0
#, python-format
@@ -404,9 +420,8 @@ msgid "Test Outgoing Connection"
msgstr ""
#. module: email_template
-#: help:email.template,def_body_html:0
-#: help:email.template,def_body_text:0
-msgid "The text version of the mail"
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
msgstr ""
#. module: email_template
@@ -763,7 +778,6 @@ msgstr ""
#: code:addons/email_template/wizard/email_template_send_wizard.py:0
#: model:ir.ui.menu,name:email_template.menu_email_template
#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
#: model:ir.ui.menu,name:email_template.menu_email_template_tools
#, python-format
msgid "Email Template"
@@ -775,8 +789,8 @@ msgid "Send/Receive"
msgstr ""
#. module: email_template
-#: view:email_template.mailbox:0
-msgid "Send Mail"
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
msgstr ""
#. module: email_template
@@ -900,11 +914,6 @@ msgstr ""
msgid "User Information"
msgstr ""
-#. module: email_template
-#: view:email.template:0
-msgid "Actions"
-msgstr ""
-
#. module: email_template
#: code:addons/email_template/email_template_account.py:0
#, python-format
@@ -918,8 +927,8 @@ msgid "Name of the generated report file. Placeholders can be used in the filena
msgstr ""
#. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
msgstr ""
#. module: email_template
@@ -929,8 +938,8 @@ msgid "Trash"
msgstr ""
#. module: email_template
-#: model:ir.model,name:email_template.model_email_template_mailbox
-msgid "Email Mailbox"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
msgstr ""
#. module: email_template
@@ -993,6 +1002,11 @@ msgstr ""
msgid "Null Value"
msgstr ""
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr ""
+
#. module: email_template
#: field:email.template,template_language:0
msgid "Templating Language"
@@ -1034,9 +1048,8 @@ msgstr ""
#. module: email_template
#: view:email_template.mailbox:0
-#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
-#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
msgid "Emails"
msgstr ""
@@ -1081,8 +1094,10 @@ msgid "Existing files"
msgstr ""
#. module: email_template
-#: field:email_template.account,smtpssl:0
-msgid "SSL/TLS (only in python 2.6)"
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid "\n"
+" Email Template is extraction of Power Email basically just to send the emails.\n"
+" "
msgstr ""
#. module: email_template
@@ -1145,8 +1160,8 @@ msgid "Mail Format"
msgstr ""
#. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: view:email.template:0
+msgid "Actions"
msgstr ""
#. module: email_template
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index c64d37e64ea..e47f16b9bc3 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -1039,6 +1039,11 @@ msgstr ""
msgid "_Subcribe"
msgstr ""
+#. module: event
+#: model:ir.model,name:event.model_partner_event_registration
+msgid " event Registration "
+msgstr ""
+
#. module: event
#: help:event.event,date_begin:0
#: help:partner.event.registration,start_date:0
diff --git a/addons/event_project/i18n/event_project.pot b/addons/event_project/i18n/event_project.pot
index 287f18ada0e..d376f374092 100644
--- a/addons/event_project/i18n/event_project.pot
+++ b/addons/event_project/i18n/event_project.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -49,11 +49,6 @@ msgstr ""
msgid "Retro-Planning"
msgstr ""
-#. module: event_project
-#: view:event.event:0
-msgid "Create Retro-Planning"
-msgstr ""
-
#. module: event_project
#: constraint:event.event:0
msgid "Error ! Closing Date cannot be set before Beginning Date."
@@ -65,8 +60,14 @@ msgid "Project"
msgstr ""
#. module: event_project
-#: field:event.project,project_id:0
-msgid "Template of Project"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr ""
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
msgstr ""
#. module: event_project
@@ -75,9 +76,13 @@ msgid "Event Project - Create Retro-Planning to manage your Events"
msgstr ""
#. module: event_project
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event_project.act_event_task
-msgid "Tasks"
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr ""
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
msgstr ""
#. module: event_project
@@ -96,8 +101,8 @@ msgid "Date Start"
msgstr ""
#. module: event_project
-#: constraint:event.event:0
-msgid "Error ! You cannot create recursive event."
+#: view:event.event:0
+msgid "Create Retro-Planning"
msgstr ""
#. module: event_project
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index 815cb9a15fe..3d1d28b9b41 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -44,7 +44,7 @@ msgstr ""
#. module: fetchmail
#: view:email.server:0
-msgid "Set to Draft"
+msgid "POP"
msgstr ""
#. module: fetchmail
@@ -52,6 +52,11 @@ msgstr ""
msgid "Not Confirmed"
msgstr ""
+#. module: fetchmail
+#: field:email.server,user:0
+msgid "User Name"
+msgstr ""
+
#. module: fetchmail
#: view:email.server:0
msgid "Type"
@@ -86,12 +91,12 @@ msgstr ""
#. module: fetchmail
#: view:email.server:0
-msgid "POP"
+msgid "# of emails"
msgstr ""
#. module: fetchmail
-#: field:email.server,user:0
-msgid "User Name"
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Email History"
msgstr ""
#. module: fetchmail
@@ -115,7 +120,6 @@ msgid "Password"
msgstr ""
#. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.act_server_history
#: view:mailgate.message:0
msgid "Emails"
msgstr ""
@@ -145,6 +149,16 @@ msgstr ""
msgid "Mailgateway Message"
msgstr ""
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+msgid "POP Servers"
+msgstr ""
+
+#. module: fetchmail
+#: view:email.server:0
+msgid "Set to Draft"
+msgstr ""
+
#. module: fetchmail
#: field:email.server,message_ids:0
#: model:ir.actions.act_window,name:fetchmail.action_view_mail_message_emails
@@ -152,9 +166,8 @@ msgid "Messages"
msgstr ""
#. module: fetchmail
-#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
-msgid "Email Servers"
+msgid "Fetchmail Services"
msgstr ""
#. module: fetchmail
diff --git a/addons/google_map/i18n/google_map.pot b/addons/google_map/i18n/google_map.pot
index efdc37635d8..d9435a2edcc 100644
--- a/addons/google_map/i18n/google_map.pot
+++ b/addons/google_map/i18n/google_map.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:20+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:20+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,20 +16,9 @@ msgstr ""
"Plural-Forms: \n"
#. module: google_map
-#: model:ir.module.module,description:google_map.module_meta_information
-msgid "The module adds google map field in partner address\n"
-"so that we can directly open google map from the\n"
-"url widget."
-msgstr ""
-
-#. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr ""
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
msgstr ""
#. module: google_map
@@ -39,8 +28,24 @@ msgid "Street2 : "
msgstr ""
#. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr ""
+
+#. module: google_map
+#: model:ir.module.module,description:google_map.module_meta_information
+msgid "The module adds google map field in partner address\n"
+"so that we can directly open google map from the\n"
+"url widget."
+msgstr ""
+
+#. module: google_map
+#: model:ir.module.module,shortdesc:google_map.module_meta_information
+msgid "Google Map"
+msgstr ""
+
+#. module: google_map
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
msgstr ""
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index bfa1be527bb..a7198d83e7b 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 17:21:47+0000\n"
-"PO-Revision-Date: 2010-12-15 17:21:47+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -252,11 +252,6 @@ msgstr ""
msgid "Office Location"
msgstr ""
-#. module: hr
-#: field:hr.employee,passport_id:0
-msgid "Passport"
-msgstr ""
-
#. module: hr
#: view:hr.employee:0
#: view:hr.job:0
@@ -512,6 +507,16 @@ msgstr ""
msgid "Companies"
msgstr ""
+#. module: hr
+#: model:ir.module.module,description:hr.module_meta_information
+msgid "\n"
+" Module for human resource management. You can manage:\n"
+" * Employees and hierarchies : You can define your employee with User and display hierarchies\n"
+" * HR Departments\n"
+" * HR Jobs\n"
+" "
+msgstr ""
+
#. module: hr
#: model:process.transition,note:hr.process_transition_contactofemployee0
msgid "In the Employee form, there are different kind of information like Contact information."
@@ -582,6 +587,11 @@ msgstr ""
msgid "Personal Information"
msgstr ""
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport No"
+msgstr ""
+
#. module: hr
#: view:res.users:0
msgid "Current Activity"
@@ -614,7 +624,6 @@ msgstr ""
#. module: hr
#: field:hr.installer,hr_attendance:0
-#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
msgid "Attendances"
msgstr ""
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 8150be3c841..3e27bb67b22 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:21+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:21+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:09+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -182,6 +182,15 @@ msgstr ""
msgid "Hr Attendance Search"
msgstr ""
+#. module: hr_attendance
+#: model:ir.module.module,description:hr_attendance.module_meta_information
+msgid "\n"
+" This module aims to manage employee's attendances.\n"
+" Keeps account of the attendances of the employees on the basis of the\n"
+" actions(Sign in/Sign out) performed by them.\n"
+" "
+msgstr ""
+
#. module: hr_attendance
#: constraint:hr.attendance:0
msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
@@ -443,6 +452,7 @@ msgstr ""
#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason_new_config
msgid "Attendances"
msgstr ""
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 6431cbb60b7..227b539702a 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:22+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:22+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:10+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:10+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -181,8 +181,14 @@ msgid "Deductions"
msgstr ""
#. module: hr_contract
-#: field:hr.contract.wage.type.period,name:0
-msgid "Period Name"
+#: model:ir.module.module,description:hr_contract.module_meta_information
+msgid "\n"
+" Add all information on the employee form to manage contracts:\n"
+" * Marital status,\n"
+" * Security number,\n"
+" * Place of birth, birth date, ...\n"
+" You can assign several contracts per employee.\n"
+" "
msgstr ""
#. module: hr_contract
@@ -346,6 +352,11 @@ msgstr ""
msgid "Factor for hour cost"
msgstr ""
+#. module: hr_contract
+#: field:hr.contract.wage.type.period,name:0
+msgid "Period Name"
+msgstr ""
+
#. module: hr_contract
#: view:hr.contract.wage.type:0
msgid "Period"
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index f1e7419848d..fc38400aec6 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:22+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:22+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -90,11 +90,6 @@ msgstr ""
msgid "Company"
msgstr ""
-#. module: hr_evaluation
-#: field:hr.employee,evaluation_date:0
-msgid "Next Evaluation"
-msgstr ""
-
#. module: hr_evaluation
#: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
msgid "Evaluation Interviews"
@@ -116,6 +111,11 @@ msgstr ""
msgid "Send an anonymous summary to the employee"
msgstr ""
+#. module: hr_evaluation
+#: help:hr_evaluation.plan,month_first:0
+msgid "This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "
+msgstr ""
+
#. module: hr_evaluation
#: view:hr.employee:0
msgid "Notes"
@@ -170,6 +170,11 @@ msgstr ""
msgid "July"
msgstr ""
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_next:0
+msgid "Periodicity of Evaluations (months)"
+msgstr ""
+
#. module: hr_evaluation
#: code:addons/hr_evaluation/hr_evaluation.py:0
#, python-format
@@ -181,6 +186,11 @@ msgstr ""
msgid "Ending Date"
msgstr ""
+#. module: hr_evaluation
+#: field:hr_evaluation.plan,month_first:0
+msgid "First Evaluation in (months)"
+msgstr ""
+
#. module: hr_evaluation
#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
msgid "Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evaluation. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager."
@@ -211,11 +221,6 @@ msgstr ""
msgid "Send to Employees"
msgstr ""
-#. module: hr_evaluation
-#: field:hr_evaluation.plan,month_next:0
-msgid "After the Date of Start"
-msgstr ""
-
#. module: hr_evaluation
#: field:hr.evaluation.report,deadline:0
msgid "Deadline"
@@ -227,13 +232,8 @@ msgid " Month "
msgstr ""
#. module: hr_evaluation
-#: help:hr.employee,evaluation_date:0
-msgid "Date of the next evaluation"
-msgstr ""
-
-#. module: hr_evaluation
-#: model:ir.model,name:hr_evaluation.model_survey_request
-msgid "survey.request"
+#: help:hr_evaluation.plan,month_next:0
+msgid "The number of month that depicts the delay between each evaluation of this plan (after the first one)."
msgstr ""
#. module: hr_evaluation
@@ -247,8 +247,16 @@ msgid "Send evaluation reminder"
msgstr ""
#. module: hr_evaluation
-#: field:hr_evaluation.evaluation,note_summary:0
-msgid "Evaluation Summary"
+#: model:ir.module.module,description:hr_evaluation.module_meta_information
+msgid "\n"
+" Ability to create employees evaluation.\n"
+" An evaluation can be created by employee for subordinates,\n"
+" juniors as well as his manager.The evaluation is done under a plan\n"
+" in which various surveys can be created and it can be defined which\n"
+" level of employee hierarchy fills what and final review and evaluation\n"
+" is done by the manager.Every evaluation filled by the employees can be viewed\n"
+" in the form of.Implements a dashboard for My Current Evaluations\n"
+" "
msgstr ""
#. module: hr_evaluation
@@ -398,11 +406,6 @@ msgstr ""
msgid "All Answers"
msgstr ""
-#. module: hr_evaluation
-#: field:hr_evaluation.plan,month_first:0
-msgid "Next Evaluation After"
-msgstr ""
-
#. module: hr_evaluation
#: selection:hr.evaluation.report,month:0
msgid "September"
@@ -449,6 +452,11 @@ msgstr ""
msgid "Is Evaluation?"
msgstr ""
+#. module: hr_evaluation
+#: model:ir.model,name:hr_evaluation.model_survey_request
+msgid "survey.request"
+msgstr ""
+
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,wait:0
msgid "Check this box if you want to wait that all preceding phases are finished before launching this phase."
@@ -475,6 +483,11 @@ msgstr ""
msgid "Draft"
msgstr ""
+#. module: hr_evaluation
+#: field:hr_evaluation.evaluation,note_summary:0
+msgid "Evaluation Summary"
+msgstr ""
+
#. module: hr_evaluation
#: field:hr_evaluation.plan.phase,send_anonymous_employee:0
#: field:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -659,6 +672,11 @@ msgstr ""
msgid "Send all answers to the employee"
msgstr ""
+#. module: hr_evaluation
+#: field:hr.employee,evaluation_date:0
+msgid "Next Evaluation Date"
+msgstr ""
+
#. module: hr_evaluation
#: view:hr.evaluation.report:0
#: selection:hr.evaluation.report,state:0
@@ -837,3 +855,8 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: hr_evaluation
+#: help:hr.employee,evaluation_date:0
+msgid "The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."
+msgstr ""
+
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index bd1c7b8fd8b..7807da48746 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,7 +86,7 @@
-
+
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 483e15a3d0c..3c2980cabdc 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:23+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:23+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -114,6 +114,24 @@ msgstr ""
msgid "Employee's Invoice"
msgstr ""
+#. module: hr_expense
+#: model:ir.module.module,description:hr_expense.module_meta_information
+msgid "\n"
+" This module aims to manage employee's expenses.\n"
+"\n"
+" The whole workflow is implemented:\n"
+" * Draft expense\n"
+" * Confirmation of the sheet by the employee\n"
+" * Validation by his manager\n"
+" * Validation by the accountant and invoice creation\n"
+" * Payment of the invoice to the employee\n"
+"\n"
+" This module also uses the analytic accounting and is compatible with\n"
+" the invoice on timesheet module so that you will be able to automatically\n"
+" re-invoice your customer's expenses if your work by project.\n"
+" "
+msgstr ""
+
#. module: hr_expense
#: selection:hr.expense.report,state:0
msgid "Cancelled"
@@ -313,6 +331,12 @@ msgstr ""
msgid "Reimbursement"
msgstr ""
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:0
+#, python-format
+msgid "The employee must have a Home address"
+msgstr ""
+
#. module: hr_expense
#: view:hr.expense.report:0
msgid " Month-1 "
@@ -374,12 +398,6 @@ msgstr ""
msgid "Currency"
msgstr ""
-#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
-#, python-format
-msgid "The employee must have a working address"
-msgstr ""
-
#. module: hr_expense
#: selection:hr.expense.expense,state:0
msgid "Waiting Approval"
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index a4e18c22646..cabd8244022 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:24+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:24+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:12+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -414,6 +414,11 @@ msgstr ""
msgid "If its True then its Allocation/Request have to be validated by second validator"
msgstr ""
+#. module: hr_holidays
+#: view:available.holidays.report:0
+msgid " Month-1 "
+msgstr ""
+
#. module: hr_holidays
#: selection:hr.holidays,state:0
msgid "Waiting Approval"
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index 98a92e7cf76..c5a94bcc69d 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:26+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:26+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -528,6 +528,11 @@ msgstr ""
msgid "Email"
msgstr ""
+#. module: hr_payroll
+#: report:hr.payroll.register.sheet:0
+msgid "#"
+msgstr ""
+
#. module: hr_payroll
#: code:addons/hr_payroll/hr_payroll.py:0
#, python-format
@@ -1181,12 +1186,12 @@ msgid "Salary"
msgstr ""
#. module: hr_payroll
+#: field:hr.contract,passport_id:0
#: field:hr.passport,name:0
msgid "Passport No"
msgstr ""
#. module: hr_payroll
-#: field:hr.contract,passport_id:0
#: view:hr.passport:0
msgid "Passport"
msgstr ""
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index e8d5bd21523..6953f24bffa 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:26+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:26+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -105,6 +105,15 @@ msgstr ""
msgid "Please defined bank account for %s !"
msgstr ""
+#. 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"
@@ -143,6 +152,7 @@ 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"
@@ -158,15 +168,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#. module: hr_payroll_account
-#: model:ir.module.module,description:hr_payroll_account.module_meta_information
-msgid "Generic Payroll system Integrated with Accountings\n"
-" * Expense Encoding\n"
-" * Payment Encoding\n"
-" * Company Contribution Management\n"
-" "
-msgstr ""
-
#. module: hr_payroll_account
#: model:ir.model,name:hr_payroll_account.model_hr_payslip_line
msgid "Payslip Line"
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index a153d4007a4..dbac449f470 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:27+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:27+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:15+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -594,6 +594,11 @@ msgstr ""
msgid "Global CC"
msgstr ""
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
#. module: hr_recruitment
#: selection:hr.recruitment.report,month:0
msgid "June"
@@ -764,8 +769,15 @@ msgid "Current"
msgstr ""
#. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "October"
+#: 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
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index f51baa13892..e75c386eb79 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:28+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:28+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:16+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -252,6 +252,21 @@ msgstr ""
msgid "novembre"
msgstr ""
+#. module: hr_timesheet
+#: model:ir.module.module,description:hr_timesheet.module_meta_information
+msgid "\n"
+"This module implements a timesheet system. Each employee can encode and\n"
+"track their time spent on the different projects. A project is an\n"
+"analytic account and the time spent on a project generates costs on\n"
+"the analytic account.\n"
+"\n"
+"Lots of reporting on time and employee tracking are provided.\n"
+"\n"
+"It is completely integrated with the cost accounting module. It allows you\n"
+"to set up a management by affair.\n"
+" "
+msgstr ""
+
#. module: hr_timesheet
#: code:addons/hr_timesheet/report/user_timesheet.py:0
#: code:addons/hr_timesheet/report/users_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 275892e5c38..0b69b771880 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:29+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:29+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:17+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -359,6 +359,14 @@ msgstr ""
msgid "Gratis"
msgstr ""
+#. module: hr_timesheet_invoice
+#: model:ir.module.module,description:hr_timesheet_invoice.module_meta_information
+msgid "\n"
+"Module to generate invoices based on costs (human resources, expenses, ...).\n"
+"You can define price lists in analytic account, make some theoretical revenue\n"
+"reports, eso."
+msgstr ""
+
#. module: hr_timesheet_invoice
#: help:account.analytic.account,to_invoice:0
msgid "Fill this field if you plan to automatically generate invoices based on the costs in this analytic account: timesheets, expenses, ...You can configure an automatic invoice rate on analytic accounts."
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index 12a9aff9faf..beab0a3d3da 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:30+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:30+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:18+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -260,8 +260,26 @@ msgid "Confirm"
msgstr ""
#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
-msgid "Timesheet lines"
+#: model:ir.module.module,description:hr_timesheet_sheet.module_meta_information
+msgid "\n"
+"This module helps you to easily encode and validate timesheet and attendances\n"
+"within the same view. The upper part of the view is for attendances and\n"
+"track (sign in/sign out) events. The lower part is for timesheet.\n"
+"\n"
+"Other tabs contains statistics views to help you analyse your\n"
+"time or the time of your team:\n"
+"* Time spent by day (with attendances)\n"
+"* Time spent by project\n"
+"\n"
+"This module also implements a complete timesheet validation process:\n"
+"* Draft sheet\n"
+"* Confirmation at the end of the period by the employee\n"
+"* Validation by the project manager\n"
+"\n"
+"The validation can be configured in the company:\n"
+"* Period size (day, week, month, year)\n"
+"* Maximal difference between timesheet and attendances\n"
+" "
msgstr ""
#. module: hr_timesheet_sheet
@@ -292,6 +310,12 @@ msgstr ""
msgid "New"
msgstr ""
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#, python-format
+msgid "You cannot duplicate a timesheet !"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
msgid "My Total Attendances By Week"
@@ -579,9 +603,8 @@ msgid "Timesheet range"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#, python-format
-msgid "You can not modify an entry in a confirmed timesheet !"
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
msgstr ""
#. module: hr_timesheet_sheet
@@ -638,7 +661,7 @@ msgstr ""
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
#, python-format
-msgid "You cannot duplicate a timesheet !"
+msgid "You can not modify an entry in a confirmed timesheet !"
msgstr ""
#. module: hr_timesheet_sheet
@@ -682,6 +705,12 @@ msgstr ""
msgid "Timesheet by Accounts"
msgstr ""
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#, python-format
+msgid "Open Timesheet"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
#, python-format
diff --git a/addons/html_view/i18n/html_view.pot b/addons/html_view/i18n/html_view.pot
index e56b0dc010a..c7c2abe8946 100644
--- a/addons/html_view/i18n/html_view.pot
+++ b/addons/html_view/i18n/html_view.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:30+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:30+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:19+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,6 +46,13 @@ msgstr ""
msgid "Banks"
msgstr ""
+#. module: html_view
+#: model:ir.module.module,description:html_view.module_meta_information
+msgid "\n"
+" This is the test module which shows html tag supports in normal xml form view.\n"
+" "
+msgstr ""
+
#. module: html_view
#: model:ir.model,name:html_view.model_html_view
msgid "html.view"
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index a4bfb6c0f63..329f879048a 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,6 +57,17 @@ msgstr ""
msgid "Group By..."
msgstr ""
+#. module: idea
+#: model:ir.module.module,description:idea.module_meta_information
+msgid "\n"
+" This module allows your user to easily and efficiently participate in the innovation of the enterprise.\n"
+" It allows everybody to express ideas about different subjects.\n"
+" Then, other users can comment on these ideas and vote for particular ideas.\n"
+" Each idea has a score based on the different votes.\n"
+" The managers can obtain an easy view on best ideas from all the users.\n"
+" Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgstr ""
+
#. module: idea
#: model:ir.module.module,shortdesc:idea.module_meta_information
msgid "Idea Manager"
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index f7cc7167570..e934613de1a 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:31+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:31+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -76,6 +76,11 @@ msgstr ""
msgid "Configuration"
msgstr ""
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Modules Installation"
+msgstr ""
+
#. module: knowledge
#: field:knowledge.installer,wiki_quality_manual:0
msgid "Quality Manual"
@@ -101,13 +106,17 @@ msgstr ""
msgid "Internal FAQ"
msgstr ""
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr ""
+
#. module: knowledge
#: field:knowledge.installer,config_logo:0
msgid "Image"
msgstr ""
#. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
#: view:knowledge.installer:0
msgid "Knowledge Application Configuration"
msgstr ""
diff --git a/addons/l10n_be/i18n/l10n_be.pot b/addons/l10n_be/i18n/l10n_be.pot
index 14c131362fa..071d8436301 100644
--- a/addons/l10n_be/i18n/l10n_be.pot
+++ b/addons/l10n_be/i18n/l10n_be.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:32+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:32+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:22+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -500,6 +500,28 @@ msgstr ""
msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
msgstr ""
+#. module: l10n_be
+#: model:ir.module.module,description:l10n_be.module_meta_information
+msgid "\n"
+" This is the base module to manage the accounting chart for Belgium in OpenERP.\n"
+"\n"
+" After Installing this module,The Configuration wizard for accounting is launched.\n"
+" * We have the account templates which can be helpful to generate Charts of Accounts.\n"
+" * On that particular wizard,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 account and Bank account,currency to create Journals.\n"
+" 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.\n"
+"\n"
+" Wizards provided by this module:\n"
+" * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format.\n"
+" Path to access : Financial Management/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing\n"
+" * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.\n"
+" Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration\n"
+" * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year\n"
+" Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers\n"
+"\n"
+" "
+msgstr ""
+
#. module: l10n_be
#: help:l1on_be.vat.declaration,ask_payment:0
msgid "It indicates whether a payment is to made or not?"
diff --git a/addons/l10n_es/i18n/l10n_es.pot b/addons/l10n_es/i18n/l10n_es.pot
index aa5087b216d..3e5e90d0007 100644
--- a/addons/l10n_es/i18n/l10n_es.pot
+++ b/addons/l10n_es/i18n/l10n_es.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:41+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:41+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:27+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -43,6 +43,11 @@ msgstr ""
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"
diff --git a/addons/l10n_fr/i18n/l10n_fr.pot b/addons/l10n_fr/i18n/l10n_fr.pot
index 5abf5d0bda2..a9665579cc6 100644
--- a/addons/l10n_fr/i18n/l10n_fr.pot
+++ b/addons/l10n_fr/i18n/l10n_fr.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:42+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:42+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:28+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -60,6 +60,11 @@ msgstr ""
msgid "Print"
msgstr ""
+#. module: l10n_fr
+#: model:ir.model,name:l10n_fr.model_account_bilan_report
+msgid "Account Bilan Report"
+msgstr ""
+
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_l10n_fr_report
msgid "Report for l10n_fr"
diff --git a/addons/l10n_gr/i18n/l10n_gr.pot b/addons/l10n_gr/i18n/l10n_gr.pot
index cd8d8d5fb1c..5564bce48de 100644
--- a/addons/l10n_gr/i18n/l10n_gr.pot
+++ b/addons/l10n_gr/i18n/l10n_gr.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:43+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:43+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:29+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ 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_equity
-msgid "Equity"
+#: model:account.account.type,name:l10n_gr.account_type_income
+msgid "Income"
msgstr ""
#. module: l10n_gr
@@ -62,8 +62,13 @@ msgid "Other"
msgstr ""
#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_income
-msgid "Income"
+#: 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
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index 0c5fe5f24e5..da81c7b11e4 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:44+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:44+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -50,6 +50,11 @@ msgstr ""
msgid "Ingresos"
msgstr ""
+#. module: l10n_gt
+#: model:account.account.type,name:l10n_gt.cuenta_activo
+msgid "Activo"
+msgstr ""
+
#. module: l10n_gt
#: model:ir.actions.todo,note:l10n_gt.config_call_account_template_gt_minimal
msgid "Generar la nomenclatura contable a partir de un modelo. Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios."
diff --git a/addons/l10n_in/i18n/l10n_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index b061dd58922..7ba3b01b31c 100644
--- a/addons/l10n_in/i18n/l10n_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:44+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:44+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,8 +21,15 @@ msgid "Asset View"
msgstr ""
#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense1
-msgid "Expense"
+#: model:ir.module.module,description:l10n_in.module_meta_information
+msgid "\n"
+" Indian Accounting : chart of Account\n"
+" "
+msgstr ""
+
+#. module: l10n_in
+#: model:account.account.type,name:l10n_in.account_type_expense_view
+msgid "Expense View"
msgstr ""
#. module: l10n_in
@@ -62,8 +69,8 @@ msgid "Liability View"
msgstr ""
#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense_view
-msgid "Expense View"
+#: model:account.account.type,name:l10n_in.account_type_expense1
+msgid "Expense"
msgstr ""
#. module: l10n_in
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
index 45a35294044..c1d6d6de6fd 100644
--- a/addons/l10n_lu/i18n/l10n_lu.pot
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:46+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:46+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:32+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,8 +47,13 @@ msgid "Luxembourg"
msgstr ""
#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
+#: model:ir.module.module,description:l10n_lu.module_meta_information
+msgid "\n"
+"This module installs:\n"
+"\n"
+" *the KLUWER Chart of Accounts,\n"
+" *the Tax Code Chart for Luxembourg\n"
+" *the main taxes used in Luxembourg"
msgstr ""
#. module: l10n_lu
@@ -67,6 +72,11 @@ msgstr ""
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"
diff --git a/addons/l10n_ma/i18n/l10n_ma.pot b/addons/l10n_ma/i18n/l10n_ma.pot
index f1ee14babd2..7913362a486 100644
--- a/addons/l10n_ma/i18n/l10n_ma.pot
+++ b/addons/l10n_ma/i18n/l10n_ma.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:46+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:46+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:33+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,8 +46,8 @@ msgid "Dettes à court terme"
msgstr ""
#. module: l10n_ma
-#: sql_constraint:l10n.ma.report:0
-msgid "The code report must be unique !"
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
msgstr ""
#. module: l10n_ma
@@ -87,8 +87,8 @@ msgid "Taxes"
msgstr ""
#. module: l10n_ma
-#: field:l10n.ma.line,report_id:0
-msgid "Report"
+#: sql_constraint:l10n.ma.report:0
+msgid "The code report must be unique !"
msgstr ""
#. module: l10n_ma
@@ -136,6 +136,11 @@ msgstr ""
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"
diff --git a/addons/l10n_uk/i18n/l10n_uk.pot b/addons/l10n_uk/i18n/l10n_uk.pot
index 85b09c8dd4f..1c3372445c6 100644
--- a/addons/l10n_uk/i18n/l10n_uk.pot
+++ b/addons/l10n_uk/i18n/l10n_uk.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:49+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:49+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:36+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -76,6 +76,11 @@ msgstr ""
msgid "This is the base module to manage the accounting chart for United Kingdom in OpenERP."
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"
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index a209e91427c..f262558ff6b 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:50+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:50+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -56,6 +56,16 @@ msgstr ""
msgid " 7 Days "
msgstr ""
+#. module: lunch
+#: model:ir.module.module,description:lunch.module_meta_information
+msgid "\n"
+" The base module to manage lunch\n"
+"\n"
+" keep track for the Lunch Order ,Cash Moves ,CashBox ,Product.\n"
+" Apply Different Category for the product.\n"
+" "
+msgstr ""
+
#. module: lunch
#: view:lunch.cashmove:0
#: view:lunch.order:0
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot
index 93d18880196..06ca7604705 100644
--- a/addons/mail_gateway/i18n/mail_gateway.pot
+++ b/addons/mail_gateway/i18n/mail_gateway.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -123,6 +123,11 @@ msgstr ""
msgid "Description"
msgstr ""
+#. module: mail_gateway
+#: field:mailgate.message,email_to:0
+msgid "To"
+msgstr ""
+
#. module: mail_gateway
#: help:mailgate.message,references:0
msgid "References emails."
@@ -179,8 +184,9 @@ msgid "Stage"
msgstr ""
#. module: mail_gateway
-#: field:mailgate.message,email_to:0
-msgid "To"
+#: code:addons/mail_gateway/mail_gateway.py:0
+#, python-format
+msgid " added note on "
msgstr ""
#. module: mail_gateway
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index b865ae5beb8..e54e8b7142d 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgid "title"
msgstr ""
#. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
-msgid "Marketing"
+#: field:marketing.installer,email_template:0
+msgid "Automated E-Mails"
msgstr ""
#. module: marketing
@@ -61,8 +61,8 @@ msgid "marketing.installer"
msgstr ""
#. module: marketing
-#: model:ir.actions.act_window,name:marketing.action_marketing_installer
-msgid "Marketing Applications Configuration"
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
msgstr ""
#. module: marketing
@@ -80,6 +80,11 @@ msgstr ""
msgid "Marketing Application Configuration"
msgstr ""
+#. module: marketing
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Modules Installation"
+msgstr ""
+
#. module: marketing
#: field:marketing.installer,marketing_campaign:0
msgid "Marketing Campaigns"
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 348470b76b9..fa2b4e99a00 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -166,6 +166,11 @@ msgstr ""
msgid "Reset"
msgstr ""
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
#. module: marketing_campaign
#: field:marketing.campaign.segment,sync_last_date:0
msgid "Last Synchronization"
@@ -308,6 +313,11 @@ msgstr ""
msgid "Type"
msgstr ""
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
#. module: marketing_campaign
#: field:marketing.campaign,name:0
#: field:marketing.campaign.activity,name:0
@@ -569,8 +579,19 @@ msgid "Preview"
msgstr ""
#. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-msgid "Related Resource"
+#: model:ir.module.module,description:marketing_campaign.module_meta_information
+msgid "\n"
+"This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).\n"
+" The campaigns are dynamic and multi-channels. The process is as follows:\n"
+" * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions, etc.\n"
+" * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries, etc.)\n"
+" * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it\n"
+" * You may also start the real campaign in manual mode, where each action requires manual validation\n"
+" * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. \n"
+" While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow, etc.\n"
+" \n"
+" Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads.\n"
+" "
msgstr ""
#. module: marketing_campaign
@@ -670,9 +691,8 @@ msgid "Campaign Workitem"
msgstr ""
#. module: marketing_campaign
-#: view:marketing.campaign.segment:0
-#: field:marketing.campaign.segment,ir_filter_id:0
-msgid "Filter"
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
msgstr ""
#. module: marketing_campaign
@@ -704,11 +724,6 @@ msgstr ""
msgid "History"
msgstr ""
-#. module: marketing_campaign
-#: help:marketing.campaign,object_id:0
-msgid "Choose the model on which you want this campaign to be run"
-msgstr ""
-
#. module: marketing_campaign
#: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
msgid "marketing_campaign"
@@ -938,8 +953,9 @@ msgid "Next Synchronization"
msgstr ""
#. module: marketing_campaign
-#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
-msgid "Campaign Activity"
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
msgstr ""
#. module: marketing_campaign
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 041515da436..91af27db4ad 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -87,7 +87,7 @@ class marketing_campaign(osv.osv):
_columns = {
'name': fields.char('Name', size=64, required=True),
'object_id': fields.many2one('ir.model', 'Resource', required=True,
- help="Choose the model on which you want \
+ help="Choose the resource on which you want \
this campaign to be run"),
'partner_field_id': fields.many2one('ir.model.fields', 'Partner Field',
domain="[('model_id', '=', object_id), ('ttype', '=', 'many2one'), ('relation', '=', 'res.partner')]",
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 78fbf3ee653..f58277884ca 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
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:52+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:52+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,46 +26,26 @@ msgid "Hello,Thanks for generous interest you have shown in the openERP.Regards,
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
-msgid "Hello,We have very good offer that might suit you.\n"
-" We propose you to subscribe to the OpenERP Discovery Day on May 2010.\n"
-" If any further information required kindly revert back.\n"
-" We really appreciate your co-operation on this.\n"
-" Regards,OpenERP Team,"
+#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
+msgid "Demo data for the module marketing_campaign."
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
-msgid "Thanks for buying the OpenERP book"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
-msgid "Hello, We have very good offer that might suit you.\n"
-" For our silver partners,We are paid technical training on june,2010.\n"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
+msgid "Hello,Thanks for showing intrest and buying the OpenERP book.\n"
" If any further information required kindly revert back.\n"
" I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
-msgid "Propose a free technical training to Gold partners"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,description:marketing_campaign_crm_demo.module_meta_information
-msgid "Demo data for the module marketing_campaign."
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
-msgid "Thanks for subscribing to the OpenERP Discovery Day"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
-msgid "Dummy Action"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
msgstr ""
#. module: marketing_campaign_crm_demo
@@ -74,13 +54,13 @@ msgid "Thanks for showing interest in OpenERP"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
-msgid "marketing_campaign_crm_demo"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_2
-msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
msgstr ""
#. module: marketing_campaign_crm_demo
@@ -93,18 +73,31 @@ msgid "Hello, We have very good offer that might suit you.\n"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
-msgid "Propose gold partnership to silver partners"
+#: report:crm.lead.demo:0
+msgid "Partner :"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_4
-msgid "Hello,Thanks for showing intrest and buying the OpenERP book.\n"
-" If any further information required kindly revert back.\n"
-" I really appreciate your co-operation on this.\n"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
+msgid "Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr ""
+
#. module: marketing_campaign_crm_demo
#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_5
msgid "Hello, We have very good offer that might suit you.\n"
@@ -123,23 +116,35 @@ msgid "Hello,Thanks for showing intrest and for subscribing to the OpenERP Disco
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_8
-msgid "Thanks for subscribing to technical training"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: report:crm.lead.demo:0
-msgid "Partner :"
-msgstr ""
-
-#. module: marketing_campaign_crm_demo
-#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_8
-msgid "Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.\n"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_2
+msgid "Hello,We have very good offer that might suit you.\n"
+" We propose you to subscribe to the OpenERP Discovery Day on May 2010.\n"
+" If any further information required kindly revert back.\n"
+" We really appreciate your co-operation on this.\n"
" Regards,OpenERP Team,"
msgstr ""
#. module: marketing_campaign_crm_demo
-#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_6
-msgid "Propose paid training to Silver partners"
+#: model:email.template,def_body_text:marketing_campaign_crm_demo.email_template_6
+msgid "Hello, We have very good offer that might suit you.\n"
+" For our silver partners,We are paid technical training on june,2010.\n"
+" If any further information required kindly revert back.\n"
+" I really appreciate your co-operation on this.\n"
+" Regards,OpenERP Team,"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.module.module,shortdesc:marketing_campaign_crm_demo.module_meta_information
+msgid "marketing_campaign_crm_demo"
+msgstr ""
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,def_subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
msgstr ""
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 0bdbf73ac1e..162f7f8664d 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:53+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:53+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -297,11 +297,6 @@ msgstr ""
msgid "Date until which membership remains active."
msgstr ""
-#. module: membership
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
#. module: membership
#: view:product.product:0
msgid "Membership products"
@@ -348,8 +343,19 @@ msgid "September"
msgstr ""
#. module: membership
-#: selection:report.membership,month:0
-msgid "December"
+#: model:ir.module.module,description:membership.module_meta_information
+msgid "\n"
+"This module allows you to manage all operations for managing memberships.\n"
+"It supports different kind of members:\n"
+"* Free member\n"
+"* Associated member (ex: a group subscribe for a membership for all\n"
+" subsidiaries)\n"
+"* Paid members,\n"
+"* Special member prices, ...\n"
+"\n"
+"It is integrated with sales and accounting to allow you to automatically\n"
+"invoice and send propositions for membership renewal.\n"
+" "
msgstr ""
#. module: membership
@@ -645,6 +651,11 @@ msgstr ""
msgid "Last 30 Days"
msgstr ""
+#. module: membership
+#: selection:report.membership,month:0
+msgid "December"
+msgstr ""
+
#. module: membership
#: view:membership.invoice:0
msgid "Close"
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 6a3c87b5877..fd09e5a8e1f 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:54+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:54+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,6 @@ msgstr ""
msgid "No. Of Cycles"
msgstr ""
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of operations this workcenter can do."
-msgstr ""
-
#. module: mrp
#: help:mrp.production,location_src_id:0
msgid "Location where the system will look for components."
@@ -101,6 +96,11 @@ msgstr ""
msgid "Routings"
msgstr ""
+#. module: mrp
+#: field:mrp.workcenter,product_id:0
+msgid "Work Center Product"
+msgstr ""
+
#. module: mrp
#: view:mrp.bom:0
msgid "Search Bill Of Material"
@@ -116,6 +116,11 @@ msgstr ""
msgid "To Produce"
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
#: view:mrp.bom:0
#: field:mrp.bom,code:0
@@ -203,6 +208,11 @@ msgstr ""
msgid "Define specific property groups that can be assigned to the properties of your bills of materials."
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,product_id:0
+msgid "Fill this product to track easily your production costs in the analytic accounting."
+msgstr ""
+
#. module: mrp
#: model:process.node,note:mrp.process_node_purchaseprocure0
msgid "For purchased material"
@@ -510,11 +520,6 @@ msgstr ""
msgid "March"
msgstr ""
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter_load
-msgid "Workcenter Load"
-msgstr ""
-
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
msgid "Specify Cost of Workcenter per cycle."
@@ -532,11 +537,6 @@ msgstr ""
msgid "Produce"
msgstr ""
-#. module: mrp
-#: help:mrp.product_price,number:0
-msgid "Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this qunatity."
-msgstr ""
-
#. module: mrp
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
@@ -579,6 +579,7 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
+#: model:ir.model,name:mrp.model_mrp_workcenter_load
#: model:ir.model,name:mrp.model_report_workcenter_load
msgid "Work Center Load"
msgstr ""
@@ -606,12 +607,11 @@ msgid "Planning"
msgstr ""
#. module: mrp
-#: view:mrp.workcenter:0
-msgid "Costing Information"
+#: view:mrp.production:0
+msgid "Ready"
msgstr ""
#. module: mrp
-#: help:mrp.routing.workcenter,hour_nbr:0
#: help:mrp.workcenter,time_cycle:0
msgid "Time in hours for doing one cycle."
msgstr ""
@@ -761,6 +761,11 @@ msgstr ""
msgid "Procurement of raw material"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,hour_nbr:0
+msgid "Time in hours for this work center to achieve the operation of the specified routing."
+msgstr ""
+
#. module: mrp
#: view:mrp.production:0
#: field:mrp.production,cycle_total:0
@@ -1006,6 +1011,42 @@ msgstr ""
msgid "Order quantity cannot be negative or zero !"
msgstr ""
+#. module: mrp
+#: model:ir.module.module,description:mrp.module_meta_information
+msgid "\n"
+" This is the base module to manage the manufacturing process in OpenERP.\n"
+"\n"
+" Features:\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"
+" * Scheduler computation periodically / Just In Time module\n"
+" * Multi-pos, multi-warehouse\n"
+" * Different reordering policies\n"
+" * Cost method by product: standard price, average price\n"
+" * Easy analysis of troubles or needs\n"
+" * Very flexible\n"
+" * Allows to browse Bill of Materials in complete structure\n"
+" that include child and phantom BoMs\n"
+" It supports complete integration and planification of stockable goods,\n"
+" consumable of services. Services are completely integrated with the rest\n"
+" of the software. For instance, you can set up a sub-contracting service\n"
+" in a BoM to automatically purchase on order the assembly of your production.\n"
+"\n"
+" Reports provided by this module:\n"
+" * Bill of Material structure and components\n"
+" * Load forecast on workcenters\n"
+" * Print a production order\n"
+" * Stock forecasts\n"
+" Dashboard provided by this module::\n"
+" * List of next production orders\n"
+" * List of deliveries (out picking)\n"
+" * Graph of work center load\n"
+" * List of procurement in exception\n"
+" "
+msgstr ""
+
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action3
msgid "Manufacturing Orders in Progress"
@@ -1495,6 +1536,12 @@ msgstr ""
msgid "Production Analysis"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/mrp.py:0
+#, python-format
+msgid "Copy"
+msgstr ""
+
#. module: mrp
#: view:mrp.production.lot.line:0
msgid "Production Products"
@@ -1802,6 +1849,11 @@ msgstr ""
msgid "Number of Hours"
msgstr ""
+#. module: mrp
+#: view:mrp.workcenter:0
+msgid "Costing Information"
+msgstr ""
+
#. module: mrp
#: model:process.node,name:mrp.process_node_purchaseprocure0
msgid "Procurement Orders"
@@ -1879,7 +1931,6 @@ msgid "BoM Revisions"
msgstr ""
#. module: mrp
-#: view:mrp.production:0
#: selection:mrp.production,state:0
#: selection:mrp.production.order,state:0
msgid "Draft"
@@ -2154,6 +2205,11 @@ msgstr ""
msgid "In order to supply raw material (to be purchased or produced), the production order creates as much procurement orders as components listed in the BOM, through a run of the schedulers (MRP)."
msgstr ""
+#. module: mrp
+#: help:mrp.product_price,number:0
+msgid "Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this quantity."
+msgstr ""
+
#. module: mrp
#: selection:mrp.bom,method:0
msgid "On Stock"
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 135d5007f90..d5bc8f39e6c 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -53,11 +53,23 @@ class mrp_workcenter(osv.osv):
'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]),
'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True),
+ 'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to track easily your production costs in the analytic accounting."),
}
_defaults = {
'capacity_per_cycle': 1.0,
'resource_type': 'material',
}
+
+ def on_change_product_cost(self, cr, uid, ids, product_id, context=None):
+ if context is None:
+ context = {}
+ value = {}
+
+ if product_id:
+ cost = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+ value = {'costs_hour': cost.standard_price}
+ return {'value': value}
+
mrp_workcenter()
@@ -99,8 +111,8 @@ class mrp_routing_workcenter(osv.osv):
'name': fields.char('Name', size=64, required=True),
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of routing workcenters."),
'cycle_nbr': fields.float('Number of Cycles', required=True,
- help="Number of operations this workcenter can do."),
- 'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for doing one cycle."),
+ help="Number of iterations this work center has to do in the specified operation of the routing."),
+ 'hour_nbr': fields.float('Number of Hours', required=True, help="Time in hours for this work center to achieve the operation of the specified routing."),
'routing_id': fields.many2one('mrp.routing', 'Parent Routing', select=True, ondelete='cascade',
help="Routing indicates all the workcenters used, for how long and/or cycles." \
"If Routing is indicated then,the third tab of a production order (workcenters) will be automatically pre-completed."),
@@ -323,6 +335,15 @@ class mrp_bom(osv.osv):
result = result + res[0]
result2 = result2 + res[1]
return result, result2
+
+ def copy_data(self, cr, uid, id, default=None, context=None):
+ if default is None:
+ default = {}
+ if context is None:
+ context = {}
+ bom_data = self.read(cr, uid, id, [], context=context)
+ default.update({'name': bom_data['name'] + ' ' + _('Copy')})
+ return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
mrp_bom()
@@ -738,7 +759,10 @@ class mrp_production(osv.osv):
'account_id': account,
'general_account_id': wc.costs_general_account_id.id,
'journal_id': wc.costs_journal_id.id,
- 'code': wc.code
+ 'ref': wc.code,
+ 'product_id': wc.product_id.id,
+ 'unit_amount': wc_line.hour,
+ 'product_uom_id': wc.product_id.uom_id.id
} )
if wc.costs_journal_id and wc.costs_general_account_id:
value = wc_line.cycle * wc.costs_cycle
@@ -751,7 +775,10 @@ class mrp_production(osv.osv):
'account_id': account,
'general_account_id': wc.costs_general_account_id.id,
'journal_id': wc.costs_journal_id.id,
- 'code': wc.code,
+ 'ref': wc.code,
+ 'product_id': wc.product_id.id,
+ 'unit_amount': wc_line.cycle,
+ 'product_uom_id': wc.product_id.uom_id.id
} )
return amount
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index cf491f0d0e6..e17c3370ac3 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index c3b932e6129..496462b390c 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -70,4 +70,4 @@
"access_stock_picking_mrp_manager","stock.picking mrp_manager","stock.model_stock_picking","mrp.group_mrp_manager",1,0,0,0
"access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0
"access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0
-"access_mrp_bom","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
+"access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index 3e50552cd9e..8758bc09cd5 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -113,6 +113,9 @@ class StockMove(osv.osv):
production_obj.force_production(cr, uid, [prod.id])
wf_service.trg_validate(uid, 'mrp.production', prod.id, 'button_produce', cr)
for new_move in new_moves:
+ if new_move == move.id:
+ #This move is already there in move lines of production order
+ continue
production_obj.write(cr, uid, production_ids, {'move_lines': [(4, new_move)]})
res.append(new_move)
return res
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index 8e26561adad..2a685e8c833 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -25,7 +25,7 @@ class mrp_price(osv.osv_memory):
_name = 'mrp.product_price'
_description = 'Product Price'
_columns = {
- 'number': fields.integer('Quantity', required=True, help="Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this qunatity."),
+ 'number': fields.integer('Quantity', required=True, help="Specify quantity of products to produce or buy. Report of Cost structure will be displayed base on this quantity."),
}
_defaults = {
'number': 1,
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
index fc4c90f8c54..3f4fd86633a 100644
--- a/addons/mrp/wizard/mrp_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -23,7 +23,7 @@ from osv import fields, osv
class mrp_workcenter_load(osv.osv_memory):
_name = 'mrp.workcenter.load'
- _description = 'Workcenter Load'
+ _description = 'Work Center Load'
_columns = {
'time_unit': fields.selection([('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')],'Type of period', required=True),
diff --git a/addons/mrp_jit/i18n/mrp_jit.pot b/addons/mrp_jit/i18n/mrp_jit.pot
index 079ae643f09..da0621d10dc 100644
--- a/addons/mrp_jit/i18n/mrp_jit.pot
+++ b/addons/mrp_jit/i18n/mrp_jit.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:55+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:55+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,3 +20,22 @@ msgstr ""
msgid "MRP JIT"
msgstr ""
+#. module: mrp_jit
+#: model:ir.module.module,description:mrp_jit.module_meta_information
+msgid "\n"
+" This module allows Just In Time computation of procurement orders.\n"
+"\n"
+" If you install this module, you will not have to run the regular procurement \n"
+" scheduler anymore (but you still need to run the minimum order point rule \n"
+" scheduler, or for example let it run daily.)\n"
+" All procurement orders will be processed immediately, which could in some\n"
+" cases entail a small performance impact.\n"
+"\n"
+" It may also increase your stock size because products are reserved as soon\n"
+" as possible and the scheduler time range is not taken into account anymore. \n"
+" In that case, you can not use priorities any more on the different picking.\n"
+" \n"
+" \n"
+" "
+msgstr ""
+
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index c420b5b780e..e2426cf3684 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:55+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:55+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -391,6 +391,35 @@ msgstr ""
msgid "Started"
msgstr ""
+#. module: mrp_operations
+#: model:ir.module.module,description:mrp_operations.module_meta_information
+msgid "\n"
+" This module adds state, date_start,date_stop in production order operation lines\n"
+" (in the \"Work Centers\" tab)\n"
+" State: draft, confirm, done, cancel\n"
+" When finishing/confirming,cancelling production orders set all state lines to the according state\n"
+" Create menus:\n"
+" Production Management > All Operations\n"
+" Production Management > All Operations > Operations To Do (state=\"confirm\")\n"
+" Which is a view on \"Work Centers\" lines in production order,\n"
+" editable tree\n"
+"\n"
+" Add buttons in the form view of production order under workcenter tab:\n"
+" * start (set state to confirm), set date_start\n"
+" * done (set state to done), set date_stop\n"
+" * set to draft (set state to draft)\n"
+" * cancel set state to cancel\n"
+"\n"
+" When the production order becomes \"ready to produce\", operations must\n"
+" become 'confirmed'. When the production order is done, all operations\n"
+" must become done.\n"
+"\n"
+" The field delay is the delay(stop date - start date).\n"
+" So that we can compare the theoretic delay and real delay.\n"
+"\n"
+" "
+msgstr ""
+
#. module: mrp_operations
#: selection:mrp.workorder,month:0
msgid "June"
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 63228f611b4..33809832e15 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:56+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:56+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -121,6 +121,19 @@ msgstr ""
msgid "Notes"
msgstr ""
+#. module: mrp_repair
+#: model:ir.module.module,description:mrp_repair.module_meta_information
+msgid "\n"
+" The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module:\n"
+" * Add/remove products in the reparation\n"
+" * Impact for stocks\n"
+" * Invoicing (products and/or services)\n"
+" * Warranty concept\n"
+" * Repair quotation report\n"
+" * Notes for the technician and for the final customer\n"
+""
+msgstr ""
+
#. module: mrp_repair
#: field:mrp.repair,amount_tax:0
#: field:mrp.repair.fee,tax_id:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f2ffd87c095..899a7460fdf 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -93,7 +93,7 @@ class mrp_repair(osv.osv):
cur = repair.pricelist_id.currency_id
res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
return res
-
+
def _get_default_address(self, cr, uid, ids, field_name, arg, context=None):
res = {}
partner_obj = self.pool.get('res.partner')
@@ -222,7 +222,7 @@ class mrp_repair(osv.osv):
if move_id:
move = self.pool.get('stock.move').browse(cr, uid, move_id)
product = self.pool.get('product.product').browse(cr, uid, prod_id)
- limit = datetime.strptime(move.date_expected, '%Y-%m-%d %H:%M:%S') + relativedelta(months=product.warranty)
+ limit = datetime.strptime(move.date_expected, '%Y-%m-%d %H:%M:%S') + relativedelta(months=int(product.warranty))
data['value']['guarantee_limit'] = limit.strftime('%Y-%m-%d')
data['value']['location_id'] = move.location_dest_id.id
data['value']['location_dest_id'] = move.location_dest_id.id
@@ -336,7 +336,7 @@ class mrp_repair(osv.osv):
"""
mrp_line_obj = self.pool.get('mrp.repair.line')
for repair in self.browse(cr, uid, ids, context=context):
- mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'})
+ mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'}, context=context)
self.write(cr,uid,ids,{'state':'cancel'})
return True
@@ -425,14 +425,14 @@ class mrp_repair(osv.osv):
name = fee.name
if not fee.product_id:
raise osv.except_osv(_('Warning !'), _('No product defined on Fees!'))
-
+
if fee.product_id.property_account_income:
account_id = fee.product_id.property_account_income.id
elif fee.product_id.categ_id.property_account_income_categ:
account_id = fee.product_id.categ_id.property_account_income_categ.id
else:
raise osv.except_osv(_('Error !'), _('No account defined for product "%s".') % fee.product_id.name)
-
+
invoice_fee_id = inv_line_obj.create(cr, uid, {
'invoice_id': inv_id,
'name': name,
@@ -453,7 +453,10 @@ class mrp_repair(osv.osv):
""" Writes repair order state to 'Ready'
@return: True
"""
- self.write(cr, uid, ids, {'state': 'ready'})
+ for repair in self.browse(cr, uid, ids, context=context):
+ self.pool.get('mrp.repair.line').write(cr, uid, [l.id for
+ l in repair.operations], {'state': 'confirmed'}, context=context)
+ self.write(cr, uid, [repair.id], {'state': 'ready'})
return True
def action_invoice_cancel(self, cr, uid, ids, context=None):
@@ -467,20 +470,27 @@ class mrp_repair(osv.osv):
""" Writes repair order state to 'Under Repair'
@return: True
"""
- self.write(cr, uid, ids, {'state': 'under_repair'})
+ repair_line = self.pool.get('mrp.repair.line')
+ for repair in self.browse(cr, uid, ids, context=context):
+ repair_line.write(cr, uid, [l.id for
+ l in repair.operations], {'state': 'confirmed'}, context=context)
+ repair.write({'state': 'under_repair'})
return True
def action_invoice_end(self, cr, uid, ids, context=None):
""" Writes repair order state to 'Ready' if invoice method is Before repair.
@return: True
"""
+ repair_line = self.pool.get('mrp.repair.line')
for order in self.browse(cr, uid, ids, context=context):
val = {}
if (order.invoice_method == 'b4repair'):
val['state'] = 'ready'
+ repair_line.write(cr, uid, [l.id for
+ l in order.operations], {'state': 'confirmed'}, context=context)
else:
pass
- self.write(cr, uid, [order.id], val)
+ self.write(cr, uid, [order.id], val, context=context)
return True
def action_repair_end(self, cr, uid, ids, context=None):
@@ -527,7 +537,7 @@ class mrp_repair(osv.osv):
'tracking_id': False,
'state': 'done',
})
- repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id})
+ repair_line_obj.write(cr, uid, [move.id], {'move_id': move_id, 'state': 'done'}, context=context)
if repair.deliver_bool:
pick_name = seq_obj.get(cr, uid, 'stock.picking.out')
picking = pick_obj.create(cr, uid, {
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
index 4d3ea5e6f2d..e9b03c3ab69 100644
--- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot
+++ b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:56+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:56+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -42,8 +42,13 @@ msgid "MRP Sub Product - To produce several products from one production order"
msgstr ""
#. module: mrp_subproduct
-#: view:mrp.bom:0
-msgid "Sub Products"
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
msgstr ""
#. module: mrp_subproduct
@@ -57,8 +62,15 @@ msgid "Bill of Material"
msgstr ""
#. module: mrp_subproduct
-#: field:mrp.subproduct,product_qty:0
-msgid "Product Qty"
+#: model:ir.module.module,description:mrp_subproduct.module_meta_information
+msgid "\n"
+"This module allows you to produce several products from one production order.\n"
+"You can configure sub-products in the bill of material.\n"
+"Without this module:\n"
+" A + B + C -> D\n"
+"With this module:\n"
+" A + B + C -> D + E\n"
+" "
msgstr ""
#. module: mrp_subproduct
@@ -77,8 +89,8 @@ msgid "Error ! You can not create recursive BoM."
msgstr ""
#. module: mrp_subproduct
-#: field:mrp.bom,sub_products:0
-msgid "sub_products"
+#: view:mrp.bom:0
+msgid "Sub Products"
msgstr ""
#. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index 3229cdce33c..2d7c761da90 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
##############################################################################
-#
+#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL ().
#
@@ -15,7 +15,7 @@
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
+# along with this program. If not, see .
#
##############################################################################
@@ -35,7 +35,7 @@ class mrp_subproduct(osv.osv):
_defaults={
'subproduct_type': lambda *args: 'fixed'
}
-
+
def onchange_product_id(self, cr, uid, ids, product_id, context=None):
""" Changes UoM if product_id changes.
@param product_id: Changed product_id
@@ -53,7 +53,7 @@ class mrp_bom(osv.osv):
_name = 'mrp.bom'
_description = 'Bill of Material'
_inherit='mrp.bom'
-
+
_columns={
'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'sub_products'),
}
@@ -62,7 +62,7 @@ mrp_bom()
class mrp_production(osv.osv):
_name = 'mrp.production'
_description = 'Production'
- _inherit= 'mrp.production'
+ _inherit= 'mrp.production'
def action_confirm(self, cr, uid, ids):
""" Confirms production order and calculates quantity based on subproduct_type.
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index f1b503638ab..4cf8b28cfd1 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:57+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:57+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:44+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: multi_company
-#: model:account.journal,name:multi_company.cash_journal_multi_in
-msgid "Cash Journal - (OpenERP IN)"
-msgstr ""
-
#. module: multi_company
#: model:res.company,overdue_msg:multi_company.res_company_odoo
#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
@@ -43,38 +38,8 @@ msgid "\n"
msgstr ""
#. module: multi_company
-#: model:account.journal,name:multi_company.check_journal_multi_in
-msgid "Checks Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
-msgid "Multi-Companies"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_sales_journal_multi_us
-msgid "Sales Credit Note Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.expenses_journal_multi_us
-msgid "Expenses Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.expenses_journal_multi_be
-msgid "Expenses Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.sales_journal_multi_us
-msgid "Sales Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.expenses_journal_multi_in
-msgid "Expenses Journal - (OpenERP IN)"
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
msgstr ""
#. module: multi_company
@@ -82,77 +47,17 @@ msgstr ""
msgid "Returning"
msgstr ""
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr ""
+
#. module: multi_company
#: model:ir.module.module,shortdesc:multi_company.module_meta_information
#: view:multi_company.default:0
msgid "Multi Company"
msgstr ""
-#. module: multi_company
-#: model:account.journal,name:multi_company.sales_journal_multi_in
-msgid "Sales Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.check_journal_multi_be
-msgid "Checks Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: view:multi_company.default:0
-msgid "Condition"
-msgstr ""
-
-#. module: multi_company
-#: model:product.category,name:multi_company.Odoo1
-msgid "Odoo Offers"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_expenses_journal_multi_us
-msgid "Expenses Credit Notes Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.cash_journal_multi_us
-msgid "Cash Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.bank_journal_multi_us
-msgid "Bank Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_sales_journal_multi_in
-msgid "Sales Credit Note Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.cash_journal_multi_be
-msgid "Cash Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.check_journal_multi_us
-msgid "Checks Journal - (OpenERP US)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.sales_journal_multi_be
-msgid "Sales Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_expenses_journal_multi_be
-msgid "Expenses Credit Notes Journal - (OpenERP BE)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_sales_journal_multi_be
-msgid "Sales Credit Note Journal - (OpenERP BE)"
-msgstr ""
-
#. module: multi_company
#: model:ir.actions.act_window,name:multi_company.action_inventory_form
#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
@@ -164,23 +69,21 @@ msgstr ""
msgid "Odoo Offer"
msgstr ""
-#. module: multi_company
-#: model:account.journal,name:multi_company.refund_expenses_journal_multi_in
-msgid "Expenses Credit Notes Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.bank_journal_multi_in
-msgid "Bank Journal - (OpenERP IN)"
-msgstr ""
-
-#. module: multi_company
-#: model:account.journal,name:multi_company.bank_journal_multi_be
-msgid "Bank Journal - (OpenERP BE)"
-msgstr ""
-
#. module: multi_company
#: view:multi_company.default:0
msgid "Matching"
msgstr ""
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.module.module,description:multi_company.module_meta_information
+msgid "\n"
+" Multicompany module is for managing a multicompany environment.\n"
+" This module is the base module for other multicompany modules.\n"
+" "
+msgstr ""
+
diff --git a/addons/outlook/i18n/outlook.pot b/addons/outlook/i18n/outlook.pot
index ce7d8528bdc..1111fc6218e 100644
--- a/addons/outlook/i18n/outlook.pot
+++ b/addons/outlook/i18n/outlook.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:57+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:57+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,8 +52,9 @@ msgid "Outlook Interface"
msgstr ""
#. module: outlook
-#: field:outlook.installer,config_logo:0
-msgid "Image"
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
msgstr ""
#. module: outlook
@@ -62,8 +63,16 @@ msgid "Outlook Plug-in "
msgstr ""
#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
+#: model:ir.module.module,description:outlook.module_meta_information
+msgid "\n"
+" This module provide the Outlook plug-in. \n"
+"\n"
+" Outlook plug-in allows you to select an object that you’d like to add\n"
+" to your email and its attachments from MS Outlook. You can select a partner, a task,\n"
+" a project, an analytical account, or any other object and Archived selected\n"
+" mail in mailgate.messages with attachments.\n"
+"\n"
+" "
msgstr ""
#. module: outlook
@@ -83,6 +92,11 @@ msgstr ""
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"
+msgstr ""
+
#. module: outlook
#: view:outlook.installer:0
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."
@@ -104,9 +118,8 @@ msgid "Installation and Configuration Steps"
msgstr ""
#. module: outlook
-#: field:outlook.installer,doc_name:0
-#: field:outlook.installer,name:0
-msgid "File name"
+#: field:outlook.installer,config_logo:0
+msgid "Image"
msgstr ""
#. module: outlook
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index e4a8219317f..e00bb0d770c 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:05:58+0000\n"
-"PO-Revision-Date: 2010-12-15 15:05:58+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,11 @@ msgstr ""
msgid "Name"
msgstr ""
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
#. module: pad
#: model:ir.model,name:pad.model_res_company
msgid "Companies"
@@ -38,8 +43,12 @@ msgid "Error! You can not create recursive companies."
msgstr ""
#. module: pad
-#: help:res.company,pad_index:0
-msgid "The root URL of the company's pad instance"
+#: model:ir.module.module,description:pad.module_meta_information
+msgid "\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+" "
msgstr ""
#. module: pad
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index f490d80e071..c1f0dad4910 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:00+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:00+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:47+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -447,6 +447,11 @@ msgstr ""
msgid "Codes"
msgstr ""
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
#. module: point_of_sale
#: view:all.closed.cashbox.of.the.day:0
#: view:pos.details:0
@@ -777,6 +782,11 @@ msgstr ""
msgid "Draft Invoice"
msgstr ""
+#. module: point_of_sale
+#: constraint:account.bank.statement.line:0
+msgid "The amount of the voucher must be the same amount as the one on the statement line"
+msgstr ""
+
#. module: point_of_sale
#: field:product.product,expense_pdt:0
msgid "Product for expenses"
@@ -799,11 +809,6 @@ msgstr ""
msgid "September"
msgstr ""
-#. module: point_of_sale
-#: model:account.journal,name:point_of_sale.pos_bankcard_journal
-msgid "Bancontact Journal"
-msgstr ""
-
#. module: point_of_sale
#: report:account.statement:0
#: report:all.closed.cashbox.of.the.day:0
@@ -1165,6 +1170,20 @@ msgstr ""
msgid "Connected Salesman"
msgstr ""
+#. module: point_of_sale
+#: model:ir.module.module,description:point_of_sale.module_meta_information
+msgid "\n"
+"Main features :\n"
+" - Fast encoding of the sale.\n"
+" - Allow to choose one payment mode (the quick way) or to split the payment between several payment mode.\n"
+" - Computation of the amount of money to return.\n"
+" - Create and confirm picking list automatically.\n"
+" - Allow the user to create invoice automatically.\n"
+" - Allow to refund former sales.\n"
+"\n"
+" "
+msgstr ""
+
#. module: point_of_sale
#: field:pos.order,price_type:0
msgid "Price method"
@@ -1256,11 +1275,6 @@ msgstr ""
msgid "Point of Sale Payment"
msgstr ""
-#. module: point_of_sale
-#: view:pos.box.out:0
-msgid "Output Operation"
-msgstr ""
-
#. module: point_of_sale
#: report:pos.details:0
#: report:pos.details_summary:0
@@ -1808,11 +1822,6 @@ msgstr ""
msgid "Discount "
msgstr ""
-#. module: point_of_sale
-#: model:account.journal,name:point_of_sale.pos_visa_journal
-msgid "Visa Journal"
-msgstr ""
-
#. module: point_of_sale
#: report:pos.invoice:0
msgid "Supplier Invoice"
@@ -1946,6 +1955,11 @@ 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
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 8a310dcbe0d..61e77ec57ab 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:01+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:01+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:49+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -215,6 +215,19 @@ msgstr ""
msgid "Starting Flow"
msgstr ""
+#. module: process
+#: model:ir.module.module,description:process.module_meta_information
+msgid "\n"
+" This module shows the basic processes involved\n"
+" in the selected modules and in the sequence they\n"
+" occur\n"
+"\n"
+" Note: This applies to the modules containing modulename_process_xml\n"
+" for e.g product/process/product_process_xml\n"
+"\n"
+" "
+msgstr ""
+
#. module: process
#: field:process.condition,model_states:0
msgid "Expression"
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 4c302d5bb74..92b93e249e0 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:02+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:02+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:50+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgid "Group By..."
msgstr ""
#. module: procurement
-#: view:procurement.order:0
-msgid "Planification"
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
msgstr ""
#. module: procurement
@@ -149,6 +149,11 @@ msgstr ""
msgid "Stock Move"
msgstr ""
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
#. module: procurement
#: selection:procurement.order,state:0
msgid "Ready"
@@ -191,6 +196,11 @@ msgid "Reference of the document that created this Procurement.\n"
"This is automatically completed by OpenERP."
msgstr ""
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr ""
+
#. module: procurement
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
@@ -373,6 +383,18 @@ msgstr ""
msgid "Service"
msgstr ""
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid "\n"
+" This is the module for computing Procurements.\n"
+" "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
msgid "Min Quantity"
@@ -522,9 +544,7 @@ msgid "Procurement Reason"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
#: sql_constraint:stock.warehouse.orderpoint:0
-#, python-format
msgid "Qty Multiple must be greater than zero."
msgstr ""
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index ca590d8fa4e..1b2d7c93466 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -119,11 +119,11 @@ class procurement_order(osv.osv):
'company_id': fields.many2one('res.company','Company',required=True),
}
_defaults = {
- 'state': lambda *a: 'draft',
- 'priority': lambda *a: '1',
+ 'state': 'draft',
+ 'priority': '1',
'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
- 'close_move': lambda *a: 0,
- 'procure_method': lambda *a: 'make_to_order',
+ 'close_move': 0,
+ 'procure_method': 'make_to_order',
'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'procurement.order', context=c)
}
@@ -488,6 +488,16 @@ class stock_warehouse_orderpoint(osv.osv):
_name = "stock.warehouse.orderpoint"
_description = "Minimum Inventory Rule"
+ def _get_draft_procurements(self, cr, uid, ids, field_name, arg, context=None):
+ if context is None:
+ context = {}
+ result = {}
+ procurement_obj = self.pool.get('procurement.order')
+ for orderpoint in self.browse(cr, uid, ids, context=context):
+ procurement_ids = procurement_obj.search(cr, uid , [('state', '=', 'draft'), ('product_id', '=', orderpoint.product_id.id), ('location_id', '=', orderpoint.location_id.id)])
+ result[orderpoint.id] = procurement_ids
+ return result
+
_columns = {
'name': fields.char('Name', size=32, required=True),
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the orderpoint without removing it."),
@@ -506,6 +516,8 @@ class stock_warehouse_orderpoint(osv.osv):
help="The procurement quantity will by rounded up to this multiple."),
'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
'company_id': fields.many2one('res.company','Company',required=True),
+ 'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \
+ string="Related Procurement Orders",help="Draft procurement of the product and location of that orderpoint"),
}
_defaults = {
'active': lambda *a: 1,
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 2cc3b4c199f..4fd723e118e 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -4,7 +4,7 @@
-
+
procurement.order.tree
@@ -63,10 +63,10 @@
-
+
-
+
@@ -145,7 +145,7 @@
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)
-
+
Procurement Exceptions
ir.actions.act_window
@@ -224,6 +224,10 @@
+
+
+
+
@@ -238,11 +242,11 @@
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.
-
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 9c83499f0a5..3a6e3336472 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -34,14 +34,14 @@ class procurement_order(osv.osv):
def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None):
'''
Call the scheduler to check the procurement order
-
+
@param self: The object pointer
@param cr: The current row, from the database cursor,
@param uid: The current user ID for security checks
@param ids: List of selected IDs
@param use_new_cursor: False or the dbname
@param context: A standard dictionary for contextual values
- @return: Dictionary of values
+ @return: Dictionary of values
'''
if context is None:
context = {}
@@ -50,7 +50,7 @@ class procurement_order(osv.osv):
if use_new_cursor:
cr = pooler.get_db(use_new_cursor).cursor()
wf_service = netsvc.LocalService("workflow")
-
+
procurement_obj = self.pool.get('procurement.order')
if not ids:
ids = procurement_obj.search(cr, uid, [], order="date_planned")
@@ -112,13 +112,13 @@ class procurement_order(osv.osv):
if uid:
request = self.pool.get('res.request')
summary = '''Here is the procurement scheduling report.
-
+
Start Time: %s
End Time: %s
Total Procurements processed: %d
Procurements with exceptions: %d
Skipped Procurements (scheduled date outside of scheduler range) %d
-
+
Exceptions:\n'''% (start_date, end_date, report_total, report_except, report_later)
summary += '\n'.join(report)
request.create(cr, uid,
@@ -141,7 +141,7 @@ class procurement_order(osv.osv):
def create_automatic_op(self, cr, uid, context=None):
"""
Create procurement of virtual stock < 0
-
+
@param self: The object pointer
@param cr: The current row, from the database cursor,
@param uid: The current user ID for security checks
@@ -157,7 +157,9 @@ class procurement_order(osv.osv):
warehouse_ids = warehouse_obj.search(cr, uid, [], context=context)
- cr.execute('select id from product_product')
+ cr.execute('select p.id from product_product p \
+ join product_template t on (p.product_tmpl_id=t.id) \
+ where p.active=True and t.purchase_ok=True')
products_id = [x for x, in cr.fetchall()]
for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
@@ -191,14 +193,14 @@ class procurement_order(osv.osv):
'''
Create procurement based on Orderpoint
use_new_cursor: False or the dbname
-
+
@param self: The object pointer
@param cr: The current row, from the database cursor,
@param user_id: The current user ID for security checks
@param context: A standard dictionary for contextual values
@param param: False or the dbname
@return: Dictionary of values
- """
+ """
'''
if context is None:
context = {}
@@ -216,23 +218,42 @@ class procurement_order(osv.osv):
self.create_automatic_op(cr, uid, context=context)
while ids:
ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
- for op in orderpoint_obj.browse(cr, uid, ids):
+ for op in orderpoint_obj.browse(cr, uid, ids, context=context):
if op.procurement_id.state != 'exception':
if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
continue
prods = location_obj._product_virtual_get(cr, uid,
op.location_id.id, [op.product_id.id],
{'uom': op.product_uom.id})[op.product_id.id]
+
if prods < op.product_min_qty:
qty = max(op.product_min_qty, op.product_max_qty)-prods
+
reste = qty % op.qty_multiple
if reste > 0:
qty += op.qty_multiple - reste
+
newdate = datetime.today() + relativedelta(
days = int(op.product_id.seller_delay))
if qty <= 0:
continue
if op.product_id.type not in ('consu'):
+ if op.procurement_draft_ids:
+ # Check draft procurement related to this order point
+ pro_ids = [x.id for x in op.procurement_draft_ids]
+ cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
+ procure_datas = cr.dictfetchall()
+ to_generate = qty
+ for proc_data in procure_datas:
+ if to_generate >= proc_data['product_qty']:
+ wf_service.trg_validate(uid, 'procurement.order', proc_data['id'], 'button_confirm', cr)
+ procurement_obj.write(cr, uid, [proc_data['id']], {'origin': op.name}, context=context)
+ to_generate -= proc_data['product_qty']
+ if not to_generate:
+ break
+ qty = to_generate
+
+ if qty:
proc_id = procurement_obj.create(cr, uid, {
'name': op.name,
'date_planned': newdate.strftime('%Y-%m-%d'),
@@ -248,7 +269,7 @@ class procurement_order(osv.osv):
wf_service.trg_validate(uid, 'procurement.order', proc_id,
'button_check', cr)
orderpoint_obj.write(cr, uid, [op.id],
- {'procurement_id': proc_id})
+ {'procurement_id': proc_id}, context=context)
offset += len(ids)
if use_new_cursor:
cr.commit()
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 0583959553b..36644321589 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:04+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:04+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -132,6 +132,11 @@ msgstr ""
msgid "Error ! You can not create recursive categories."
msgstr ""
+#. module: product
+#: help:pricelist.partnerinfo,min_quantity:0
+msgid "The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise."
+msgstr ""
+
#. module: product
#: model:product.template,name:product.product_product_24_product_template
msgid "Keyboard"
@@ -179,7 +184,6 @@ msgid "PriceList"
msgstr ""
#. module: product
-#: field:product.supplierinfo,product_uom:0
#: view:product.template:0
msgid "UOM"
msgstr ""
@@ -237,11 +241,6 @@ msgstr ""
msgid "Products: "
msgstr ""
-#. module: product
-#: constraint:product.template:0
-msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
-
#. module: product
#: field:product.category,parent_id:0
msgid "Parent Category"
@@ -445,6 +444,11 @@ msgstr ""
msgid "Codes"
msgstr ""
+#. module: product
+#: help:product.supplierinfo,product_uom:0
+msgid "Choose here the Unit of Measure in which the prices and quantities are expressed below."
+msgstr ""
+
#. module: product
#: field:product.price_list,qty4:0
msgid "Quantity-4"
@@ -633,14 +637,19 @@ msgstr ""
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."
+msgstr ""
+
#. module: product
#: view:product.pricelist.item:0
msgid "New Price ="
msgstr ""
#. module: product
-#: help:product.pricelist.item,sequence:0
-msgid "Gives the sequence order when displaying a list of pricelist items."
+#: help:pricelist.partnerinfo,price:0
+msgid "This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise"
msgstr ""
#. module: product
@@ -1059,6 +1068,28 @@ msgstr ""
msgid "Unit of Sale"
msgstr ""
+#. module: product
+#: model:ir.module.module,description:product.module_meta_information
+msgid "\n"
+" This is the base module for managing products and pricelists in OpenERP.\n"
+"\n"
+" Products support variants, different pricing methods, suppliers\n"
+" information, make to stock/order, different unit of measures,\n"
+" packaging and properties.\n"
+"\n"
+" Pricelists support:\n"
+" * Multiple-level of discount (by product, category, quantities)\n"
+" * Compute price based on different criteria:\n"
+" * Other pricelist,\n"
+" * Cost price,\n"
+" * List price,\n"
+" * Supplier price, ...\n"
+" Pricelists preferences by product and/or partners.\n"
+"\n"
+" Print product labels with barcode.\n"
+" "
+msgstr ""
+
#. module: product
#: help:product.template,seller_delay:0
msgid "This is the average delay in days between the purchase order confirmation and the reception of goods for this product and for the default supplier. It is used by the scheduler to order requests based on reordering delays."
@@ -1176,6 +1207,11 @@ msgstr ""
msgid "Price List Version"
msgstr ""
+#. module: product
+#: help:product.pricelist.item,sequence:0
+msgid "Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."
+msgstr ""
+
#. module: product
#: selection:product.template,type:0
msgid "Consumable"
@@ -1457,6 +1493,11 @@ msgstr ""
msgid "Make to Order"
msgstr ""
+#. module: product
+#: help:product.packaging,qty:0
+msgid "The total number of products you can put by pallet or box."
+msgstr ""
+
#. module: product
#: field:product.product,variants:0
msgid "Variants"
@@ -1560,8 +1601,8 @@ msgid "Name of this kind of price."
msgstr ""
#. module: product
-#: help:product.packaging,qty:0
-msgid "The total number of products you can put by pallet or box."
+#: field:product.supplierinfo,product_uom:0
+msgid "Supplier UoM"
msgstr ""
#. module: product
@@ -1646,11 +1687,6 @@ msgstr ""
msgid "Pricelist Name"
msgstr ""
-#. module: product
-#: help:product.supplierinfo,product_uom:0
-msgid "Supplier Product UoM."
-msgstr ""
-
#. module: product
#: model:ir.model,name:product.model_product_pricelist_version
#: view:product.pricelist:0
@@ -1852,11 +1888,6 @@ msgstr ""
msgid "This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."
msgstr ""
-#. module: product
-#: help:product.supplierinfo,min_qty:0
-msgid "The minimal quantity to purchase to this supplier, expressed in the default unit of measure."
-msgstr ""
-
#. module: product
#: selection:product.template,mes_type:0
msgid "Variable"
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index e2c4f6735b2..1468cd45200 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -225,7 +225,7 @@ class product_pricelist(osv.osv):
'ORDER BY sequence',
(tmpl_id, product_id, pricelist_id, qty))
res1 = cr.dictfetchall()
-
+ uom_price_already_computed = False
for res in res1:
if res:
if res['base'] == -1:
@@ -246,11 +246,17 @@ class product_pricelist(osv.osv):
[('product_id', '=', tmpl_id)] + where)
price = 0.0
if sinfo:
+ qty_in_product_uom = qty
+ product_default_uom = product_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0]
+ seller_uom = supplierinfo_obj.read(cr, uid, sinfo, ['product_uom'])[0]['product_uom'][0]
+ if seller_uom and product_default_uom and product_default_uom != seller_uom:
+ uom_price_already_computed = True
+ qty_in_product_uom = product_uom_obj._compute_qty(cr, uid, product_default_uom, qty, to_uom_id=seller_uom)
cr.execute('SELECT * ' \
'FROM pricelist_partnerinfo ' \
'WHERE suppinfo_id IN %s' \
'AND min_quantity <= %s ' \
- 'ORDER BY min_quantity DESC LIMIT 1', (tuple(sinfo),qty,))
+ 'ORDER BY min_quantity DESC LIMIT 1', (tuple(sinfo),qty_in_product_uom,))
res2 = cr.dictfetchone()
if res2:
price = res2['price']
@@ -279,7 +285,7 @@ class product_pricelist(osv.osv):
price = False
if price:
- if 'uom' in context:
+ if 'uom' in context and not uom_price_already_computed:
product = products_dict[product_id]
uom = product.uos_id or product.uom_id
price = self.pool.get('product.uom')._compute_price(cr, uid, uom.id, price, context['uom'])
@@ -538,7 +544,7 @@ class product_pricelist_item(osv.osv):
'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"),
'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
- 'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of pricelist items."),
+ 'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
diff --git a/addons/product/product.py b/addons/product/product.py
index 62ce31be9d6..372919f6212 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -357,7 +357,6 @@ class product_template(osv.osv):
return True
_constraints = [
- (_check_uos, 'Error: UOS must be in a different category than the UOM', ['uos_id']),
(_check_uom, 'Error: The default UOM and the purchase UOM must be in the same category.', ['uom_id']),
]
@@ -462,6 +461,7 @@ class product_product(osv.osv):
_description = "Product"
_table = "product_product"
_inherits = {'product.template': 'product_tmpl_id'}
+ _order = 'default_code,name_template'
_columns = {
'qty_available': fields.function(_product_qty_available, method=True, type='float', string='Real Stock'),
'virtual_available': fields.function(_product_virtual_available, method=True, type='float', string='Virtual Stock'),
@@ -480,6 +480,7 @@ class product_product(osv.osv):
'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')),
'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
+ 'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True),
}
def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
@@ -530,7 +531,13 @@ class product_product(osv.osv):
}
result.append(_name_get(mydict))
else:
- result.append(_name_get(self.read(cr, user, product.id, ['variants','name','default_code'], context=context)))
+ mydict = {
+ 'id': product.id,
+ 'name': product.name,
+ 'default_code': product.default_code,
+ 'variants': product.variants
+ }
+ result.append(_name_get(mydict))
return result
def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
@@ -705,8 +712,8 @@ class product_supplierinfo(osv.osv):
'product_name': fields.char('Supplier Product Name', size=128, help="This supplier's product name will be used when printing a request for quotation. Keep empty to use the internal one."),
'product_code': fields.char('Supplier Product Code', size=64, help="This supplier's product code will be used when printing a request for quotation. Keep empty to use the internal one."),
'sequence' : fields.integer('Sequence', help="Assigns the priority to the list of product supplier."),
- 'product_uom': fields.many2one('product.uom', string="UOM", help="Supplier Product UoM."),
- 'min_qty': fields.float('Minimal Quantity', required=True, help="The minimal quantity to purchase to this supplier, expressed in the default unit of measure."),
+ 'product_uom': fields.many2one('product.uom', string="Supplier UoM", help="Choose here the Unit of Measure in which the prices and quantities are expressed below."),
+ 'min_qty': fields.float('Minimal Quantity', required=True, help="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."),
'qty': fields.function(_calc_qty, method=True, store=True, type='float', string='Quantity', multi="qty", help="This is a quantity which is converted into Default Uom."),
'product_id' : fields.many2one('product.template', 'Product', required=True, ondelete='cascade', select=True),
'delay' : fields.integer('Delivery Lead Time', required=True, help="Lead time in days between the confirmation of the purchase order and the reception of the products in your warehouse. Used by the scheduler for automatic computation of the purchase order planning."),
@@ -775,8 +782,8 @@ class pricelist_partnerinfo(osv.osv):
_columns = {
'name': fields.char('Description', size=64),
'suppinfo_id': fields.many2one('product.supplierinfo', 'Partner Information', required=True, ondelete='cascade'),
- 'min_quantity': fields.float('Quantity', required=True),
- 'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price')),
+ 'min_quantity': fields.float('Quantity', required=True, help="The minimal quantity to trigger this rule, expressed in the supplier UoM if any or in the default UoM of the product otherrwise."),
+ 'price': fields.float('Unit Price', required=True, digits_compute=dp.get_precision('Purchase Price'), help="This price will be considered as a price for the supplier UoM if any or the default Unit of Measure of the product otherwise"),
}
_order = 'min_quantity asc'
pricelist_partnerinfo()
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index d0e2a780451..0ff14a6ca10 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -116,8 +116,8 @@
-
-
+
+
@@ -458,7 +458,7 @@
-
+
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 58e3de7a81b..aa629f6deba 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -132,6 +132,11 @@ msgstr ""
msgid "The number of days before a production lot should be removed."
msgstr ""
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr ""
+
#. module: product_expiry
#: help:product.product,use_time:0
msgid "The number of days before a production lot starts deteriorating without becoming dangerous."
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index cee80197e85..c2a8ffae19c 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:53+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: product_manufacturer
+#: model:ir.module.module,description:product_manufacturer.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
#. module: product_manufacturer
#: field:product.product,manufacturer_pref:0
msgid "Manufacturer Product Code"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index d15cd9aac98..237b0d0b0e4 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -95,8 +95,12 @@ msgid "Expected Sale - Turn Over"
msgstr ""
#. module: product_margin
-#: field:product.product,sale_expected:0
-msgid "Expected Sale"
+#: model:ir.module.module,description:product_margin.module_meta_information
+msgid "\n"
+"Adds a reporting menu in products that computes sales, purchases, margins\n"
+"and other interesting indicators based on invoices. The wizard to launch\n"
+"the report has several options to help you get the data you need.\n"
+""
msgstr ""
#. module: product_margin
@@ -105,8 +109,8 @@ msgid "Standard Price"
msgstr ""
#. module: product_margin
-#: help:product.product,purchase_num_invoiced:0
-msgid "Sum of Quantity in Supplier Invoices"
+#: field:product.product,sale_expected:0
+msgid "Expected Sale"
msgstr ""
#. module: product_margin
@@ -120,9 +124,8 @@ msgid "Expected Sale - Normal Cost"
msgstr ""
#. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
msgstr ""
#. module: product_margin
@@ -198,6 +201,11 @@ msgstr ""
msgid "Avg. Price in Supplier Invoices "
msgstr ""
+#. module: product_margin
+#: help:product.product,purchase_num_invoiced:0
+msgid "Sum of Quantity in Supplier Invoices"
+msgstr ""
+
#. module: product_margin
#: view:product.margin:0
msgid "Properties categories"
@@ -209,8 +217,9 @@ msgid "Total margin * 100 / Turnover"
msgstr ""
#. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: field:product.product,purchase_num_invoiced:0
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced"
msgstr ""
#. module: product_margin
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index 57a3d90d58c..e6581f5570a 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -27,6 +27,18 @@ msgstr ""
msgid "No Sale Pricelist Found "
msgstr ""
+#. module: product_visible_discount
+#: model:ir.module.module,description:product_visible_discount.module_meta_information
+msgid "\n"
+" This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.\n"
+" To this end, a new check box named \"Visible Discount\" is added to the pricelist form.\n"
+" Example:\n"
+" For the product PC1 and the partner \"Asustek\": if listprice=450, and the price calculated using Asustek's pricelist is 225\n"
+" If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225\n"
+" If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225\n"
+" "
+msgstr ""
+
#. module: product_visible_discount
#: model:ir.module.module,shortdesc:product_visible_discount.module_meta_information
#: field:product.pricelist,visible_discount:0
@@ -57,6 +69,6 @@ msgstr ""
#. module: product_visible_discount
#: model:ir.model,name:product_visible_discount.model_sale_order_line
-msgid "Sale Order Line"
+msgid "Sales Order Line"
msgstr ""
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
index 75a935160c6..474b5c2cff3 100644
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ b/addons/profile_tools/i18n/profile_tools.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:06+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:06+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
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"
@@ -53,8 +58,8 @@ msgid "Configure"
msgstr ""
#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
msgstr ""
#. module: profile_tools
@@ -108,13 +113,13 @@ msgid "Configuration Progress"
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
+#: field:misc_tools.installer,pad:0
+msgid "Native pad integration"
msgstr ""
#. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
+#: view:misc_tools.installer:0
+msgid "title"
msgstr ""
#. module: profile_tools
@@ -123,7 +128,7 @@ msgid "Web Share"
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Native pad integration"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
msgstr ""
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index d999a94a51e..ad2be7f43eb 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:55+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -720,6 +720,11 @@ msgstr ""
msgid "New title of the task delegated to the user"
msgstr ""
+#. module: project
+#: view:report.project.task.user:0
+msgid " Month-1 "
+msgstr ""
+
#. module: project
#: view:project.installer:0
msgid "Various OpenERP applications are available to manage your projects with different level of control and flexibility."
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index e05dbb9ed9d..50784e517f7 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -323,6 +323,11 @@ msgstr ""
msgid "Reminder"
msgstr ""
+#. module: project_caldav
+#: model:ir.module.module,description:project_caldav.module_meta_information
+msgid " Synchronize between Project task and Caldav Vtodo."
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
msgid "Assignees Detail"
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index fb5d4eb0202..926df07cbde 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -163,6 +163,23 @@ msgstr ""
msgid "Car"
msgstr ""
+#. 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
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 7ea41d7a0c8..93a06e9e31c 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:09+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:09+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -229,13 +229,6 @@ msgid "Convert To Task"
msgstr ""
#. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
-msgstr ""
-
-#. module: project_issue
-#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
-#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
#: view:project.issue.report:0
msgid "Issues Analysis"
msgstr ""
@@ -470,6 +463,13 @@ msgstr ""
msgid "Update Date"
msgstr ""
+#. module: project_issue
+#: model:ir.module.module,description:project_issue.module_meta_information
+msgid "\n"
+" This module provide Issues/Bugs Management in Project\n"
+" "
+msgstr ""
+
#. module: project_issue
#: view:project.issue:0
#: field:project.issue,categ_id:0
@@ -605,8 +605,8 @@ msgid "Feature Tracker Tree"
msgstr ""
#. module: project_issue
-#: help:project.issue,email_from:0
-msgid "These people will receive email."
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Bugs"
msgstr ""
#. module: project_issue
@@ -743,6 +743,11 @@ msgstr ""
msgid "Details"
msgstr ""
+#. module: project_issue
+#: help:project.issue,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
#. module: project_issue
#: view:project.issue:0
msgid "Reply"
@@ -774,6 +779,12 @@ msgstr ""
msgid "May"
msgstr ""
+#. module: project_issue
+#: model:ir.actions.act_window,name:project_issue.action_project_issue_report
+#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
+msgid "Issue Analysis"
+msgstr ""
+
#. module: project_issue
#: view:project.issue.report:0
msgid "Sale Team "
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 1a8e392bf98..9b903251abe 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,13 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: project_issue_sheet
+#: model:ir.module.module,description:project_issue_sheet.module_meta_information
+msgid "\n"
+" This module adds the Timesheet support for the Issues/Bugs Management in Project\n"
+" "
+msgstr ""
+
#. module: project_issue_sheet
#: model:ir.model,name:project_issue_sheet.model_account_analytic_line
msgid "Analytic Line"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index c3a219ab6a8..1824bd1df22 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,7 +53,6 @@ msgid "Error! project start-date must be lower then project end-date."
msgstr ""
#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
#: view:project.resource.allocation:0
msgid "Resources Allocation"
msgstr ""
@@ -63,12 +62,28 @@ msgstr ""
msgid "Schedule"
msgstr ""
+#. module: project_long_term
+#: model:ir.module.module,description:project_long_term.module_meta_information
+msgid "\n"
+"\n"
+" Long Term Project management module that tracks planning, scheduling, resources allocation.\n"
+" Mainly used with Big project management.\n"
+" - Project Phases will be maintained by Manager of the project\n"
+" - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given.\n"
+" If no project given then all the draft,open and pending state phases will be taken\n"
+" - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks\n"
+" - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date\n"
+"\n"
+" "
+msgstr ""
+
#. module: project_long_term
#: constraint:project.task:0
msgid "Error ! You cannot create recursive tasks."
msgstr ""
#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
msgid "Resource Allocations"
msgstr ""
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
index 3e530921bfe..69d0149689a 100644
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ b/addons/project_mailgate/i18n/project_mailgate.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -34,6 +34,11 @@ msgid "This module is an interface that synchronises mails with OpenERP Project
" "
msgstr ""
+#. module: project_mailgate
+#: view:project.task:0
+msgid "Attachments"
+msgstr ""
+
#. module: project_mailgate
#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
msgid "Project MailGateWay"
diff --git a/addons/project_messages/i18n/project_messages.pot b/addons/project_messages/i18n/project_messages.pot
index c5c34221779..ffdf87d8d0a 100644
--- a/addons/project_messages/i18n/project_messages.pot
+++ b/addons/project_messages/i18n/project_messages.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:11+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:11+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,6 +30,12 @@ msgstr ""
msgid "From"
msgstr ""
+#. module: project_messages
+#: model:ir.actions.act_window,name:project_messages.messages_form
+#: model:ir.ui.menu,name:project_messages.menu_messages_form
+msgid "Communication Messages"
+msgstr ""
+
#. module: project_messages
#: help:project.messages,to_id:0
msgid "Keep this empty to broadcast the message."
@@ -40,6 +46,11 @@ msgstr ""
msgid "Creation Date"
msgstr ""
+#. module: project_messages
+#: view:project.messages:0
+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."
@@ -67,8 +78,12 @@ msgid "Group By..."
msgstr ""
#. module: project_messages
-#: view:project.messages:0
-msgid "Today"
+#: model:ir.module.module,description:project_messages.module_meta_information
+msgid "\n"
+" This module provides the functionality to send messages within a project.\n"
+" A user can send messages individually to other user. He can even broadcast\n"
+" it to all the users.\n"
+" "
msgstr ""
#. module: project_messages
@@ -94,8 +109,6 @@ msgid "Message From"
msgstr ""
#. module: project_messages
-#: model:ir.actions.act_window,name:project_messages.messages_form
-#: model:ir.ui.menu,name:project_messages.menu_messages_form
#: view:project.messages:0
msgid "Project Messages"
msgstr ""
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index ae34ebb4811..bad17ead34f 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:11+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:11+0000\n"
+"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
+"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,8 @@ msgid "Procurement Task"
msgstr ""
#. 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"
+#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
+msgid "Procurement and Project Management integration"
msgstr ""
#. module: project_mrp
@@ -70,8 +67,11 @@ msgid "Procurement"
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"
+#: 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 ""
#. module: project_mrp
@@ -95,8 +95,33 @@ msgid "Create Task"
msgstr ""
#. module: project_mrp
-#: model:ir.module.module,shortdesc:project_mrp.module_meta_information
-msgid "Procurement and Project Management integration"
+#: 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 ""
#. module: project_mrp
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
index 0a49743bd7e..22bd2ef0e20 100644
--- a/addons/project_planning/i18n/project_planning.pot
+++ b/addons/project_planning/i18n/project_planning.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -364,6 +364,22 @@ msgstr ""
msgid "Total Remaining Tasks"
msgstr ""
+#. 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"
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
index a9164ea6e53..2cfcb9529b6 100644
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ b/addons/project_retro_planning/i18n/project_retro_planning.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:12+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:12+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,6 +25,13 @@ msgstr ""
msgid "Project Retro planning"
msgstr ""
+#. module: project_retro_planning
+#: model:ir.module.module,description:project_retro_planning.module_meta_information
+msgid "\n"
+" - If end date of project is changed\n"
+" then the deadline date and start date for all the tasks will change accordingly "
+msgstr ""
+
#. module: project_retro_planning
#: constraint:project.project:0
msgid "Error! project start-date must be lower then project end-date."
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
index b42dd83ff20..4f08cbb9bbd 100644
--- a/addons/project_scrum/i18n/project_scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:01+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,32 @@ msgstr ""
msgid "Author"
msgstr ""
+#. module: project_scrum
+#: model:ir.module.module,description:project_scrum.module_meta_information
+msgid "\n"
+" This module implements all concepts defined by the scrum project\n"
+" management methodology for IT companies:\n"
+" * Project with sprints, product owner, scrum master\n"
+" * Sprints with reviews, daily meetings, feedbacks\n"
+" * Product backlog\n"
+" * Sprint backlog\n"
+"\n"
+" It adds some concepts to the project management module:\n"
+" * Mid-term, long-term road-map\n"
+" * Customers/functional requests VS technical ones\n"
+"\n"
+" It also creates a new reporting:\n"
+" * Burn-down chart\n"
+"\n"
+" The scrum projects and tasks inherit from the real projects and\n"
+" tasks, so you can continue working on normal tasks that will also\n"
+" include tasks from scrum projects.\n"
+"\n"
+" More information on the methodology:\n"
+" * http://controlchaos.com\n"
+" "
+msgstr ""
+
#. module: project_scrum
#: view:project.scrum.meeting:0
#: view:project.scrum.sprint:0
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index 2274ea7ded8..8bcf42dd13a 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:13+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:13+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:02+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -192,6 +192,15 @@ msgstr ""
msgid "Customer"
msgstr ""
+#. module: project_timesheet
+#: model:ir.module.module,description:project_timesheet.module_meta_information
+msgid "\n"
+" This module lets you transfer the entries under tasks defined for Project Management to\n"
+" the Timesheet line entries for particular date and particular user with the effect of creating, editing and deleting either ways.\n"
+"\n"
+" "
+msgstr ""
+
#. module: project_timesheet
#: view:account.analytic.line:0
msgid "Account"
@@ -251,8 +260,8 @@ msgid "Project"
msgstr ""
#. module: project_timesheet
-#: view:report.timesheet.task.user:0
-msgid " Month-1 "
+#: selection:report.timesheet.task.user,month:0
+msgid "April"
msgstr ""
#. module: project_timesheet
@@ -292,8 +301,8 @@ msgid "Work on task"
msgstr ""
#. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "April"
+#: view:report.timesheet.task.user:0
+msgid " Month-1 "
msgstr ""
#. module: project_timesheet
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 2e234b357e9..f2618d4263b 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-15 15:06:14+0000\n"
-"PO-Revision-Date: 2010-12-15 15:06:14+0000\n"
+"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
+"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,6 +79,12 @@ msgstr ""
msgid "Do you want to generate the supplier invoices ?"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "The selected supplier only sells this product by %s"
+msgstr ""
+
#. module: purchase
#: code:addons/purchase/wizard/purchase_line_invoice.py:0
#, python-format
@@ -127,12 +133,6 @@ msgstr ""
msgid "This is the leads/security time for each purchase order."
msgstr ""
-#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "You must first cancel all picking attached to this purchase order."
-msgstr ""
-
#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -236,6 +236,11 @@ msgid "You have to select a pricelist or a supplier in the purchase form !\n"
"Please set one before choosing a product."
msgstr ""
+#. module: purchase
+#: selection:purchase.report,month:0
+msgid "September"
+msgstr ""
+
#. module: purchase
#: report:purchase.order:0
#: field:purchase.order,amount_tax:0
@@ -389,6 +394,7 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
+#: code:addons/purchase/purchase.py:0
#: code:addons/purchase/wizard/purchase_order_group.py:0
#, python-format
msgid "Warning"
@@ -536,6 +542,11 @@ msgstr ""
msgid "To be Invoiced"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+msgid "Pricelists"
+msgstr ""
+
#. module: purchase
#: field:purchase.report,partner_address_id:0
msgid "Address Contact Name"
@@ -548,6 +559,11 @@ msgid "From Order: a draft invoice will be pre-generated based on the purchase o
"Manual: allows you to generate suppliers invoices by chosing in the uninvoiced lines of all manual purchase orders."
msgstr ""
+#. module: purchase
+#: help:purchase.order,invoice_ids:0
+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
@@ -619,6 +635,7 @@ msgid "July"
msgstr ""
#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_purchase
#: view:res.company:0
msgid "Configuration"
msgstr ""
@@ -678,8 +695,9 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: help:purchase.order,invoice_id:0
-msgid "An invoice generated for a purchase order"
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
#. module: purchase
@@ -749,8 +767,9 @@ msgid "Procurement"
msgstr ""
#. module: purchase
-#: selection:purchase.report,month:0
-msgid "September"
+#: view:purchase.order:0
+#: field:purchase.order,invoice_ids:0
+msgid "Invoices"
msgstr ""
#. module: purchase
@@ -1028,6 +1047,25 @@ msgstr ""
msgid "Compute"
msgstr ""
+#. module: purchase
+#: model:ir.module.module,description:purchase.module_meta_information
+msgid "\n"
+" Purchase module is for generating a purchase order for purchase of goods from a supplier.\n"
+" A supplier invoice is created for the particular order placed\n"
+" Dashboard for purchase management that includes:\n"
+" * Current Purchase Orders\n"
+" * Draft Purchase Orders\n"
+" * Graph for quantity and amount per month \n"
+"\n"
+" "
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
+msgstr ""
+
#. module: purchase
#: selection:purchase.report,month:0
msgid "January"
@@ -1158,7 +1196,6 @@ msgstr ""
#. module: purchase
#: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0
#: model:process.transition,name:purchase.process_transition_invoicefrompurchase0
-#: field:purchase.order,invoice_id:0
msgid "Invoice"
msgstr ""
@@ -1528,6 +1565,11 @@ msgstr ""
msgid "Total"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
+msgid "Pricelist Versions"
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_supplier_address_form
msgid "Addresses"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 79bc59759ae..3a768a4c218 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -88,12 +88,14 @@ class purchase_order(osv.osv):
res[purchase.id]=min_date
return res
+
def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
res = {}
for purchase in self.browse(cursor, user, ids, context=context):
tot = 0.0
- if purchase.invoice_id and purchase.invoice_id.state not in ('draft','cancel'):
- tot += purchase.invoice_id.amount_untaxed
+ for invoice in purchase.invoice_ids:
+ if invoice.state not in ('draft','cancel'):
+ tot += invoice.amount_untaxed
if purchase.amount_untaxed:
res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
else:
@@ -137,10 +139,10 @@ class purchase_order(osv.osv):
def _invoiced(self, cursor, user, ids, name, arg, context=None):
res = {}
for purchase in self.browse(cursor, user, ids, context=context):
- if purchase.invoice_id.reconciled:
- res[purchase.id] = purchase.invoice_id.reconciled
- else:
- res[purchase.id] = False
+ invoiced = False
+ if purchase.invoiced_rate == 100.00:
+ invoiced = True
+ res[purchase.id] = invoiced
return res
STATE_SELECTION = [
@@ -177,7 +179,7 @@ class purchase_order(osv.osv):
'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
'notes': fields.text('Notes'),
- 'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True, help="An invoice generated for a purchase order"),
+ 'invoice_ids': fields.many2many('account.invoice', 'purchase_invoice_rel', 'purchase_id', 'invoice_id', 'Invoices', help="Invoices generated for a purchase order"),
'picking_ids': fields.one2many('stock.picking', 'purchase_id', 'Picking List', readonly=True, help="This is the list of picking list that have been generated for this purchase"),
'shipped':fields.boolean('Received', readonly=True, select=True, help="It indicates that a picking has been done"),
'shipped_rate': fields.function(_shipped_rate, method=True, string='Received', type='float'),
@@ -375,7 +377,7 @@ class purchase_order(osv.osv):
inv_id = self.pool.get('account.invoice').create(cr, uid, inv, {'type':'in_invoice'})
self.pool.get('account.invoice').button_compute(cr, uid, [inv_id], {'type':'in_invoice'}, set_total=True)
self.pool.get('purchase.order.line').write(cr, uid, todo, {'invoiced':True})
- self.write(cr, uid, [o.id], {'invoice_id': inv_id})
+ self.write(cr, uid, [o.id], {'invoice_ids': [(4, inv_id)]})
res = inv_id
return res
@@ -396,14 +398,14 @@ class purchase_order(osv.osv):
for pick in purchase.picking_ids:
wf_service = netsvc.LocalService("workflow")
wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_cancel', cr)
- inv = purchase.invoice_id
- if inv and inv.state not in ('cancel','draft'):
- raise osv.except_osv(
- _('Could not cancel this purchase order !'),
- _('You must first cancel all invoices attached to this purchase order.'))
- if inv:
- wf_service = netsvc.LocalService("workflow")
- wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
+ for inv in purchase.invoice_ids:
+ if inv and inv.state not in ('cancel','draft'):
+ raise osv.except_osv(
+ _('Could not cancel this purchase order !'),
+ _('You must first cancel all invoices attached to this purchase order.'))
+ if inv:
+ wf_service = netsvc.LocalService("workflow")
+ wf_service.trg_validate(uid, 'account.invoice', inv.id, 'invoice_cancel', cr)
self.write(cr,uid,ids,{'state':'cancel'})
for (id,name) in self.name_get(cr, uid, ids):
message = _("Purchase order '%s' is cancelled.") % name
@@ -467,8 +469,8 @@ class purchase_order(osv.osv):
'state':'draft',
'shipped':False,
'invoiced':False,
- 'invoice_id':False,
- 'picking_ids':[],
+ 'invoice_ids': [],
+ 'picking_ids': [],
'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
})
return super(purchase_order, self).copy(cr, uid, id, default, context)
@@ -559,6 +561,7 @@ class purchase_order(osv.osv):
allorders = []
+ orders_info = {}
for order_key, (order_data, old_ids) in new_orders.iteritems():
# skip merges with only one order
if len(old_ids) < 2:
@@ -573,13 +576,14 @@ class purchase_order(osv.osv):
# create the new order
neworder_id = self.create(cr, uid, order_data)
+ orders_info.update({neworder_id: old_ids})
allorders.append(neworder_id)
# make triggers pointing to the old orders point to the new order
for old_id in old_ids:
wf_service.trg_redirect(uid, 'purchase.order', old_id, neworder_id, cr)
wf_service.trg_validate(uid, 'purchase.order', old_id, 'purchase_cancel', cr)
- return allorders
+ return orders_info
purchase_order()
@@ -645,9 +649,10 @@ class purchase_order_line(osv.osv):
if not product:
return {'value': {'price_unit': price_unit or 0.0, 'name': name or '',
'notes': notes or'', 'product_uom' : uom or False}, 'domain':{'product_uom':[]}}
+ res = {}
prod= self.pool.get('product.product').browse(cr, uid, product)
-
+ product_uom_pool = self.pool.get('product.uom')
lang=False
if partner_id:
lang=self.pool.get('res.partner').read(cr, uid, partner_id, ['lang'])['lang']
@@ -664,29 +669,31 @@ class purchase_order_line(osv.osv):
seller_delay = 0
prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id], context=context)[0][1]
-
+ res = {}
for s in prod.seller_ids:
if s.name.id == partner_id:
seller_delay = s.delay
- temp_qty = s.qty # supplier _qty assigned to temp
+ if s.product_uom:
+ temp_qty = product_uom_pool._compute_qty(cr, uid, s.product_uom.id, s.min_qty, to_uom_id=prod.uom_id.id)
+ uom = s.product_uom.id #prod_uom_po
+ temp_qty = s.min_qty # supplier _qty assigned to temp
if qty < temp_qty: # If the supplier quantity is greater than entered from user, set minimal.
qty = temp_qty
- if price_unit:
- price = price_unit
- else:
- price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
- product, qty or 1.0, partner_id, {
+ res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s, you cannot purchase less.') % qty}})
+ qty_in_product_uom = product_uom_pool._compute_qty(cr, uid, uom, qty, to_uom_id=prod.uom_id.id)
+ price = self.pool.get('product.pricelist').price_get(cr,uid,[pricelist],
+ product, qty_in_product_uom or 1.0, partner_id, {
'uom': uom,
'date': date_order,
})[pricelist]
dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
- res = {'value': {'price_unit': price, 'name': name or prod_name,
+ res.update({'value': {'price_unit': price, 'name': name or prod_name,
'taxes_id':map(lambda x: x.id, prod.supplier_taxes_id),
'date_planned': date_planned or dt,'notes': notes or prod.description_purchase,
'product_qty': qty,
- 'product_uom': uom}}
+ 'product_uom': uom}})
domain = {}
taxes = self.pool.get('account.tax').browse(cr, uid,map(lambda x: x.id, prod.supplier_taxes_id))
@@ -707,6 +714,9 @@ class purchase_order_line(osv.osv):
res = self.product_id_change(cr, uid, ids, pricelist, product, qty, uom,
partner_id, date_order=date_order,fiscal_position=fiscal_position)
if 'product_uom' in res['value']:
+ if uom and uom != res['value']['product_uom']:
+ seller_uom_name = self.pool.get('product.uom').read(cr, uid, [res['value']['product_uom']], ['name'])[0]['name']
+ res.update({'warning': {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % seller_uom_name }})
del res['value']['product_uom']
if not uom:
res['value']['price_unit'] = 0.0
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index f95009aae9d..053c6f17b14 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -56,6 +56,10 @@
+
+
+
+
diff --git a/addons/purchase/purchase_unit_test.xml b/addons/purchase/purchase_unit_test.xml
index 93c0e42fae2..b35e0626085 100644
--- a/addons/purchase/purchase_unit_test.xml
+++ b/addons/purchase/purchase_unit_test.xml
@@ -41,19 +41,19 @@
-
+
- draft
+ draft
-
+
-
+
@@ -64,7 +64,7 @@
- paid
+ paid
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0aa1d6e7f62..8950b66f528 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -8,6 +8,18 @@
+
+
+
+
+
+
+
Addresses
@@ -162,13 +174,15 @@
-
+
+
+
@@ -268,8 +282,8 @@