diff --git a/addons/account/account.py b/addons/account/account.py
index f79e36c7681..3fed8c45f17 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -131,7 +131,7 @@ class account_account_type(osv.osv):
_name = "account.account.type"
_description = "Account Type"
_columns = {
- 'name': fields.char('Acc. Type Name', size=64, required=True, translate=True),
+ 'name': fields.char('Acc. Type Name', size=64, required=True),
'code': fields.char('Code', size=32, required=True),
'close_method': fields.selection([('none', 'None'), ('balance', 'Balance'), ('detail', 'Detail'), ('unreconciled', 'Unreconciled')], 'Deferral Method', required=True, help="""Set here the method that will be used to generate the end of year journal entries for all the accounts of this type.
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index f81f8bb4f6b..b5b1082b43d 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:45+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:45+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,13 +26,13 @@ msgid "Other Configuration"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
#, python-format
msgid "No journal for ending writing has been defined for the fiscal year"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:506
#, python-format
msgid "You cannot remove/deactivate an account which is set as a property to any Partner."
msgstr ""
@@ -62,7 +62,7 @@ msgid "Residual"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:803
#, python-format
msgid "Please define sequence on invoice journal"
msgstr ""
@@ -123,12 +123,13 @@ msgid "Accounting Entries-"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1291
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
msgstr ""
#. module: account
+#: report:account.invoice:0
#: field:account.invoice.line,origin:0
msgid "Origin"
msgstr ""
@@ -164,7 +165,7 @@ msgid "If the active field is set to False, it will allow you to hide the paymen
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1439
#, python-format
msgid "Warning!"
msgstr ""
@@ -190,6 +191,12 @@ msgstr ""
msgid "Negative"
msgstr ""
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:95
+#, python-format
+msgid "Journal: %s"
+msgstr ""
+
#. module: account
#: help:account.analytic.journal,type:0
msgid "Gives the type of the analytic journal. When it needs for a document (eg: an invoice) to create analytic entries, OpenERP will look for a matching journal of the same type."
@@ -207,7 +214,7 @@ msgid "account.tax"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:901
#, python-format
msgid "No period defined for this date: %s !\n"
"Please create a fiscal year."
@@ -230,7 +237,7 @@ msgid "Check this box if you don't want any VAT related to this Tax Code to appe
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1228
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
@@ -246,7 +253,7 @@ msgid "Belgian Reports"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1102
#, python-format
msgid "You can not add/modify entries in a closed journal."
msgstr ""
@@ -284,7 +291,7 @@ msgid "St."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:547
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
@@ -300,7 +307,7 @@ msgid "Installs localized accounting charts to match as closely as possible the
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Can't find any account journal of %s type for this company.\n"
"\n"
@@ -319,11 +326,6 @@ msgstr ""
msgid "Purchase Properties"
msgstr ""
-#. module: account
-#: help:account.account.type,sign:0
-msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
-msgstr ""
-
#. module: account
#: view:account.installer:0
#: view:account.installer.modules:0
@@ -417,11 +419,6 @@ msgstr ""
msgid "The amount expressed in an optional other currency."
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_move_journal_line
-msgid "A journal entry consists of several journal items, each of which is either a debit or a credit. OpenERP creates automatically one journal entry per accounting document: invoices, refund, supplier payment, bank statements, etc."
-msgstr ""
-
#. module: account
#: help:account.journal.period,state:0
msgid "When journal period is created. The state is 'Draft'. If a report is printed it comes to 'Printed' state. When all transactions are done, it comes in 'Done' state."
@@ -456,11 +453,13 @@ msgstr ""
#: field:account.move.line,journal_id:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: code:addons/account/account_move_line.py:909
#: view:analytic.entries.report:0
#: field:analytic.entries.report,journal_id:0
#: model:ir.actions.report.xml,name:account.account_journal
#: model:ir.model,name:account.model_account_journal
#: field:validate.account.move,journal_id:0
+#, python-format
msgid "Journal"
msgstr ""
@@ -519,7 +518,7 @@ msgid "Not reconciled transactions"
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_cash_statement.py:348
#, python-format
msgid "CashBox Balance is not matching with Calculated Balance !"
msgstr ""
@@ -531,11 +530,6 @@ msgstr ""
msgid "Tax Mapping"
msgstr ""
-#. module: account
-#: model:ir.model,name:account.model_account_installer_modules
-msgid "account.installer.modules"
-msgstr ""
-
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
@@ -604,8 +598,8 @@ msgid "Tax Code Amount"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2779
+#: code:addons/account/installer.py:434
#, python-format
msgid "SAJ"
msgstr ""
@@ -637,7 +631,8 @@ msgid "Journal Period"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:675
+#: code:addons/account/account_move_line.py:719
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
@@ -648,7 +643,9 @@ msgstr ""
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:302
#: model:ir.actions.act_window,name:account.action_aged_receivable
+#, python-format
msgid "Receivable Accounts"
msgstr ""
@@ -678,7 +675,7 @@ msgid "Partners Reconciled Today"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:306
#, python-format
msgid "The statement balance is incorrect !\n"
""
@@ -696,14 +693,14 @@ msgid "Charts"
msgstr ""
#. module: account
-#: code:addons/account/project/wizard/project_account_analytic_line.py:0
+#: code:addons/account/project/wizard/project_account_analytic_line.py:47
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:39
#, python-format
msgid "You can only change currency for Draft Invoice !"
msgstr ""
@@ -780,7 +777,7 @@ msgid "If checked, the new chart of accounts will not contain this by default."
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:102
#, python-format
msgid "Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice"
msgstr ""
@@ -801,7 +798,7 @@ msgid "Next Partner to reconcile"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1117
#, python-format
msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
msgstr ""
@@ -857,11 +854,6 @@ 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
@@ -923,11 +915,12 @@ msgid "Code"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2083
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:115
+#: code:addons/account/invoice.py:73
+#: code:addons/account/invoice.py:688
+#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -1045,6 +1038,11 @@ msgstr ""
msgid "Credit Centralisation"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree2
+msgid "With Supplier Invoices you can enter and manage invoices issued by your suppliers. OpenERP can also generate draft invoices automatically from purchase orders or receipts. This way, you can control the invoice from your supplier according to what you purchased or received."
+msgstr ""
+
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
@@ -1087,7 +1085,7 @@ msgid "Entry Label"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:976
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
@@ -1164,7 +1162,7 @@ msgid "Taxes"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:0
+#: code:addons/account/wizard/account_report_common.py:120
#, python-format
msgid "Select a starting and an ending period"
msgstr ""
@@ -1179,6 +1177,11 @@ msgstr ""
msgid "Search tax template"
msgstr ""
+#. module: account
+#: report:account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
#. module: account
#: view:account.move.reconcile:0
#: model:ir.actions.act_window,name:account.action_account_reconcile_select
@@ -1221,8 +1224,6 @@ 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 ""
@@ -1252,7 +1253,7 @@ msgid "Central Journal"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid "You can not use this general account in this journal !"
msgstr ""
@@ -1318,6 +1319,11 @@ msgstr ""
msgid "Total Without Tax"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_move_journal_line
+msgid "A journal entry consists of several journal items, each of which is either a debit or a credit transaction. OpenERP automatically creates one journal entry per accounting document: invoice, refund, supplier payment, bank statements, etc."
+msgstr ""
+
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
@@ -1340,17 +1346,12 @@ msgid "Example: at 14 net days 2 percents, remaining amount at 30 days end of mo
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:833
#, python-format
msgid "Cannot create the invoice !\n"
"The payment term defined gives a computed amount greater than the total invoiced amount."
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree1
-msgid "Customer Invoices allows you create and manage invoices issued to your customers. OpenERP generates draft of invoices automatically so that you only have to confirm them before sending them to your customers."
-msgstr ""
-
#. module: account
#: field:account.installer.modules,account_anglo_saxon:0
msgid "Anglo-Saxon Accounting"
@@ -1446,6 +1447,11 @@ msgstr ""
msgid "Statement lines"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_statement_tree
+msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card or any other type of financial account. The starting balance will be proposed automatically and the closing balance is to be found on your statement. When you are in the Payment column of a line, you can press F1 to open the reconciliation form."
+msgstr ""
+
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "Date/Code"
@@ -1551,7 +1557,7 @@ msgid "Error! You cannot define overlapping fiscal years"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:751
#, python-format
msgid "The account is not defined to be reconciled !"
msgstr ""
@@ -1582,7 +1588,7 @@ msgid "Receivables & Payables"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:758
#, python-format
msgid "You have to provide an account for the write off entry !"
msgstr ""
@@ -1618,7 +1624,7 @@ msgid "Customer Ref:"
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_cash_statement.py:328
#, python-format
msgid "User %s does not have rights to access %s journal !"
msgstr ""
@@ -1639,7 +1645,7 @@ msgid "Tax Declaration: Credit Notes"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:499
#, python-format
msgid "You cannot deactivate an account that contains account moves."
msgstr ""
@@ -1655,7 +1661,7 @@ msgid "You can not create move line on closed account."
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:519
#, python-format
msgid "You cannot change the type of account from 'Closed' to any other type which contains account entries!"
msgstr ""
@@ -1729,7 +1735,7 @@ msgid "Analytic account"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:332
#, python-format
msgid "Please verify that an account is defined in the journal."
msgstr ""
@@ -1903,13 +1909,13 @@ msgid "Pro-forma"
msgstr ""
#. module: account
-#: code:addons/account/installer.py:0
+#: code:addons/account/installer.py:348
#, python-format
msgid " Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1319
#, python-format
msgid "There is no default default debit account defined \n"
"on journal \"%s\""
@@ -1952,8 +1958,8 @@ msgid "Description"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2844
+#: code:addons/account/installer.py:498
#, python-format
msgid "ECNJ"
msgstr ""
@@ -1972,7 +1978,7 @@ msgid "Income Account"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:370
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
msgstr ""
@@ -2116,7 +2122,7 @@ msgid "Account Tax Code"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:563
#, python-format
msgid "Can't find any account journal of %s type for this company.\n"
"\n"
@@ -2135,11 +2141,6 @@ 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
@@ -2184,8 +2185,8 @@ msgid "Account Model Entries"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2796
+#: code:addons/account/installer.py:454
#, python-format
msgid "EXJ"
msgstr ""
@@ -2232,7 +2233,6 @@ msgid "Error ! You can not create recursive categories."
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
@@ -2262,7 +2262,7 @@ msgid "Accounts"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:369
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -2280,7 +2280,7 @@ msgid "Date:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:640
#, python-format
msgid "You cannot modify company of this journal as its related record exist in Entry Lines"
msgstr ""
@@ -2386,11 +2386,6 @@ msgstr ""
msgid "Accounting entries"
msgstr ""
-#. module: account
-#: report:account.journal.period.print:0
-msgid "given a period and a journal, the sum of debit will always be equal to the sum of credit, so there is no point to display it"
-msgstr ""
-
#. module: account
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
@@ -2421,17 +2416,17 @@ msgid "This wizard will create recurring accounting entries"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1181
#, python-format
msgid "No sequence defined on the journal !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2083
+#: code:addons/account/account_bank_statement.py:350
+#: code:addons/account/account_move_line.py:115
+#: code:addons/account/invoice.py:688
+#: code:addons/account/wizard/account_use_model.py:81
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -2444,6 +2439,7 @@ msgid "Tax codes"
msgstr ""
#. module: account
+#: model:ir.ui.menu,name:account.menu_account_customer
#: model:ir.ui.menu,name:account.menu_finance_receivables
msgid "Customers"
msgstr ""
@@ -2465,7 +2461,7 @@ msgid "August"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:307
#, python-format
msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
@@ -2580,7 +2576,7 @@ msgid "Analytic Entries"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:822
#, python-format
msgid "No fiscal year defined for this date !\n"
"Please create one."
@@ -2684,14 +2680,13 @@ msgstr ""
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
-#: model:account.account.type,name:account.account_type_root
#: selection:account.entries.report,type:0
msgid "View"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2906
+#: code:addons/account/installer.py:296
#, python-format
msgid "BNK"
msgstr ""
@@ -2853,7 +2848,7 @@ msgid "Starting Balance"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1302
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -2943,7 +2938,7 @@ msgid "All selected journal entries will be validated and posted. It means you w
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:388
#, python-format
msgid "Cannot delete invoice(s) that are already opened or paid !"
msgstr ""
@@ -2996,13 +2991,13 @@ msgid "Draft Invoice"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_invoice_state.py:68
#, python-format
msgid "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:522
#, python-format
msgid "You cannot change the type of account from '%s' to '%s' type as it contains account entries!"
msgstr ""
@@ -3053,8 +3048,8 @@ msgid "Detail"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_invoice_tree2
-msgid "Supplier Invoices allows you to enter and manage invoices issued by your suppliers. OpenERP generates draft of supplier invoices automatically so that you can control what you received from your supplier according to what you purchased or received."
+#: field:account.installer,bank_accounts_id:0
+msgid "Your Bank and Cash Accounts"
msgstr ""
#. module: account
@@ -3141,7 +3136,7 @@ msgid "Unreconcile"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:79
#, python-format
msgid "The journal must have default credit and debit account"
msgstr ""
@@ -3152,20 +3147,20 @@ msgid "Chart of Accounts Template"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:2095
#, python-format
msgid "Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:753
#, python-format
msgid "Some entries are already reconciled !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1204
#, python-format
msgid "You cannot validate a Journal Entry unless all journal items are in same chart of accounts !"
msgstr ""
@@ -3274,7 +3269,7 @@ msgid "Unit Price"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1054
#, python-format
msgid "Unable to change tax !"
msgstr ""
@@ -3285,13 +3280,13 @@ msgid "#Entries"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1440
#, 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
+#: code:addons/account/invoice.py:491
#, python-format
msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
msgstr ""
@@ -3335,7 +3330,7 @@ msgid "Effective date"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#: code:addons/account/wizard/account_move_bank_reconcile.py:53
#, python-format
msgid "Standard Encoding"
msgstr ""
@@ -3478,8 +3473,10 @@ msgid "Analytic Balance"
msgstr ""
#. module: account
-#: code:addons/account/report/account_balance_sheet.py:0
-#: code:addons/account/report/account_profit_loss.py:0
+#: code:addons/account/report/account_balance_sheet.py:76
+#: code:addons/account/report/account_balance_sheet.py:122
+#: code:addons/account/report/account_profit_loss.py:76
+#: code:addons/account/report/account_profit_loss.py:124
#, python-format
msgid "Net Loss"
msgstr ""
@@ -3533,6 +3530,12 @@ msgstr ""
msgid "Cancel the Selected Invoices"
msgstr ""
+#. module: account
+#: help:product.category,property_account_income_categ:0
+#: help:product.template,property_account_income:0
+msgid "This account will be used to value outgoing stock for the current product category using sale price"
+msgstr ""
+
#. module: account
#: selection:account.automatic.reconcile,power:0
msgid "3"
@@ -3560,7 +3563,7 @@ msgid "Acc.Type"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:732
#, python-format
msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
@@ -3576,6 +3579,11 @@ msgstr ""
msgid "Month"
msgstr ""
+#. module: account
+#: field:account.invoice.report,uom_name:0
+msgid "Reference UoM"
+msgstr ""
+
#. module: account
#: field:account.account,note:0
#: field:account.account.template,note:0
@@ -3609,7 +3617,7 @@ msgid "All manually created new journal entry are usually in the state 'Unposted
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_analytic_line.py:91
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -3647,7 +3655,7 @@ msgid "All Posted Entries"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:357
#, python-format
msgid "Statement %s is confirmed, journal items are created."
msgstr ""
@@ -3667,13 +3675,18 @@ msgstr ""
msgid "Check if you want to display Accounts with 0 balance too."
msgstr ""
+#. module: account
+#: view:account.tax:0
+msgid "Compute Code"
+msgstr ""
+
#. module: account
#: view:account.account.template:0
msgid "Default taxes"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:88
#, python-format
msgid "Free Reference"
msgstr ""
@@ -3732,7 +3745,7 @@ msgid "Bank statements are entered in the system."
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_reconcile.py:0
+#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
msgstr ""
@@ -3744,8 +3757,8 @@ msgid "Maturity date"
msgstr ""
#. module: account
-#: view:account.account.template:0
-msgid "Account Template"
+#: view:report.account.receivable:0
+msgid "Accounts by type"
msgstr ""
#. module: account
@@ -3755,7 +3768,7 @@ msgid "Closing Balance"
msgstr ""
#. module: account
-#: code:addons/account/report/common_report_header.py:0
+#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
msgstr ""
@@ -3776,8 +3789,8 @@ msgid "Credit Notes"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "Unable to find a valid period !"
msgstr ""
@@ -3807,11 +3820,6 @@ msgstr ""
msgid "Allow Reconciliation"
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_subscription_form
-msgid "A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system."
-msgstr ""
-
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Account Statistics"
@@ -3850,13 +3858,17 @@ msgid "Change"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_automatic_reconcile.py:0
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
-#: code:addons/account/wizard/account_move_journal.py:0
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#: code:addons/account/account.py:1290
+#: code:addons/account/account.py:1318
+#: code:addons/account/account.py:1325
+#: code:addons/account/account_move_line.py:981
+#: code:addons/account/invoice.py:914
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_fiscalyear_close.py:78
+#: code:addons/account/wizard/account_fiscalyear_close.py:81
+#: code:addons/account/wizard/account_move_journal.py:162
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:59
#, python-format
msgid "UserError"
msgstr ""
@@ -3925,7 +3937,7 @@ msgstr ""
#: selection:account.bank.statement.line,type:0
#: view:account.invoice:0
#: view:account.invoice.report:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:338
#, python-format
msgid "Customer"
msgstr ""
@@ -3941,13 +3953,13 @@ msgid "Cancelled Invoice"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:73
#, python-format
msgid "You must define an analytic journal of type '%s' !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1397
#, python-format
msgid "Couldn't create move with currency different from the secondary currency of the account \"%s - %s\". Clear the secondary currency field of the account definition if you want to accept all currencies."
msgstr ""
@@ -3974,7 +3986,7 @@ msgid "Account Balance -"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1007
#, python-format
msgid "Invoice "
msgstr ""
@@ -4012,7 +4024,7 @@ msgid "Invoices"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:822
#, python-format
msgid "Please verify the price of the invoice !\n"
"The real total does not match the computed total."
@@ -4090,7 +4102,7 @@ msgstr ""
#. module: account
#: view:account.move:0
#: view:account.move.line:0
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_move_journal.py:150
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
#: model:ir.actions.act_window,name:account.act_account_partner_account_move
@@ -4123,16 +4135,8 @@ msgid "Third Party (Country)"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_cash_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/report/common_report_header.py:0
-#: code:addons/account/wizard/account_change_currency.py:0
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:0
-#: code:addons/account/wizard/account_report_common.py:0
-#, python-format
-msgid "Error"
+#: model:ir.actions.act_window,help:account.action_invoice_tree4
+msgid "With Supplier Refunds you can manage the credit notes you receive from your suppliers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
msgstr ""
#. module: account
@@ -4150,7 +4154,7 @@ msgid "Bank Details"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:738
#, python-format
msgid "Taxes missing !"
msgstr ""
@@ -4203,7 +4207,7 @@ msgid "Check Date not in the Period"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1210
#, python-format
msgid "You can not modify a posted entry of this journal !\n"
"You should set the journal to allow cancelling entries if you want to do that."
@@ -4220,7 +4224,7 @@ msgid "Child Tax Accounts"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:940
#, python-format
msgid "Start period should be smaller then End period"
msgstr ""
@@ -4277,6 +4281,11 @@ msgstr ""
msgid "Payments"
msgstr ""
+#. module: account
+#: view:account.tax:0
+msgid "Reverse Compute Code"
+msgstr ""
+
#. module: account
#: field:account.subscription.line,move_id:0
msgid "Entry"
@@ -4288,11 +4297,6 @@ msgstr ""
msgid "Python Code (reverse)"
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."
-msgstr ""
-
#. module: account
#: model:ir.actions.act_window,name:account.action_payment_term_form
#: model:ir.ui.menu,name:account.menu_action_payment_term_form
@@ -4331,7 +4335,7 @@ msgid "Line 1:"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1167
#, python-format
msgid "Integrity Error !"
msgstr ""
@@ -4347,7 +4351,7 @@ msgid "month"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:293
#, python-format
msgid "Journal Item \"%s\" is not valid"
msgstr ""
@@ -4405,13 +4409,12 @@ msgid "UoM"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:138
#, python-format
msgid "No Period found on Invoice!"
msgstr ""
#. module: account
-#: view:account.tax:0
#: view:account.tax.template:0
msgid "Compute Code (if type=code)"
msgstr ""
@@ -4443,7 +4446,7 @@ msgid "Amount"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
#, python-format
msgid "End of Fiscal Year Entry"
msgstr ""
@@ -4475,8 +4478,8 @@ msgid "You can not create move line on receivable/payable account without partne
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:2067
+#: code:addons/account/wizard/account_use_model.py:69
#, python-format
msgid "No period found !"
msgstr ""
@@ -4545,8 +4548,9 @@ msgid "Number of days to add before computation of the day of month.If Date=15/0
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2896
+#: code:addons/account/installer.py:283
+#: code:addons/account/installer.py:295
#, python-format
msgid "Bank Journal "
msgstr ""
@@ -4572,7 +4576,7 @@ msgid "Start of period"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1119
#, python-format
msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
msgstr ""
@@ -4592,11 +4596,6 @@ msgstr ""
msgid "Analytic Accounting"
msgstr ""
-#. module: account
-#: help:product.template,property_account_expense:0
-msgid "This account will be used for invoices instead of the default one to value expenses for the current product"
-msgstr ""
-
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
@@ -4630,9 +4629,14 @@ msgid "End of Year Entries Journal"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/account_bank_statement.py:331
+#: code:addons/account/invoice.py:423
+#: code:addons/account/invoice.py:523
+#: code:addons/account/invoice.py:538
+#: code:addons/account/invoice.py:546
+#: code:addons/account/invoice.py:563
+#: code:addons/account/invoice.py:1365
+#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
msgstr ""
@@ -4703,7 +4707,7 @@ msgid "Sort By"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1326
#, python-format
msgid "There is no default default credit account defined \n"
"on journal \"%s\""
@@ -4717,7 +4721,7 @@ msgid "Amount Currency"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_validate_account_move.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:39
#, python-format
msgid "Specified Journal does not have any account move entries in draft state for this period"
msgstr ""
@@ -4839,7 +4843,7 @@ msgid "Generate Opening Entries"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:680
#, python-format
msgid "Already Reconciled!"
msgstr ""
@@ -4873,7 +4877,7 @@ msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:773
#, python-format
msgid "Write-Off"
msgstr ""
@@ -4888,16 +4892,11 @@ msgstr ""
msgid "account.analytic.line.extended"
msgstr ""
-#. module: account
-#: model:account.account.type,name:account.account_type_income
-msgid "Income"
-msgstr ""
-
#. module: account
#: selection:account.bank.statement.line,type:0
#: view:account.invoice:0
#: view:account.invoice.report:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:340
#, python-format
msgid "Supplier"
msgstr ""
@@ -4912,8 +4911,8 @@ msgid "March"
msgstr ""
#. module: account
-#: view:report.account.receivable:0
-msgid "Accounts by type"
+#: view:account.account.template:0
+msgid "Account Template"
msgstr ""
#. module: account
@@ -4936,6 +4935,8 @@ msgstr ""
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:306
+#, python-format
msgid "Receivable and Payable Accounts"
msgstr ""
@@ -4970,6 +4971,11 @@ msgstr ""
msgid "From this view, have an analysis of your different financial accounts. The document shows your debit and credit taking in consideration some criteria you can choose by using the search tool."
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_list
+msgid "The tax code definition depends on the tax declaration of your country. OpenERP allows you to define the tax structure and manage it from this menu. You can define both numeric and alphanumeric tax codes."
+msgstr ""
+
#. module: account
#: help:account.partner.reconcile.process,progress:0
msgid "Shows you the progress made today on the reconciliation process. Given by \n"
@@ -4996,7 +5002,7 @@ msgid "# of Lines"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:60
#, python-format
msgid "New currency is not confirured properly !"
msgstr ""
@@ -5021,13 +5027,14 @@ msgid "Filter by"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1057
+#: code:addons/account/account_move_line.py:1140
#, python-format
msgid "You can not use an inactive account!"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:746
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
msgstr ""
@@ -5055,12 +5062,18 @@ msgid "7"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/account_bank_statement.py:391
+#: code:addons/account/invoice.py:388
#, python-format
msgid "Invalid action !"
msgstr ""
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:102
+#, python-format
+msgid "Period: %s"
+msgstr ""
+
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax_template
msgid "Template Tax Fiscal Position"
@@ -5111,7 +5124,7 @@ msgid "Multipication factor for Base code"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:0
+#: code:addons/account/wizard/account_report_common.py:126
#, python-format
msgid "not implemented"
msgstr ""
@@ -5122,7 +5135,7 @@ msgid "Company related to this journal"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_invoice_state.py:44
#, python-format
msgid "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"
msgstr ""
@@ -5139,11 +5152,6 @@ msgstr ""
msgid "Analytic Entries Analysis"
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_bank_statement_tree
-msgid "A bank statement is a summary of all financial transactions occurring over a given period of time on a deposit account, a credit card, or any other type of account. Start by encoding the starting and closing balance, then record all lines of your statement. When you are in the Payment column of the a line, you can press F1 to open the reconciliation form."
-msgstr ""
-
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
msgid "Past"
@@ -5165,6 +5173,11 @@ msgstr ""
msgid "Overdue Payments Message"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_moves_all_a
+msgid "This view can be used by accountants in order to quickly record entries in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account. OpenERP will propose to you automatically the Tax related to this account and the counterpart \"Account Payable\"."
+msgstr ""
+
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
@@ -5191,7 +5204,7 @@ msgid "As soon as the reconciliation is done, the invoice's state turns to “do
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1007
#, python-format
msgid "is validated."
msgstr ""
@@ -5256,7 +5269,7 @@ msgid "Companies"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:532
#, python-format
msgid "You cannot modify Company of account as its related record exist in Entry Lines"
msgstr ""
@@ -5355,7 +5368,6 @@ msgstr ""
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
-#: model:account.account.type,name:account.account_type_receivable
#: selection:account.entries.report,type:0
msgid "Receivable"
msgstr ""
@@ -5395,11 +5407,6 @@ msgstr ""
msgid "CashBox"
msgstr ""
-#. module: account
-#: model:account.account.type,name:account.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
#. module: account
#: selection:account.tax,type:0
msgid "Percentage"
@@ -5512,13 +5519,15 @@ msgid "Optional create"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:424
+#: code:addons/account/invoice.py:524
+#: code:addons/account/invoice.py:1366
#, python-format
msgid "Can not find account chart for this company, Please Create account."
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:59
#, python-format
msgid "Enter a Start date !"
msgstr ""
@@ -5605,6 +5614,7 @@ msgstr ""
#: field:account.journal,analytic_journal_id:0
#: model:ir.actions.act_window,name:account.action_account_analytic_journal
#: model:ir.actions.report.xml,name:account.analytic_journal_print
+#: model:ir.model,name:account.model_account_analytic_journal
msgid "Analytic Journal"
msgstr ""
@@ -5635,7 +5645,7 @@ msgid "Cash Transactions"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_state_open.py:37
#, python-format
msgid "Invoice is already reconciled"
msgstr ""
@@ -5658,8 +5668,8 @@ msgid "Analytic Entries Statistics"
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:0
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:831
#, python-format
msgid "Entries: "
msgstr ""
@@ -5670,11 +5680,16 @@ msgid "Create manual recurring entries in a chosen journal."
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1393
#, python-format
msgid "Couldn't create move between different companies"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_type_form
+msgid "An account type is used to determine how an account is used in each journal. The deferral method of an account type determines the process for the annual closing. Reports such as the Balance Sheet and the Profit and Loss report use the category (profit/loss or balance sheet). For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need for your company."
+msgstr ""
+
#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
msgid "Bank Reconciliation consists of verifying that your bank statement corresponds with the entries (or records) of that account in your accounting system."
@@ -5687,11 +5702,13 @@ msgstr ""
#. module: account
#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:929
+#, python-format
msgid "Total debit"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:724
#, python-format
msgid "Entry \"%s\" is not valid !"
msgstr ""
@@ -5724,7 +5741,7 @@ msgid "Python Code"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:72
#, python-format
msgid "Please define the Reserve and Profit/Loss account for current user company !"
msgstr ""
@@ -5750,28 +5767,35 @@ msgid " valuation: percent"
msgstr ""
#. module: account
-#: field:account.installer,bank_accounts_id:0
-msgid "Your Bank and Cash Accounts"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_analytic_line.py:0
-#: code:addons/account/account_bank_statement.py:0
-#: code:addons/account/account_cash_statement.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_invoice_refund.py:0
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/account.py:499
+#: code:addons/account/account.py:501
+#: code:addons/account/account.py:822
+#: code:addons/account/account.py:901
+#: code:addons/account/account.py:976
+#: code:addons/account/account.py:1204
+#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2333
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
+#: code:addons/account/account_bank_statement.py:292
+#: code:addons/account/account_bank_statement.py:305
+#: code:addons/account/account_bank_statement.py:345
+#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:348
+#: code:addons/account/account_move_line.py:1102
+#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/invoice.py:803
+#: code:addons/account/invoice.py:833
+#: code:addons/account/invoice.py:1026
+#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
msgstr ""
-#. module: account
-#: report:account.journal.period.print:0
-msgid "o.journal_id.currency and formatLang((sum_debit(o.period_id.id, o.journal_id.id) - sum_credit(o.period_id.id, o.journal_id.id))) ]] [[ o.journal_id.currency and o.journal_id.currency.symbol"
-msgstr ""
-
#. module: account
#: view:account.vat.declaration:0
#: model:ir.actions.report.xml,name:account.account_vat_declaration
@@ -5826,7 +5850,7 @@ msgid "This report is an analysis done by a partner. It is a PDF report containi
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_validate_account_move.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:61
#, python-format
msgid "Selected Entry Lines does not have any account move enties in draft state"
msgstr ""
@@ -5865,7 +5889,7 @@ msgid "Journal Select"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:65
#, python-format
msgid "Currnt currency is not confirured properly !"
msgstr ""
@@ -5926,7 +5950,7 @@ msgid "Select entries"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:2050
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -5954,8 +5978,8 @@ msgid "Child Codes"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/invoice.py:491
+#: code:addons/account/wizard/account_invoice_refund.py:137
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -6000,11 +6024,6 @@ msgstr ""
msgid "Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_view
-msgid "Here you can personalize and create each view of your financial journals by selecting the fields you want to appear and the sequence they will appear."
-msgstr ""
-
#. module: account
#: field:account.invoice,origin:0
#: field:report.invoice.created,origin:0
@@ -6012,8 +6031,8 @@ msgid "Source Document"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_period_form
-msgid "Here, you can define a period, an interval of time between successive closings of the books of your company. An accounting period typically is a month or a quarter, corresponding to the tax year used by the business. Create and manage them from here and decide whether a period should be left open or closed depending on your company's activities over a specific period."
+#: help:account.account.type,sign:0
+msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
msgstr ""
#. module: account
@@ -6036,6 +6055,11 @@ msgstr ""
msgid "For taxes of type percentage, enter % ratio between 0-1."
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_subscription_form
+msgid "A recurring entry is a miscellaneous entry that occurs on a recurrent basis from a specific date, i.e. corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create such entries to automate the postings in the system."
+msgstr ""
+
#. module: account
#: field:account.entries.report,product_uom_id:0
#: view:analytic.entries.report:0
@@ -6043,6 +6067,11 @@ msgstr ""
msgid "Product UOM"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
+msgid "A Cash Register allows you to manage cash entries in your cash journals. This feature provides an easy way to follow up cash payments on a daily basis. You can enter the coins that are in your cash box, and then post entries when money comes in or goes out of the cash box."
+msgstr ""
+
#. module: account
#: selection:account.automatic.reconcile,power:0
msgid "9"
@@ -6081,7 +6110,7 @@ msgid "Lines"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:539
#, python-format
msgid "Can not find account chart for this company in invoice line account, Please Create account."
msgstr ""
@@ -6101,6 +6130,12 @@ msgstr ""
msgid "Are you sure you want to open this invoice ?"
msgstr ""
+#. module: account
+#: code:addons/account/account_move_line.py:889
+#, python-format
+msgid "Accounting Entries"
+msgstr ""
+
#. module: account
#: field:account.account.template,parent_id:0
msgid "Parent Account Template"
@@ -6141,6 +6176,11 @@ msgid "Financial and accounting module that covers:\n"
" "
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
+msgid "You can search for individual account entries through useful information. To search for account entries, open a journal, then select a record line."
+msgstr ""
+
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
@@ -6165,11 +6205,6 @@ msgstr ""
msgid "Icon"
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
-msgid "Cash Register allows you to manage cash entries in your cash journals."
-msgstr ""
-
#. module: account
#: view:account.automatic.reconcile:0
#: view:account.use.model:0
@@ -6177,7 +6212,7 @@ msgid "Ok"
msgstr ""
#. module: account
-#: code:addons/account/report/account_partner_balance.py:0
+#: code:addons/account/report/account_partner_balance.py:115
#, python-format
msgid "Unknown Partner"
msgstr ""
@@ -6207,11 +6242,6 @@ msgstr ""
msgid "Ending Date"
msgstr ""
-#. module: account
-#: field:account.invoice.report,uom_name:0
-msgid "Default UoM"
-msgstr ""
-
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax:0
msgid "Default Purchase Tax"
@@ -6234,7 +6264,7 @@ msgid "This field is only used if you develop your own module allowing developer
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:938
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
@@ -6297,7 +6327,6 @@ msgid "Use model"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_moves_all_a
#: model:ir.actions.act_window,help:account.action_account_moves_purchase
msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a supplier invoice, start by recording the line of the expense account, OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
@@ -6329,16 +6358,11 @@ msgid "Sign on Reports"
msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:0
+#: code:addons/account/account_cash_statement.py:249
#, python-format
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"
@@ -6409,14 +6433,14 @@ msgid "This field is used for payable and receivable journal entries. You can pu
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1197
#, python-format
msgid "Bad account !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2777
+#: code:addons/account/installer.py:432
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -6427,7 +6451,7 @@ msgid "Invoice Tax"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1172
#, python-format
msgid "No piece number !"
msgstr ""
@@ -6482,6 +6506,8 @@ msgstr ""
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_partner_balance.py:304
+#, python-format
msgid "Payable Accounts"
msgstr ""
@@ -6507,7 +6533,6 @@ msgid "Sale Taxes"
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_cash_moves
#: selection:account.analytic.journal,type:0
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
@@ -6571,13 +6596,13 @@ msgid "Monthly"
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " number of days: 14"
+#: model:ir.actions.act_window,help:account.action_account_journal_view
+msgid "Here you can customize an existing journal view or create a new view. Journal views determine the way you can record entries in your journal. Select the fields you want to appear in a journal and determine the sequence in which they will appear. Then you can create a new journal and link your view to it."
msgstr ""
#. module: account
-#: model:account.account.type,name:account.account_type_asset
-msgid "Asset"
+#: view:account.payment.term.line:0
+msgid " number of days: 14"
msgstr ""
#. module: account
@@ -6647,9 +6672,17 @@ msgid "Fixed"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
+#: code:addons/account/account.py:506
+#: code:addons/account/account.py:519
+#: code:addons/account/account.py:522
+#: code:addons/account/account.py:532
+#: code:addons/account/account.py:640
+#: code:addons/account/account.py:927
+#: code:addons/account/account_move_line.py:675
+#: code:addons/account/account_move_line.py:719
+#: code:addons/account/invoice.py:732
+#: code:addons/account/invoice.py:735
+#: code:addons/account/invoice.py:738
#, python-format
msgid "Warning !"
msgstr ""
@@ -6705,13 +6738,13 @@ msgid "Select a currency to apply on the invoice"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:0
+#: code:addons/account/wizard/account_invoice_refund.py:100
#, python-format
msgid "Can not %s draft/proforma/cancel invoice."
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:805
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -6747,12 +6780,7 @@ msgid "Tax Use In"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_form
-msgid "Create and manage your company's financial journals from this menu. A journal is a business diary in which all financial data related to the day to day business transactions of your company is recorded using double-entry book keeping system. Depending on the nature of its activities and number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchases journal, and sales journal."
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:346
#, python-format
msgid "The account entries lines are not in valid state."
msgstr ""
@@ -6763,7 +6791,7 @@ msgid "Deferral Method"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:377
#, python-format
msgid "Invoice '%s' is paid."
msgstr ""
@@ -6783,11 +6811,6 @@ msgstr ""
msgid "Line"
msgstr ""
-#. module: account
-#: help:product.template,property_account_income:0
-msgid "This account will be used for invoices instead of the default one to value sales for the current product"
-msgstr ""
-
#. module: account
#: help:account.journal,group_invoice_lines:0
msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
@@ -6825,7 +6848,7 @@ msgid "Associated Partner"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1302
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -6853,6 +6876,11 @@ msgstr ""
msgid "Invoice's state is Open"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_tax_code_tree
+msgid "The chart of taxes is used to generate your periodical tax statement. You will see the taxes with codes related to your legal statement according to your country."
+msgstr ""
+
#. module: account
#: view:account.installer.modules:0
msgid "Add extra Accounting functionalities to the ones already installed."
@@ -6882,8 +6910,8 @@ msgid "Choose Fiscal Year"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2841
+#: code:addons/account/installer.py:495
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
@@ -6925,7 +6953,9 @@ msgstr ""
#: view:account.period:0
#: field:account.subscription,period_nbr:0
#: field:account.tax.chart,period_id:0
+#: code:addons/account/account_move_line.py:908
#: field:validate.account.move,period_id:0
+#, python-format
msgid "Period"
msgstr ""
@@ -6975,6 +7005,11 @@ msgstr ""
msgid "Tax/Base Amount"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree3
+msgid "With Customer Refunds you can manage the credit notes for your customers. A refund is a document that credits an invoice completely or partially. You can easily generate refunds and reconcile them directly from the invoice form."
+msgstr ""
+
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
msgid "This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."
@@ -7005,13 +7040,13 @@ msgid "Payment"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
-msgid "You can look up individual account entries by searching for useful information. To search for account entries, open a journal, then select a record line."
+#: help:account.bs.report,reserve_account_id:0
+msgid "This Account is used for transfering Profit/Loss (Profit: Amount will be added, Loss: Amount will be duducted), which is calculated from Profilt & Loss Report"
msgstr ""
#. module: account
-#: help:product.category,property_account_income_categ:0
-msgid "This account will be used for invoices to value sales for the current product category"
+#: help:account.move.line,blocked:0
+msgid "You can check this box to mark this journal item as a litigation with the associated partner"
msgstr ""
#. module: account
@@ -7030,11 +7065,6 @@ 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"
@@ -7058,7 +7088,7 @@ msgid "Account Types"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:915
#, python-format
msgid "Cannot create invoice move on centralised journal"
msgstr ""
@@ -7074,7 +7104,7 @@ msgstr ""
#: view:account.move.line:0
#: view:account.move.line.reconcile:0
#: view:account.move.line.reconcile.select:0
-#: code:addons/account/wizard/account_move_line_reconcile_select.py:0
+#: code:addons/account/wizard/account_move_line_reconcile_select.py:45
#: model:ir.ui.menu,name:account.periodical_processing_reconciliation
#: model:process.node,name:account.process_node_reconciliation0
#: model:process.node,name:account.process_node_supplierreconciliation0
@@ -7112,6 +7142,11 @@ msgstr ""
msgid "Filter By"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_invoice_tree1
+msgid "With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers."
+msgstr ""
+
#. module: account
#: view:account.entries.report:0
#: view:board.board:0
@@ -7137,8 +7172,8 @@ msgid "Payment Term Line"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2794
+#: code:addons/account/installer.py:452
#, python-format
msgid "Purchase Journal"
msgstr ""
@@ -7153,11 +7188,6 @@ msgstr ""
msgid "Subtotal"
msgstr ""
-#. module: account
-#: report:account.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
@@ -7178,6 +7208,7 @@ msgid "Due Date"
msgstr ""
#. module: account
+#: model:ir.ui.menu,name:account.menu_account_supplier
#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Suppliers"
msgstr ""
@@ -7219,8 +7250,8 @@ msgid "Fiscalyear Close"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_type_form
-msgid "An account type is a name or code given to an account that indicates its purpose. For example, the account type could be linked to an asset account, expense account or payable account. From this view, you can create and manage the account types you need to be used for your company management."
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
msgstr ""
#. module: account
@@ -7285,11 +7316,6 @@ msgstr ""
msgid "Journal Name"
msgstr ""
-#. module: account
-#: help:account.move.line,blocked:0
-msgid "You can check this box to mark this journal item as a litigation with the associated partner"
-msgstr ""
-
#. module: account
#: help:account.invoice,internal_number:0
msgid "Unique number of the invoice, computed automatically when the invoice is created."
@@ -7301,12 +7327,8 @@ msgid "The amount of the voucher must be the same amount as the one on the state
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
+#: code:addons/account/account_move_line.py:1057
+#: code:addons/account/account_move_line.py:1140
#, python-format
msgid "Bad account!"
msgstr ""
@@ -7317,7 +7339,7 @@ msgid "Keep empty for all open fiscal years"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:982
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
msgstr ""
@@ -7347,6 +7369,7 @@ msgstr ""
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:analytic.entries.report,currency_id:0
+#: model:ir.model,name:account.model_res_currency
#: field:report.account.sales,currency_id:0
#: field:report.account_type.sales,currency_id:0
#: field:report.invoice.created,currency_id:0
@@ -7363,6 +7386,11 @@ msgstr ""
msgid "Accountant validates the accounting entries coming from the invoice."
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
+msgid "Define your company's financial year according to your needs. A financial year is a period at the end of which a company's accounts are made up (usually 12 months). The financial year is usually referred to by the date in which it ends. For example, if a company's financial year ends November 30, 2011, then everything between December 1, 2010 and November 30, 2011 would be referred to as FY 2011. You are not obliged to follow the actual calendar year."
+msgstr ""
+
#. module: account
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
@@ -7424,11 +7452,6 @@ msgstr ""
msgid "Reference Type"
msgstr ""
-#. module: account
-#: help:account.bs.report,reserve_account_id:0
-msgid "This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss : Amount will be duducted.), Which is calculated from Profilt & Loss Report"
-msgstr ""
-
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for period"
@@ -7486,14 +7509,14 @@ msgid "Period from"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2817
+#: code:addons/account/installer.py:476
#, python-format
msgid "Sales Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:927
#, python-format
msgid "You cannot modify company of this period as its related record exist in Entry Lines"
msgstr ""
@@ -7540,16 +7563,11 @@ msgid "Purchase Tax(%)"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:805
#, python-format
msgid "Please create some invoice lines."
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_tax_code_list
-msgid "A tax code is a reference of a tax that will be taken out of a gross income depending on the country and sometimes industry sector. OpenERP allows you to define and manage them from this menu."
-msgstr ""
-
#. module: account
#: report:account.overdue:0
msgid "Dear Sir/Madam,"
@@ -7561,13 +7579,8 @@ msgid "Configure Your Accounting Application"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_form
-msgid "Create and manage accounts you will need to record financial entries in. Accounts are financial records of your company that register all financial transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor yearly."
-msgstr ""
-
-#. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/installer.py:0
+#: code:addons/account/account.py:2820
+#: code:addons/account/installer.py:479
#, python-format
msgid "SCNJ"
msgstr ""
@@ -7607,7 +7620,7 @@ msgid "Start Period"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:2333
#, python-format
msgid "Cannot locate parent code for template account!"
msgstr ""
@@ -7633,6 +7646,8 @@ msgstr ""
#. module: account
#: view:account.move.line:0
+#: code:addons/account/account_move_line.py:932
+#, python-format
msgid "Total credit"
msgstr ""
@@ -7642,7 +7657,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. "
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:1026
#, python-format
msgid "You cannot cancel the Invoice which is Partially Paid! You need to unreconcile concerned payment entries!"
msgstr ""
@@ -7657,11 +7672,6 @@ msgstr ""
msgid "Unpaid"
msgstr ""
-#. module: account
-#: model:ir.actions.act_window,help:account.action_tax_code_tree
-msgid "The chart of taxes is used to generate your periodic tax statement. You will see here the taxes with codes related to your legal statement according to your country."
-msgstr ""
-
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
@@ -7673,11 +7683,37 @@ msgid "You can not create move line on view account."
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:0
+#: code:addons/account/wizard/account_change_currency.py:71
#, python-format
msgid "Current currency is not confirured properly !"
msgstr ""
+#. module: account
+#: code:addons/account/account.py:938
+#: code:addons/account/account.py:940
+#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1393
+#: code:addons/account/account.py:1397
+#: code:addons/account/account_cash_statement.py:249
+#: code:addons/account/account_move_line.py:723
+#: code:addons/account/account_move_line.py:746
+#: code:addons/account/account_move_line.py:748
+#: code:addons/account/account_move_line.py:751
+#: code:addons/account/account_move_line.py:753
+#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/report/common_report_header.py:92
+#: code:addons/account/wizard/account_change_currency.py:39
+#: code:addons/account/wizard/account_change_currency.py:60
+#: code:addons/account/wizard/account_change_currency.py:65
+#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
+#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_report_common.py:126
+#, python-format
+msgid "Error"
+msgstr ""
+
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
@@ -7688,11 +7724,6 @@ msgstr ""
msgid "Particulars"
msgstr ""
-#. module: account
-#: report:account.invoice:0
-msgid "Document"
-msgstr ""
-
#. module: account
#: selection:account.account.type,report_type:0
msgid "Profit & Loss (Income Accounts)"
@@ -7762,7 +7793,6 @@ msgstr ""
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
-#: model:account.account.type,name:account.account_type_payable
#: selection:account.entries.report,type:0
msgid "Payable"
msgstr ""
@@ -7791,13 +7821,13 @@ msgid "This view is used by accountants in order to record entries massively in
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:0
+#: code:addons/account/account_bank_statement.py:391
#, python-format
msgid "Cannot delete bank statement(s) which are already confirmed !"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:0
+#: code:addons/account/wizard/account_automatic_reconcile.py:152
#, python-format
msgid "You must select accounts to reconcile"
msgstr ""
@@ -7812,6 +7842,11 @@ msgstr ""
msgid "Accounting entries are the first input of the reconciliation."
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_period_form
+msgid "Here you can define a financial period, an interval of time in your company's financial year. An accounting period typically is a month or a quarter. It usually corresponds to the periods of the tax declaration. Create and manage periods from here and decide whether a period should be closed or left open depending on your company's activities over a specific period."
+msgstr ""
+
#. module: account
#: report:account.move.voucher:0
msgid "Receiver's Signature"
@@ -7840,7 +7875,7 @@ msgid "Move"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1054
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
@@ -7866,7 +7901,7 @@ msgid "Date of the day"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:0
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
#, python-format
msgid "You have to define the bank account\n"
"in the journal definition for reconciliation."
@@ -7889,7 +7924,7 @@ msgid "Consolidated Children"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:0
+#: code:addons/account/wizard/account_fiscalyear_close.py:82
#, python-format
msgid "The journal must have centralised counterpart without the Skipping draft state option checked!"
msgstr ""
@@ -7973,7 +8008,7 @@ msgid "Account Subscription"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:735
#, python-format
msgid "Tax base different !\n"
"Click on compute to update tax base"
@@ -8027,7 +8062,7 @@ msgid "Unreconciled"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:822
#, python-format
msgid "Bad total !"
msgstr ""
@@ -8078,13 +8113,13 @@ msgid "Active"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:372
#, python-format
msgid "Unknown Error"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:1167
#, python-format
msgid "You cannot validate a non-balanced entry !\n"
"Make sure you have configured Payment Term properly !\n"
@@ -8159,7 +8194,7 @@ msgid "Journal Entry Model"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_use_model.py:0
+#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Maturity date of entry line generated by model line '%s' is based on partner payment term!\n"
"Please define partner on it!"
@@ -8399,8 +8434,12 @@ msgid "Tax Source"
msgstr ""
#. module: account
-#: code:addons/account/report/account_balance_sheet.py:0
-#: code:addons/account/report/account_profit_loss.py:0
+#: code:addons/account/report/account_balance_sheet.py:71
+#: code:addons/account/report/account_balance_sheet.py:116
+#: code:addons/account/report/account_balance_sheet.py:119
+#: code:addons/account/report/account_balance_sheet.py:120
+#: code:addons/account/report/account_profit_loss.py:71
+#: code:addons/account/report/account_profit_loss.py:127
#, python-format
msgid "Net Profit"
msgstr ""
@@ -8416,7 +8455,7 @@ msgid "This is a model for recurring accounting entries"
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:0
+#: code:addons/account/account_analytic_line.py:100
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -8455,6 +8494,12 @@ msgstr ""
msgid "Total"
msgstr ""
+#. module: account
+#: code:addons/account/wizard/account_move_journal.py:97
+#, python-format
+msgid "Journal: All"
+msgstr ""
+
#. module: account
#: field:account.account,company_id:0
#: field:account.analytic.journal,company_id:0
@@ -8556,18 +8601,22 @@ msgid "End period"
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
+#: code:addons/account/account_move_line.py:680
+#: code:addons/account/account_move_line.py:758
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_report_balance_sheet.py:72
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
#, python-format
msgid "Warning"
msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_analytic_journal
-msgid "account.analytic.journal"
+#: help:product.category,property_account_expense_categ:0
+#: help:product.template,property_account_expense:0
+msgid "This account will be used to value outgoing stock for the current product category using cost price"
msgstr ""
#. module: account
@@ -8635,11 +8684,6 @@ msgstr ""
msgid "Invoice Lines"
msgstr ""
-#. module: account
-#: help:product.category,property_account_expense_categ:0
-msgid "This account will be used for invoices to value expenses for the current product category"
-msgstr ""
-
#. module: account
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
@@ -8651,7 +8695,7 @@ msgid "Recurring"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:748
#, python-format
msgid "Entry is already reconciled"
msgstr ""
@@ -8672,7 +8716,7 @@ msgid "Range"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1172
#, python-format
msgid "Can not create an automatic sequence for this piece !\n"
"\n"
@@ -8735,7 +8779,7 @@ msgid "Applicability"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_move_journal.py:0
+#: code:addons/account/wizard/account_move_journal.py:162
#, python-format
msgid "This period is already closed !"
msgstr ""
@@ -8760,6 +8804,11 @@ msgstr ""
msgid "Parent Account"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_journal_form
+msgid "Create and manage your company's journals from this menu. A journal is used to record transactions of all accounting data related to the day-to-day business of your company using double-entry bookkeeping system. Depending on the nature of its activities and the number of daily transactions, a company may keep several types of specialized journals such as a cash journal, purchase journal, sales journal..."
+msgstr ""
+
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
msgid "Account Analytic Chart"
@@ -8788,7 +8837,7 @@ msgid "Accounts Mapping"
msgstr ""
#. module: account
-#: code:addons/account/invoice.py:0
+#: code:addons/account/invoice.py:364
#, python-format
msgid "Invoice '%s' is waiting for validation."
msgstr ""
@@ -8803,8 +8852,8 @@ msgid "November"
msgstr ""
#. module: account
-#: sql_constraint:account.account:0
-msgid "The code of the account must be unique per company !"
+#: model:ir.model,name:account.model_account_installer_modules
+msgid "account.installer.modules"
msgstr ""
#. module: account
@@ -8813,7 +8862,7 @@ msgid "The income or expense account related to the selected product."
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:0
+#: code:addons/account/account_move_line.py:1043
#, python-format
msgid "The date of your Journal Entry is not in the defined period!"
msgstr ""
@@ -8922,7 +8971,6 @@ msgstr ""
#. module: account
#: field:account.aged.trial.balance,result_selection:0
#: field:account.common.partner.report,result_selection:0
-#: report:account.general.ledger:0
#: report:account.partner.balance:0
#: field:account.partner.balance,result_selection:0
#: field:account.partner.ledger,result_selection:0
@@ -9021,14 +9069,19 @@ msgid "Amount currency"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:0
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
#, python-format
msgid "You must enter a period length that cannot be 0 or below !"
msgstr ""
#. module: account
-#: code:addons/account/account.py:0
+#: code:addons/account/account.py:501
#, python-format
msgid "You cannot remove an account which has account entries!. "
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_form
+msgid "Create and manage the accounts you need to record journal entries. An account is part of a ledger allowing your company to register all kinds of debit and credit transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor annually."
+msgstr ""
+
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index d173ea2eaab..8fb73751247 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index b32bfc2a40c..38feb5553e5 100644
--- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,16 +31,12 @@ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
msgstr ""
#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:532
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:703
#, python-format
msgid "AccessError"
msgstr ""
-#. module: account_analytic_analysis
-#: field:account.analytic.account,ca_theorical:0
-msgid "Theorical Revenue"
-msgstr ""
-
#. module: account_analytic_analysis
#: help:account.analytic.account,last_invoice_date:0
msgid "Date of the last invoice created for this analytic account."
@@ -69,13 +65,13 @@ msgid "Computed using the formula: Theorial Revenue - Total Costs"
msgstr ""
#. module: account_analytic_analysis
-#: field:account.analytic.account,theorical_margin:0
-msgid "Theorical Margin"
+#: field:account.analytic.account,real_margin_rate:0
+msgid "Real Margin Rate (%)"
msgstr ""
#. module: account_analytic_analysis
-#: field:account.analytic.account,real_margin_rate:0
-msgid "Real Margin Rate (%)"
+#: field:account.analytic.account,ca_theorical:0
+msgid "Theoretical Revenue"
msgstr ""
#. module: account_analytic_analysis
@@ -108,6 +104,11 @@ msgstr ""
msgid "Remaining Hours"
msgstr ""
+#. module: account_analytic_analysis
+#: field:account.analytic.account,theorical_margin:0
+msgid "Theoretical Margin"
+msgstr ""
+
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_theorical:0
msgid "Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist."
@@ -155,7 +156,8 @@ msgid "Invoiced Amount"
msgstr ""
#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:0
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:533
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:704
#, python-format
msgid "You try to bypass an access rule (Document type: %s)."
msgstr ""
@@ -175,6 +177,11 @@ msgstr ""
msgid "Real Margin"
msgstr ""
+#. module: account_analytic_analysis
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
#. module: account_analytic_analysis
#: help:account.analytic.account,ca_invoiced:0
msgid "Total customer invoiced amount for this account."
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index f75a5d720e9..4190e00e2d0 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index a92c5097bbd..73e254d3063 100644
--- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot
+++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:47+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:47+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -66,6 +66,12 @@ msgstr ""
msgid "Analytic Plan Line"
msgstr ""
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:60
+#, python-format
+msgid "User Error"
+msgstr ""
+
#. module: account_analytic_plans
#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
msgid "Analytic Plan Instance"
@@ -152,7 +158,7 @@ msgid "Sales Order Line"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
#: view:analytic.plan.create.model:0
#, python-format
msgid "Distribution Model Saved"
@@ -174,13 +180,13 @@ msgid "Percentage"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
#, 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
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "No analytic plan defined !"
msgstr ""
@@ -198,9 +204,8 @@ msgid "Analytic Plans"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0
-#, python-format
-msgid "User Error"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
msgstr ""
#. module: account_analytic_plans
@@ -264,7 +269,8 @@ msgid "To Date"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
msgstr ""
@@ -359,8 +365,9 @@ 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
+#: code:addons/account_analytic_plans/account_analytic_plans.py:201
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
#, python-format
msgid "Error"
msgstr ""
@@ -376,7 +383,7 @@ msgid "Quantity"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
#, python-format
msgid "Please put a name and a code before saving the model !"
msgstr ""
@@ -387,7 +394,8 @@ msgid "Print Crossovered Analytic"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:321
+#: code:addons/account_analytic_plans/account_analytic_plans.py:462
#, python-format
msgid "No Analytic Journal !"
msgstr ""
@@ -424,7 +432,7 @@ msgid "Analytic Distribution Lines"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
#, python-format
msgid "The Total Should be Between %s and %s"
msgstr ""
@@ -501,7 +509,7 @@ msgid "The name of the journal must be unique per company !"
msgstr ""
#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/account_analytic_plans.py:214
#, python-format
msgid "Value Error"
msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
index f96013a9b3a..d72d95f22b1 100644
--- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
+++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:48+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:48+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid " Accounting Property"
msgstr ""
#. module: account_anglo_saxon
-#: model:ir.model,name:account_anglo_saxon.model_product_category
-msgid "Product Category"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
msgstr ""
#. module: account_anglo_saxon
@@ -50,6 +50,11 @@ msgstr ""
msgid "Product Template"
msgstr ""
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr ""
+
#. module: account_anglo_saxon
#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
msgid "Stock Accounting for Anglo Saxon countries"
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index e2ea514a5cf..91d987c5d9d 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,13 +32,14 @@ msgid "Budgetary Positions"
msgstr ""
#. module: account_budget
-#: view:account.budget.crossvered.summary.report:0
-msgid "This wizard is used to print summary of budgets"
+#: code:addons/account_budget/account_budget.py:119
+#, python-format
+msgid "The General Budget '%s' has no Accounts!"
msgstr ""
#. module: account_budget
-#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
-msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period."
+#: report:account.budget:0
+msgid "Printed at:"
msgstr ""
#. module: account_budget
@@ -117,6 +118,16 @@ msgstr ""
msgid "Status"
msgstr ""
+#. module: account_budget
+#: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
+msgid "A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period."
+msgstr ""
+
+#. module: account_budget
+#: view:account.budget.crossvered.summary.report:0
+msgid "This wizard is used to print summary of budgets"
+msgstr ""
+
#. module: account_budget
#: report:account.budget:0
#: report:crossovered.budget.report:0
@@ -182,6 +193,7 @@ msgid "Practical Amt"
msgstr ""
#. module: account_budget
+#: view:account.analytic.account:0
#: view:account.budget.post:0
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,practical_amount:0
@@ -201,6 +213,7 @@ msgid "Account Budget report for analytic account"
msgstr ""
#. module: account_budget
+#: view:account.analytic.account:0
#: view:account.budget.post:0
#: view:crossovered.budget:0
#: field:crossovered.budget.lines,theoritical_amount:0
@@ -235,12 +248,7 @@ msgid "Budget"
msgstr ""
#. module: account_budget
-#: report:account.budget:0
-msgid "Printed at:"
-msgstr ""
-
-#. module: account_budget
-#: code:addons/account_budget/account_budget.py:0
+#: code:addons/account_budget/account_budget.py:119
#, python-format
msgid "Error!"
msgstr ""
@@ -270,9 +278,8 @@ msgid "Budgets"
msgstr ""
#. module: account_budget
-#: code:addons/account_budget/account_budget.py:0
-#, python-format
-msgid "The General Budget '%s' has no Accounts!"
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: account_budget
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index ed064edbdf1..4348781ba92 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_chart/i18n/account_chart.pot b/addons/account_chart/i18n/account_chart.pot
index bd19519e330..15e00d2923f 100644
--- a/addons/account_chart/i18n/account_chart.pot
+++ b/addons/account_chart/i18n/account_chart.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:49+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:49+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot
index 899ae288af1..54c1996cf93 100644
--- a/addons/account_coda/i18n/account_coda.pot
+++ b/addons/account_coda/i18n/account_coda.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:50+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgid "Coda import"
msgstr ""
#. module: account_coda
-#: code:addons/account_coda/account_coda.py:0
+#: code:addons/account_coda/account_coda.py:51
#, python-format
msgid "Coda file not found for bank statement !!"
msgstr ""
@@ -137,7 +137,7 @@ msgid "Open Statements"
msgstr ""
#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
+#: code:addons/account_coda/wizard/account_coda_import.py:167
#, python-format
msgid "The bank account %s is not defined for the partner %s.\n"
""
@@ -204,7 +204,7 @@ msgid "Coda Logs"
msgstr ""
#. module: account_coda
-#: code:addons/account_coda/wizard/account_coda_import.py:0
+#: code:addons/account_coda/wizard/account_coda_import.py:311
#, python-format
msgid "Result"
msgstr ""
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index 21661cfbf8e..e106adbec1d 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:51+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:295
#, python-format
msgid "Follwoup Summary"
msgstr ""
@@ -54,7 +54,7 @@ msgid "Group By..."
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:287
#, python-format
msgid "\n"
"\n"
@@ -183,7 +183,7 @@ msgid "Partners"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:138
#, python-format
msgid "Invoices Reminder"
msgstr ""
@@ -369,7 +369,7 @@ msgid "Due"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:56
#, python-format
msgid "Select Partners"
msgstr ""
@@ -430,7 +430,7 @@ msgid "Send email confirmation"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:284
#, python-format
msgid "All E-mails have been successfully sent to Partners:.\n"
"\n"
@@ -615,7 +615,7 @@ msgid "Maturity"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:0
+#: code:addons/account_followup/wizard/account_followup_print.py:286
#, python-format
msgid "E-Mail not sent to following Partners, Email not available !\n"
"\n"
diff --git a/addons/account_invoice_layout/i18n/account_invoice_layout.pot b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
index f274428d5e0..abd84e47d10 100644
--- a/addons/account_invoice_layout/i18n/account_invoice_layout.pot
+++ b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:24+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:24+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:51+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:51+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
-msgid "Document"
+msgid "Tel. :"
msgstr ""
#. module: account_invoice_layout
@@ -125,8 +125,9 @@ msgid "Product"
msgstr ""
#. module: account_invoice_layout
-#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
-msgid "Write Messages"
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
msgstr ""
#. module: account_invoice_layout
@@ -148,7 +149,6 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
-#: report:notify_account.invoice:0
msgid "Taxes:"
msgstr ""
@@ -158,8 +158,8 @@ msgid "Source Account"
msgstr ""
#. module: account_invoice_layout
-#: view:account.invoice.special.msg:0
-msgid "Cancel"
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
msgstr ""
#. module: account_invoice_layout
@@ -193,19 +193,17 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
-#. module: account_invoice_layout
-#: report:account.invoice.layout:0
-#: model:ir.model,name:account_invoice_layout.model_account_invoice
-#: report:notify_account.invoice:0
-msgid "Invoice"
+msgid "Refund"
msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
msgid "Total:"
msgstr ""
@@ -237,9 +235,18 @@ msgid "Amount"
msgstr ""
#. module: account_invoice_layout
-#: report:account.invoice.layout:0
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
#: report:notify_account.invoice:0
-msgid "Tel. :"
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
msgstr ""
#. module: account_invoice_layout
@@ -261,7 +268,7 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
#: report:notify_account.invoice:0
-msgid "Refund"
+msgid "Origin"
msgstr ""
#. module: account_invoice_layout
@@ -274,6 +281,12 @@ msgstr ""
msgid "Separator Line"
msgstr ""
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
#. module: account_invoice_layout
#: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
msgid "Invoices Layout Improvement"
@@ -303,7 +316,6 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
-#: report:notify_account.invoice:0
msgid "Net Total:"
msgstr ""
@@ -314,13 +326,14 @@ msgstr ""
#. module: account_invoice_layout
#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
#: report:notify_account.invoice:0
-msgid "Fax :"
+msgid "Invoice"
msgstr ""
#. module: account_invoice_layout
-#: model:notify.message,msg:account_invoice_layout.demo_message1
-msgid "Be Expert with the Experts..."
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
msgstr ""
#. module: account_invoice_layout
@@ -334,6 +347,11 @@ msgstr ""
msgid "Message"
msgstr ""
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr ""
+
#. module: account_invoice_layout
#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
msgid "All Notification Messages"
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index 0a27f881a59..aa930d5ecf2 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgid "Choose an option for the Payment Order:'Fixed' stands for a date specifie
msgstr ""
#. module: account_payment
-#: code:addons/account_payment/account_move_line.py:0
+#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error !"
msgstr ""
@@ -394,7 +394,7 @@ msgid "The successor message of Communication."
msgstr ""
#. module: account_payment
-#: code:addons/account_payment/account_move_line.py:0
+#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "No partner defined on entry line"
msgstr ""
@@ -450,6 +450,12 @@ msgstr ""
msgid "Search"
msgstr ""
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
#. module: account_payment
#: field:payment.line,date:0
msgid "Payment Date"
@@ -552,9 +558,8 @@ msgid "Information"
msgstr ""
#. module: account_payment
-#: model:ir.actions.report.xml,name:account_payment.payment_order1
-#: model:ir.model,name:account_payment.model_payment_order
-msgid "Payment Order"
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid "A payment order is a payment request from your company to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for."
msgstr ""
#. module: account_payment
@@ -662,11 +667,6 @@ msgstr ""
msgid "Total"
msgstr ""
-#. module: account_payment
-#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
-msgid "A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for."
-msgstr ""
-
#. module: account_payment
#: view:account.payment.make.payment:0
#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot
index 4d32e3e4cc2..780ca71b05d 100644
--- a/addons/account_sequence/i18n/account_sequence.pot
+++ b/addons/account_sequence/i18n/account_sequence.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:25+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:25+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index d08e78fa72a..69baf8d1bad 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Unreconciliation transactions"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:259
#, python-format
msgid "Write-Off"
msgstr ""
@@ -36,6 +36,11 @@ msgstr ""
msgid "Open Customer Journal Entries"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "Voucher Date"
+msgstr ""
+
#. module: account_voucher
#: report:voucher.print:0
msgid "Particulars"
@@ -43,11 +48,12 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
+#: view:sale.receipt.report:0
msgid "Group By..."
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:607
#, python-format
msgid "Cannot delete Voucher(s) which are already opened or paid !"
msgstr ""
@@ -79,13 +85,14 @@ msgid "Bill Payment"
msgstr ""
#. module: account_voucher
-#: field:account.voucher.line,amount_original:0
-msgid "Originial Amount"
+#: code:addons/account_voucher/account_voucher.py:753
+#, python-format
+msgid "You have to configure account base code and account tax code on the '%s' tax!"
msgstr ""
#. module: account_voucher
#: view:account.statement.from.invoice.lines:0
-#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:0
+#: code:addons/account_voucher/wizard/account_statement_from_invoice.py:182
#: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines
#, python-format
msgid "Import Entries"
@@ -96,6 +103,11 @@ msgstr ""
msgid "Account voucher unreconcile"
msgstr ""
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "March"
+msgstr ""
+
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
msgid "When you sell products to a customer, you can give him a sales receipt or an invoice. When the sales receipt is confirmed, it creates journal items automatically and you can record the customer payment related to this sales receipt."
@@ -109,6 +121,8 @@ msgstr ""
#. module: account_voucher
#: field:account.voucher,company_id:0
#: field:account.voucher.line,company_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,company_id:0
msgid "Company"
msgstr ""
@@ -118,8 +132,8 @@ msgid "Set to Draft"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,comment:0
-msgid "Write-Off Comment"
+#: help:account.voucher,reference:0
+msgid "Transaction reference number."
msgstr ""
#. module: account_voucher
@@ -137,6 +151,12 @@ msgstr ""
msgid "Validate"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,day:0
+msgid "Day"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Search Vouchers"
@@ -144,12 +164,14 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
msgid "Purchase"
msgstr ""
#. module: account_voucher
#: field:account.voucher,account_id:0
#: field:account.voucher.line,account_id:0
+#: field:sale.receipt.report,account_id:0
msgid "Account"
msgstr ""
@@ -163,9 +185,16 @@ msgstr ""
msgid "Ok"
msgstr ""
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
+msgid "From this report, you can have an overview of the amount invoiced to your customer as well as payment delays. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
+
#. module: account_voucher
#: field:account.voucher,date_due:0
#: field:account.voucher.line,date_due:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,date_due:0
msgid "Due Date"
msgstr ""
@@ -186,6 +215,7 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
msgid "Sale"
msgstr ""
@@ -217,11 +247,12 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
-msgid "Bill Information"
+msgid "Other Information"
msgstr ""
#. module: account_voucher
#: selection:account.voucher,state:0
+#: selection:sale.receipt.report,state:0
msgid "Cancelled"
msgstr ""
@@ -257,6 +288,12 @@ msgstr ""
msgid "Amount (in words) :"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,nbr:0
+msgid "# of Voucher Lines"
+msgstr ""
+
#. module: account_voucher
#: field:account.voucher.line,account_analytic_id:0
msgid "Analytic Account"
@@ -282,9 +319,7 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
-#: field:account.voucher,partner_id:0
-#: field:account.voucher.line,partner_id:0
-msgid "Partner"
+msgid "Paid Amount"
msgstr ""
#. module: account_voucher
@@ -293,18 +328,13 @@ msgid "Import Invoices"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
-#, python-format
-msgid "You have to configure account base code and account tax code on the '%s' tax!"
-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
#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
msgid "Receipt"
msgstr ""
@@ -337,6 +367,7 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher,state:0
+#: view:sale.receipt.report:0
msgid "State"
msgstr ""
@@ -345,6 +376,17 @@ msgstr ""
msgid "Accounting Voucher Entries"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher.unreconcile,remove:0
+msgid "Want to remove accounting entries too ?"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
#: model:ir.actions.act_window,name:account_voucher.act_journal_voucher_open
@@ -352,7 +394,7 @@ msgid "Voucher Entries"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:656
#, python-format
msgid "Error !"
msgstr ""
@@ -380,14 +422,19 @@ msgid "Sales Receipt"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:607
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
-msgid "Other Information"
+msgid "Bill Information"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "July"
msgstr ""
#. module: account_voucher
@@ -400,15 +447,21 @@ msgstr ""
msgid "Tax Amount"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,due_delay:0
+msgid "Avg. Due Delay"
+msgstr ""
+
#. module: account_voucher
#: view:account.invoice:0
-#: code:addons/account_voucher/invoice.py:0
+#: code:addons/account_voucher/invoice.py:32
#, python-format
msgid "Pay Invoice"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:753
#, python-format
msgid "No Account Base Code and Account Tax Code!"
msgstr ""
@@ -425,7 +478,11 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
-msgid "Paid Amount"
+#: field:account.voucher,partner_id:0
+#: field:account.voucher.line,partner_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,partner_id:0
+msgid "Partner"
msgstr ""
#. module: account_voucher
@@ -439,8 +496,13 @@ msgid "The amount of the voucher must be the same amount as the one on the state
msgstr ""
#. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Directly"
+#: view:account.voucher:0
+msgid "To Review"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Expense Lines"
msgstr ""
#. module: account_voucher
@@ -450,8 +512,8 @@ msgid "Invoices"
msgstr ""
#. module: account_voucher
-#: field:account.voucher.unreconcile,remove:0
-msgid "Want to remove accounting entries too ?"
+#: selection:sale.receipt.report,month:0
+msgid "December"
msgstr ""
#. module: account_voucher
@@ -460,8 +522,15 @@ msgstr ""
msgid "Voucher Lines"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,month:0
+msgid "Month"
+msgstr ""
+
#. module: account_voucher
#: field:account.voucher,currency_id:0
+#: field:sale.receipt.report,currency_id:0
msgid "Currency"
msgstr ""
@@ -471,20 +540,35 @@ msgid "Payable and Receivables"
msgstr ""
#. module: account_voucher
-#: report:voucher.print:0
-msgid "Account :"
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Later or Group Funds"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,delay_to_pay:0
+msgid "Avg. Delay To Pay"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
#: report:voucher.print:0
msgid "Draft"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,type:0
-msgid "Default Type"
+#: field:account.voucher,writeoff_acc_id:0
+msgid "Write-Off account"
msgstr ""
#. module: account_voucher
@@ -492,11 +576,22 @@ msgstr ""
msgid "Currency:"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total_tax:0
+msgid "Total With Tax"
+msgstr ""
+
#. module: account_voucher
#: report:voucher.print:0
msgid "PRO-FORMA"
msgstr ""
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "August"
+msgstr ""
+
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
msgid "The supplier payment form allows you to track the payment you do to your suppliers. When you select a supplier, the payment method and an amount for the payment, OpenERP will propose to reconcile your payment with the open supplier invoices or bills."
@@ -507,6 +602,11 @@ msgstr ""
msgid "Total Amount"
msgstr ""
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "June"
+msgstr ""
+
#. module: account_voucher
#: field:account.voucher.line,type:0
msgid "Cr/Dr"
@@ -530,16 +630,18 @@ msgstr ""
#. module: account_voucher
#: field:account.voucher,date:0
#: field:account.voucher.line,date_original:0
+#: field:sale.receipt.report,date:0
msgid "Date"
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Post"
+#: selection:sale.receipt.report,month:0
+msgid "November"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
+#: view:sale.receipt.report:0
msgid "Extended Filters..."
msgstr ""
@@ -559,8 +661,14 @@ msgid "Write-Off Analytic Account"
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Expense Lines"
+#: selection:account.voucher,pay_now:0
+#: selection:sale.receipt.report,pay_now:0
+msgid "Pay Directly"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "October"
msgstr ""
#. module: account_voucher
@@ -568,6 +676,11 @@ msgstr ""
msgid "Previous Payments ?"
msgstr ""
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "January"
+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
@@ -585,11 +698,16 @@ msgid "Credit"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:0
+#: code:addons/account_voucher/account_voucher.py:656
#, python-format
msgid "Please define a sequence on the journal !"
msgstr ""
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Open Supplier Journal Entries"
+msgstr ""
+
#. module: account_voucher
#: report:voucher.print:0
msgid "Through :"
@@ -602,8 +720,8 @@ msgid "Supplier Payment"
msgstr ""
#. module: account_voucher
-#: help:account.voucher,reference:0
-msgid "Transaction reference number."
+#: view:account.voucher:0
+msgid "Post"
msgstr ""
#. module: account_voucher
@@ -611,6 +729,12 @@ msgstr ""
msgid "Invoices and outstanding transactions"
msgstr ""
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,price_total:0
+msgid "Total Without Tax"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Bill Date"
@@ -638,8 +762,8 @@ msgid "Bank Statement"
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "To Review"
+#: selection:sale.receipt.report,month:0
+msgid "September"
msgstr ""
#. module: account_voucher
@@ -647,6 +771,13 @@ msgstr ""
msgid "Sales Information"
msgstr ""
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
+#: view:sale.receipt.report:0
+msgid "Sales Receipt Analysis"
+msgstr ""
+
#. module: account_voucher
#: field:account.voucher.line,voucher_id:0
#: model:res.request.link,name:account_voucher.req_link_voucher
@@ -673,6 +804,8 @@ msgstr ""
#. module: account_voucher
#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
msgid "Pro-forma"
msgstr ""
@@ -737,10 +870,17 @@ msgstr ""
msgid "Canceled"
msgstr ""
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "May"
+msgstr ""
+
#. module: account_voucher
#: field:account.statement.from.invoice,journal_ids:0
#: view:account.voucher:0
#: field:account.voucher,journal_id:0
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,journal_id:0
msgid "Journal"
msgstr ""
@@ -755,6 +895,11 @@ msgstr ""
msgid "Credits"
msgstr ""
+#. module: account_voucher
+#: field:account.voucher.line,amount_original:0
+msgid "Original Amount"
+msgstr ""
+
#. module: account_voucher
#: report:voucher.print:0
msgid "State:"
@@ -766,12 +911,16 @@ msgstr ""
#: view:account.voucher:0
#: field:account.voucher,pay_now:0
#: selection:account.voucher,type:0
+#: field:sale.receipt.report,pay_now:0
+#: selection:sale.receipt.report,type:0
msgid "Payment"
msgstr ""
#. module: account_voucher
#: view:account.voucher:0
#: selection:account.voucher,state:0
+#: view:sale.receipt.report:0
+#: selection:sale.receipt.report,state:0
#: report:voucher.print:0
msgid "Posted"
msgstr ""
@@ -782,8 +931,8 @@ msgid "Customer"
msgstr ""
#. module: account_voucher
-#: field:account.voucher,writeoff_acc_id:0
-msgid "Write-Off account"
+#: selection:sale.receipt.report,month:0
+msgid "February"
msgstr ""
#. module: account_voucher
@@ -792,8 +941,18 @@ msgid "Supplier Invoices and Outstanding transactions"
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Open Supplier Journal Entries"
+#: field:account.voucher,comment:0
+msgid "Write-Off Comment"
+msgstr ""
+
+#. module: account_voucher
+#: selection:sale.receipt.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: account_voucher
+#: field:account.voucher,type:0
+msgid "Default Type"
msgstr ""
#. module: account_voucher
@@ -807,6 +966,11 @@ msgstr ""
msgid "Account Entry"
msgstr ""
+#. module: account_voucher
+#: field:sale.receipt.report,state:0
+msgid "Voucher State"
+msgstr ""
+
#. module: account_voucher
#: help:account.voucher,date:0
msgid "Effective date for accounting entries"
@@ -827,6 +991,17 @@ msgstr ""
msgid "Untax Amount"
msgstr ""
+#. module: account_voucher
+#: model:ir.model,name:account_voucher.model_sale_receipt_report
+msgid "Sales Receipt Statistics"
+msgstr ""
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+#: field:sale.receipt.report,year:0
+msgid "Year"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher.line,amount_unreconciled:0
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index b7168d550db..19aa2f7a86e 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:26+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:26+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -166,6 +166,11 @@ msgstr ""
msgid "Contact"
msgstr ""
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Cancelled"
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 b60207b0480..5e03dbc4dc4 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
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgstr ""
msgid "Analytic Journal"
msgstr ""
+#. module: analytic_journal_billing_rate
+#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
#. module: analytic_journal_billing_rate
#: view:analytic_journal_rate_grid:0
msgid "Billing Rate per Journal for this Analytic Account"
@@ -58,8 +63,8 @@ msgid "Analytic Journal Billing Rate, Define the default invoicing rate for a sp
msgstr ""
#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice
-msgid "Invoice"
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index ff2e4d75cf5..3a8e9b34445 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,8 @@ msgid "Product"
msgstr ""
#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
#, python-format
msgid "Error !"
msgstr ""
@@ -49,7 +50,13 @@ msgid "User"
msgstr ""
#. module: analytic_user_function
-#: code:addons/analytic_user_function/analytic_user_function.py:0
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:97
+#: code:addons/analytic_user_function/analytic_user_function.py:132
#, python-format
msgid "There is no expense account define for this product: \"%s\" (id:%d)"
msgstr ""
diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot
index 589397256a6..edea687c40c 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 66c5eb6c020..feb73c38a3a 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:57+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -292,13 +292,13 @@ msgid "Object Image"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
#, python-format
msgid "No buyer is set for this lot."
msgstr ""
#. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:578
#, python-format
msgid "The Buyer \"%s\" has no Invoice Address."
msgstr ""
@@ -373,7 +373,7 @@ msgid "June"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
#, python-format
msgid "No Lots belong to this Auction Date"
msgstr ""
@@ -501,7 +501,8 @@ msgid "Payment"
msgstr ""
#. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
#, python-format
msgid "The object \"%s\" has no buyer assigned."
msgstr ""
@@ -644,8 +645,9 @@ msgid "Account tax for seller"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_invoice.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
#, python-format
msgid "UserError"
msgstr ""
@@ -691,6 +693,11 @@ msgstr ""
msgid "Type"
msgstr ""
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr ""
+
#. module: auction
#: help:auction.lots,ach_emp:0
msgid "When state is Taken Away, this field is marked as True"
@@ -788,7 +795,7 @@ msgid "(Keep empty for automatic number)"
msgstr ""
#. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:578
#, python-format
msgid "No Invoice Address"
msgstr ""
@@ -799,7 +806,8 @@ msgid "Bailiffs Listing"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
#, python-format
msgid "This record does not exist !"
msgstr ""
@@ -1050,15 +1058,19 @@ msgid "Invoice Number"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
#, python-format
msgid "Active IDs not Found"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_aie_send.py:0
-#: code:addons/auction/wizard/auction_aie_send_result.py:0
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
#, python-format
msgid "Connection to WWW.Auction-in-Europe.com failed !"
msgstr ""
@@ -1087,7 +1099,7 @@ msgid "Depositer Inventory"
msgstr ""
#. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:692
#, python-format
msgid "The Buyer has no Invoice Address."
msgstr ""
@@ -1301,7 +1313,7 @@ msgid "Deposit Date"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
#, python-format
msgid "This lot does not exist !"
msgstr ""
@@ -1361,7 +1373,7 @@ msgid "Auction Analysis"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:80
#, python-format
msgid "Payment aborted !"
msgstr ""
@@ -1439,11 +1451,6 @@ msgstr ""
msgid "Lot"
msgstr ""
-#. module: auction
-#: help:aie.category,child_ids:0
-msgid "children aie category"
-msgstr ""
-
#. module: auction
#: model:ir.model,name:auction.model_auction_artists
msgid "auction.artists"
@@ -1529,7 +1536,8 @@ msgid "Last exposition date for auction"
msgstr ""
#. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
#, python-format
msgid "Missed buyer !"
msgstr ""
@@ -1545,7 +1553,7 @@ msgid "Auction manager "
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_lots_invoice.py:0
+#: code:addons/auction/wizard/auction_lots_invoice.py:68
#, python-format
msgid "Two different buyers for the same invoice !\n"
"Please correct this problem before invoicing"
@@ -1774,8 +1782,8 @@ msgid "Net revenue"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:87
#, python-format
msgid "Error!"
msgstr ""
@@ -1911,7 +1919,7 @@ msgid "Configuration"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:80
#, python-format
msgid "You should pay all the total: \"%.2f\" are missing to accomplish the payment."
msgstr ""
@@ -2044,7 +2052,7 @@ msgid "Payment Lines"
msgstr ""
#. module: auction
-#: code:addons/auction/auction.py:0
+#: code:addons/auction/auction.py:692
#, python-format
msgid "Missed Address !"
msgstr ""
@@ -2081,10 +2089,10 @@ msgid "Auction Date:"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_aie_send.py:0
-#: code:addons/auction/wizard/auction_aie_send_result.py:0
-#: code:addons/auction/wizard/auction_lots_buyer_map.py:0
-#: code:addons/auction/wizard/auction_lots_numerotate.py:0
+#: code:addons/auction/wizard/auction_aie_send.py:167
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
#, python-format
msgid "Error"
msgstr ""
@@ -2167,7 +2175,7 @@ msgid "Objects Description"
msgstr ""
#. module: auction
-#: code:addons/auction/wizard/auction_pay_buy.py:0
+#: code:addons/auction/wizard/auction_pay_buy.py:87
#, python-format
msgid "No auction date for \"%s\": Please set one."
msgstr ""
diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot
index 2ed7f56e9cc..1aa5dbff883 100644
--- a/addons/audittrail/i18n/audittrail.pot
+++ b/addons/audittrail/i18n/audittrail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:56:57+0000\n"
+"PO-Revision-Date: 2011-01-03 16:56:57+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Audit Trail"
msgstr ""
#. module: audittrail
-#: code:addons/audittrail/audittrail.py:0
+#: code:addons/audittrail/audittrail.py:81
#, python-format
msgid "WARNING: audittrail is not part of the pool"
msgstr ""
@@ -127,11 +127,6 @@ msgstr ""
msgid "Log Lines"
msgstr ""
-#. module: audittrail
-#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
-msgid "Rules"
-msgstr ""
-
#. module: audittrail
#: view:audittrail.log:0
#: field:audittrail.log,object_id:0
@@ -161,6 +156,7 @@ msgstr ""
#. module: audittrail
#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
msgid "Audit Rules"
msgstr ""
@@ -223,7 +219,7 @@ msgid "Log Reads"
msgstr ""
#. module: audittrail
-#: code:addons/audittrail/audittrail.py:0
+#: code:addons/audittrail/audittrail.py:82
#, python-format
msgid "Change audittrail depends -- Setting rule as DRAFT"
msgstr ""
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index d2cf7a727e8..09909f467c6 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -71,7 +71,12 @@ msgid "Days"
msgstr ""
#. module: base_action_rule
-#: code:addons/base_action_rule/base_action_rule.py:0
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr ""
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:313
#, python-format
msgid "Error!"
msgstr ""
@@ -101,11 +106,6 @@ msgstr ""
msgid "Check this if you want the rule to send a reminder by email to the partner."
msgstr ""
-#. module: base_action_rule
-#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
-msgid "Create actions automatically triggered based on a user activity in the system.E.g.: an opportunity created by a specific user can be automatically maintained with a specific sales team, or an opportunity which still has status pending after 14 days triggers an automatic reminder email."
-msgstr ""
-
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Conditions on Model Partner"
@@ -141,6 +141,11 @@ msgstr ""
msgid "State"
msgstr ""
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid "Use automated actions to automatically trigger actions for various screens. Example: a lead created by a specific user may be automatically set to a specific sales team, or an opportunity which still has status pending after 14 days might trigger an automatic reminder email."
+msgstr ""
+
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_email:0
msgid "Email-id of the persons whom mail is to be sent"
@@ -280,7 +285,7 @@ msgid "Active"
msgstr ""
#. module: base_action_rule
-#: code:addons/base_action_rule/base_action_rule.py:0
+#: code:addons/base_action_rule/base_action_rule.py:314
#, python-format
msgid "No E-Mail ID Found for your Company address!"
msgstr ""
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 2a3288152e2..5389544b041 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -60,8 +60,14 @@ msgid "Invited User"
msgstr ""
#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "Select range to Exclude"
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
msgstr ""
#. module: base_calendar
@@ -96,12 +102,6 @@ msgstr ""
msgid "Fourth"
msgstr ""
-#. module: base_calendar
-#: help:calendar.event,count:0
-#: help:calendar.todo,count:0
-msgid "Repeat max that times"
-msgstr ""
-
#. module: base_calendar
#: field:calendar.event,show_as:0
#: field:calendar.todo,show_as:0
@@ -125,11 +125,8 @@ msgid "Public"
msgstr ""
#. module: base_calendar
-#: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-#: selection:res.alarm,trigger_interval:0
-msgid "Hours"
+#: view:calendar.event:0
+msgid " "
msgstr ""
#. module: base_calendar
@@ -140,7 +137,7 @@ msgid "March"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
#, python-format
msgid "Warning !"
msgstr ""
@@ -179,8 +176,8 @@ msgid "Indicats whether the favor of a reply is requested"
msgstr ""
#. module: base_calendar
-#: field:calendar.alarm,alarm_id:0
-msgid "Basic Alarm"
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
msgstr ""
#. module: base_calendar
@@ -189,9 +186,8 @@ msgid "The users that the original request was delegated to"
msgstr ""
#. module: base_calendar
-#: view:calendar.attendee:0
-#: field:calendar.attendee,delegated_to:0
-msgid "Delegated To"
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
msgstr ""
#. module: base_calendar
@@ -213,11 +209,6 @@ msgstr ""
msgid "Tue"
msgstr ""
-#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_ir_attachment
-msgid "ir.attachment"
-msgstr ""
-
#. module: base_calendar
#: selection:base.calendar.set.exrule,freq:0
#: selection:calendar.event,rrule_type:0
@@ -225,6 +216,12 @@ msgstr ""
msgid "Yearly"
msgstr ""
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
#. module: base_calendar
#: selection:base.calendar.set.exrule,byday:0
#: selection:calendar.event,byday:0
@@ -257,9 +254,11 @@ msgid "Invitation Detail"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
-#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:0
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#: code:addons/base_calendar/base_calendar.py:1354
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
#, python-format
msgid "Error!"
msgstr ""
@@ -270,13 +269,8 @@ msgid "Chair Person"
msgstr ""
#. module: base_calendar
-#: view:calendar.event:0
-msgid "Exclude range"
-msgstr ""
-
-#. module: base_calendar
-#: view:calendar.event:0
-msgid "Select data for Custom Rule"
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
msgstr ""
#. module: base_calendar
@@ -287,8 +281,6 @@ msgstr ""
#. module: base_calendar
#: selection:calendar.alarm,trigger_interval:0
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
#: selection:res.alarm,trigger_interval:0
msgid "Minutes"
msgstr ""
@@ -314,9 +306,10 @@ msgid "Secondly"
msgstr ""
#. module: base_calendar
-#: selection:calendar.alarm,trigger_related:0
-#: selection:res.alarm,trigger_related:0
-msgid "The event ends"
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
msgstr ""
#. module: base_calendar
@@ -331,8 +324,12 @@ msgid "Provide external email address who will receive this invitation."
msgstr ""
#. module: base_calendar
-#: help:calendar.attendee,partner_id:0
-msgid "Partner related to contact"
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid "Full featured calendar system that supports:\n"
+" - Calendar of events\n"
+" - Alerts (create requests)\n"
+" - Recurring events\n"
+" - Invitations to people"
msgstr ""
#. module: base_calendar
@@ -357,12 +354,6 @@ msgstr ""
msgid "Optional Participation"
msgstr ""
-#. module: base_calendar
-#: help:calendar.event,interval:0
-#: help:calendar.todo,interval:0
-msgid "Repeat every x"
-msgstr ""
-
#. module: base_calendar
#: field:calendar.event,date_deadline:0
#: field:calendar.todo,date_deadline:0
@@ -370,14 +361,17 @@ msgid "Deadline"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
#, python-format
msgid "Warning!"
msgstr ""
#. module: base_calendar
-#: view:base.calendar.set.exrule:0
-msgid "_Cancel"
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgstr ""
#. module: base_calendar
@@ -394,13 +388,25 @@ msgid "Organizer"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
#: view:calendar.event:0
#: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
msgid "Event"
msgstr ""
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences of recurrent Meeting."
+msgstr ""
+
#. module: base_calendar
#: selection:calendar.alarm,trigger_occurs:0
#: selection:res.alarm,trigger_occurs:0
@@ -448,6 +454,11 @@ msgstr ""
msgid "Invite Type"
msgstr ""
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
#. module: base_calendar
#: view:res.alarm:0
msgid "Reminder details"
@@ -496,8 +507,9 @@ msgid "Run"
msgstr ""
#. module: base_calendar
-#: model:ir.model,name:base_calendar.model_calendar_alarm
-msgid "Event alarm information"
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
msgstr ""
#. module: base_calendar
@@ -514,9 +526,8 @@ msgid "Repeat Until"
msgstr ""
#. module: base_calendar
-#: selection:calendar.event,freq:0
-#: selection:calendar.todo,freq:0
-msgid "Seconds"
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid "Create specific calendar alarms that may be assigned to calendar events or meetings."
msgstr ""
#. module: base_calendar
@@ -535,6 +546,11 @@ msgstr ""
msgid "Caldav URL"
msgstr ""
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
#. module: base_calendar
#: field:calendar.event,recurrent_uid:0
#: field:calendar.todo,recurrent_uid:0
@@ -576,6 +592,11 @@ msgstr ""
msgid "Participation required"
msgstr ""
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
#. module: base_calendar
#: field:calendar.event,create_date:0
#: field:calendar.todo,create_date:0
@@ -596,7 +617,7 @@ msgid "Daily"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/base_calendar.py:385
#, python-format
msgid "Can not Duplicate"
msgstr ""
@@ -700,6 +721,12 @@ msgstr ""
msgid "Individual"
msgstr ""
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
#. module: base_calendar
#: field:calendar.alarm,user_id:0
msgid "Owner"
@@ -755,7 +782,8 @@ msgid "Group"
msgstr ""
#. module: base_calendar
-#: view:calendar.event:0
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
msgid "Edit All"
msgstr ""
@@ -777,7 +805,15 @@ msgid "Fri"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
#, python-format
msgid "Count can not be Negative"
msgstr ""
@@ -814,6 +850,11 @@ msgstr ""
msgid "Invitation From"
msgstr ""
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
#. module: base_calendar
#: view:calendar.event:0
#: field:calendar.event.edit.all,alarm_id:0
@@ -847,6 +888,8 @@ msgstr ""
#. module: base_calendar
#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
#: field:res.alarm,repeat:0
msgid "Repeat"
msgstr ""
@@ -885,10 +928,8 @@ msgid "June"
msgstr ""
#. module: base_calendar
-#: field:calendar.alarm,event_date:0
-#: field:calendar.attendee,event_date:0
-#: view:calendar.event:0
-msgid "Event Date"
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
msgstr ""
#. module: base_calendar
@@ -940,8 +981,6 @@ msgstr ""
#. module: base_calendar
#: field:base.calendar.set.exrule,count:0
-#: field:calendar.event,count:0
-#: field:calendar.todo,count:0
msgid "Count"
msgstr ""
@@ -1006,7 +1045,7 @@ msgid "Wednesday"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:0
+#: code:addons/base_calendar/base_calendar.py:1090
#, python-format
msgid "Interval can not be Negative"
msgstr ""
@@ -1026,8 +1065,8 @@ msgid "Active"
msgstr ""
#. module: base_calendar
-#: view:calendar.attendee:0
-msgid "Invitation"
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
msgstr ""
#. module: base_calendar
@@ -1057,8 +1096,9 @@ msgid "Participation role for the calendar user"
msgstr ""
#. module: base_calendar
-#: field:calendar.attendee,ref:0
-msgid "Event Ref"
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
msgstr ""
#. module: base_calendar
@@ -1071,6 +1111,11 @@ msgstr ""
msgid "Search Events"
msgstr ""
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
#. module: base_calendar
#: selection:base.calendar.set.exrule,freq:0
#: selection:calendar.event,rrule_type:0
@@ -1080,8 +1125,6 @@ msgstr ""
#. module: base_calendar
#: help:calendar.alarm,active:0
-#: help:calendar.event,active:0
-#: help:calendar.todo,active:0
#: help:res.alarm,active:0
msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgstr ""
@@ -1129,6 +1172,12 @@ msgstr ""
msgid "Done"
msgstr ""
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
#. module: base_calendar
#: view:base_calendar.invite.attendee:0
#: field:base_calendar.invite.attendee,user_ids:0
@@ -1137,7 +1186,6 @@ msgstr ""
#. module: base_calendar
#: view:base.calendar.set.exrule:0
-#: view:calendar.event:0
msgid "of"
msgstr ""
@@ -1160,11 +1208,6 @@ msgstr ""
msgid "Tuesday"
msgstr ""
-#. module: base_calendar
-#: selection:calendar.alarm,action:0
-msgid "Procedure"
-msgstr ""
-
#. module: base_calendar
#: help:calendar.alarm,description:0
msgid "Provides a more complete description of the calendar component, than that provided by the \"SUMMARY\" property"
@@ -1196,15 +1239,12 @@ msgid "Tentative"
msgstr ""
#. module: base_calendar
-#: view:calendar.attendee:0
-#: view:calendar.event:0
-#: field:calendar.event,user_id:0
-#: field:calendar.todo,user_id:0
-msgid "Responsible"
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
msgstr ""
#. module: base_calendar
-#: view:calendar.event:0
#: field:calendar.event,rrule_type:0
#: field:calendar.todo,rrule_type:0
msgid "Recurrency"
@@ -1223,12 +1263,6 @@ msgstr ""
msgid "Thursday"
msgstr ""
-#. module: base_calendar
-#: selection:calendar.event,rrule_type:0
-#: selection:calendar.todo,rrule_type:0
-msgid "Custom"
-msgstr ""
-
#. module: base_calendar
#: field:calendar.event,exrule:0
#: field:calendar.todo,exrule:0
@@ -1259,8 +1293,9 @@ msgid "Month"
msgstr ""
#. module: base_calendar
-#: selection:base_calendar.invite.attendee,type:0
-msgid "External Email"
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
msgstr ""
#. module: base_calendar
@@ -1319,12 +1354,6 @@ msgstr ""
msgid "ir.values"
msgstr ""
-#. module: base_calendar
-#: view:base_calendar.invite.attendee:0
-#: view:calendar.event:0
-msgid "Invite People"
-msgstr ""
-
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_ir_model
msgid "Objects"
@@ -1344,12 +1373,8 @@ msgid "Sat"
msgstr ""
#. module: base_calendar
-#: model:ir.module.module,description:base_calendar.module_meta_information
-msgid "Full featured calendar system that supports:\n"
-" - Calendar of events\n"
-" - Alerts (create requests)\n"
-" - Recurring events\n"
-" - Invitations to people"
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
msgstr ""
#. module: base_calendar
@@ -1392,9 +1417,8 @@ msgid "Name"
msgstr ""
#. module: base_calendar
-#: field:calendar.event,exdate:0
-#: field:calendar.todo,exdate:0
-msgid "Exception Date/Times"
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
msgstr ""
#. module: base_calendar
@@ -1411,7 +1435,7 @@ msgid "Alarm"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:0
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
#, python-format
msgid "Please Apply Recurrency before applying Exception Rule."
msgstr ""
@@ -1421,6 +1445,11 @@ msgstr ""
msgid "Sent By User"
msgstr ""
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Repeat interval"
+msgstr ""
+
#. module: base_calendar
#: selection:base.calendar.set.exrule,month_list:0
#: selection:calendar.event,month_list:0
@@ -1428,6 +1457,11 @@ msgstr ""
msgid "April"
msgstr ""
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
#. module: base_calendar
#: field:base.calendar.set.exrule,week_list:0
#: field:calendar.event,week_list:0
@@ -1548,8 +1582,8 @@ msgid "Duration"
msgstr ""
#. module: base_calendar
-#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
-msgid "Create specific calendar alarms that can be assigned to calendar events or meetings."
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
msgstr ""
#. module: base_calendar
diff --git a/addons/base_contact/i18n/base_contact.pot b/addons/base_contact/i18n/base_contact.pot
index 054498cbe45..b859c06339c 100644
--- a/addons/base_contact/i18n/base_contact.pot
+++ b/addons/base_contact/i18n/base_contact.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_crypt/i18n/base_crypt.pot b/addons/base_crypt/i18n/base_crypt.pot
old mode 100755
new mode 100644
index d62691cb699..60b8263732d
--- a/addons/base_crypt/i18n/base_crypt.pot
+++ b/addons/base_crypt/i18n/base_crypt.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-11-26 09:12:09+0000\n"
-"PO-Revision-Date: 2009-11-26 09:12:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,22 +16,49 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_crypt
-#: model:ir.module.module,description:base_crypt.module_meta_information
-msgid "Module for password encryption."
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
msgstr ""
#. module: base_crypt
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:134
+#, python-format
+msgid "Please specify the password !"
msgstr ""
#. module: base_crypt
#: model:ir.module.module,shortdesc:base_crypt.module_meta_information
-msgid "Base"
+msgid "Base - Password Encryption"
msgstr ""
#. module: base_crypt
-#: field:res.users,input_pw:0
-msgid "Password"
+#: code:addons/base_crypt/crypt.py:134
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: base_crypt
+#: model:ir.module.module,description:base_crypt.module_meta_information
+msgid "This module replaces the cleartext password in the database with a password hash,\n"
+"preventing anyone from reading the original password.\n"
+"For your existing user base, the removal of the cleartext passwords occurs the first time\n"
+"a user logs into the database, after installing base_crypt.\n"
+"After installing this module it won't be possible to recover a forgotten password for your\n"
+"users, the only solution is for an admin to set a new password.\n"
+"\n"
+"Note: installing this module does not mean you can ignore basic security measures,\n"
+"as the password is still transmitted unencrypted on the network (by the client),\n"
+"unless you are using a secure protocol such as XML-RPCS.\n"
+" "
msgstr ""
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index f63798c1745..a0b53f32715 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Create IBAN bank accounts"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:0
+#: code:addons/base_iban/base_iban.py:120
#, python-format
msgid "The IBAN does not seems to be correct. You should have entered something like this %s"
msgstr ""
@@ -51,21 +51,13 @@ 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"
msgstr ""
#. module: base_iban
-#: code:addons/base_iban/base_iban.py:0
+#: code:addons/base_iban/base_iban.py:121
#, python-format
msgid "The IBAN is invalid, It should begin with the country code"
msgstr ""
@@ -80,6 +72,14 @@ msgstr ""
msgid "IBAN Account"
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_acc_number_field
msgid "acc_number"
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 3a2ad652ffe..1f7c11bc02b 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
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_module_quality/i18n/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot
index 1ddd822cdc7..209c3b44e68 100644
--- a/addons/base_module_quality/i18n/base_module_quality.pot
+++ b/addons/base_module_quality/i18n/base_module_quality.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:48+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:48+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,20 +16,21 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
#, python-format
msgid "Suggestion"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/base_module_quality.py:0
+#: code:addons/base_module_quality/base_module_quality.py:100
#, python-format
msgid "Programming Error"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:31
#, python-format
msgid "Method Test"
msgstr ""
@@ -40,7 +41,7 @@ msgid "Base module quality - To check the quality of other modules"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:34
#, python-format
msgid "\n"
"Test checks for fields, views, security rules, dependancy level\n"
@@ -48,7 +49,7 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:127
#, python-format
msgid "O(n) or worst"
msgstr ""
@@ -59,54 +60,58 @@ msgid "Skipped"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:46
#, python-format
msgid "Module has no objects"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:49
#, python-format
msgid "Speed Test"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:54
#, python-format
msgid "The module does not contain the __openerp__.py file"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
-#: code:addons/base_module_quality/object_test/object_test.py:0
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:82
+#: code:addons/base_module_quality/object_test/object_test.py:187
+#: code:addons/base_module_quality/object_test/object_test.py:204
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
#, python-format
msgid "Object Name"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:54
+#: code:addons/base_module_quality/method_test/method_test.py:61
+#: code:addons/base_module_quality/method_test/method_test.py:68
#, python-format
msgid "Ok"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:34
#, python-format
msgid "This test checks if the module satisfies the current coding standard used by OpenERP."
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/wizard/quality_save_report.py:0
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
#, python-format
msgid "No report to save!"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
#, python-format
msgid "Result of dependancy in %"
msgstr ""
@@ -117,19 +122,19 @@ msgid "The test will be completed only if the module is installed or if the test
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
#, python-format
msgid "Result (/10)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:33
#, python-format
msgid "Terp Test"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:33
#, python-format
msgid "Object Test"
msgstr ""
@@ -140,38 +145,38 @@ msgid "Save Report"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/wizard/module_quality_check.py:0
+#: code:addons/base_module_quality/wizard/module_quality_check.py:46
#: model:ir.actions.wizard,name:base_module_quality.create_quality_check_id
#, python-format
msgid "Quality Check"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:128
#, python-format
msgid "Not Efficient"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/wizard/quality_save_report.py:0
+#: code:addons/base_module_quality/wizard/quality_save_report.py:46
#, python-format
msgid "Warning"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:35
#, python-format
msgid "Unit Test"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "Reading Complexity"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:267
#, python-format
msgid "Result of pep8_test in %"
msgstr ""
@@ -182,7 +187,7 @@ msgid "State"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:50
#, python-format
msgid "Module does not have 'unit_test/test.py' file"
msgstr ""
@@ -193,7 +198,7 @@ msgid "Ponderation"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
#, python-format
msgid "Result of Security in %"
msgstr ""
@@ -204,25 +209,25 @@ msgid "Some tests are more critical than others, so they have a bigger weight in
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:120
#, python-format
msgid "No enough data"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:132
#, python-format
msgid "Result (/1)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "N (Number of Records)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:133
#, python-format
msgid "No data"
msgstr ""
@@ -238,13 +243,13 @@ msgid "Save report"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:34
#, python-format
msgid "This test checks where object has workflow or not on it if there is a state field and several buttons on it and also checks validity of workflow xml file"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
#, python-format
msgid "Result in %"
msgstr ""
@@ -255,14 +260,14 @@ msgid "Standard entries"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:58
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:88
#, python-format
msgid "No python file found"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:144
#: view:module.quality.check:0
#: view:module.quality.detail:0
#, python-format
@@ -285,20 +290,20 @@ msgid "Note"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:85
#, python-format
msgid "O(1) means that the number of SQL requests to read the object does not depand on the number of objects we are reading. This feature is mostly wished.\n"
""
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:120
#, python-format
msgid "__openerp__.py file"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
#, python-format
msgid "Status"
msgstr ""
@@ -310,7 +315,7 @@ msgid "Tests"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:50
#, python-format
msgid "\n"
"This test checks the speed of the module. Note that at least 5 demo data is needed in order to run it.\n"
@@ -319,13 +324,13 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:71
#, python-format
msgid "Unable to parse the result. Check the details."
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:33
#, python-format
msgid "\n"
"This test checks if the module satisfy tiny structure\n"
@@ -333,50 +338,53 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:151
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
#, python-format
msgid "Module Name"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:56
#, python-format
msgid "Error! Module is not properly loaded/installed"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:115
+#: code:addons/base_module_quality/speed_test/speed_test.py:116
#, python-format
msgid "Error in Read method"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:138
#, python-format
msgid "Score is below than minimal score(%s%%)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "N/2"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:57
+#: code:addons/base_module_quality/method_test/method_test.py:64
+#: code:addons/base_module_quality/method_test/method_test.py:71
#, python-format
msgid "Exception"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/base_module_quality.py:0
+#: code:addons/base_module_quality/base_module_quality.py:100
#, python-format
msgid "Test Is Not Implemented"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "N"
msgstr ""
@@ -387,32 +395,32 @@ msgid "Report Save"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
#, python-format
msgid "Feedback about structure of module"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:73
#, python-format
msgid "Given module has no objects.Speed test can work only when new objects are created in the module along with demo data"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:32
#, python-format
msgid "This test uses Pylint and checks if the module satisfies the coding standard of Python. See http://www.logilab.org/project/name/pylint for further info.\n"
" "
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:143
#, python-format
msgid "Feed back About Workflow of Module"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:129
#, python-format
msgid "No Workflow define"
msgstr ""
@@ -428,7 +436,7 @@ msgid "Cancel"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:32
#, python-format
msgid "\n"
"PEP-8 Test , copyright of py files check, method can not call from loops\n"
@@ -441,13 +449,13 @@ msgid "Final Score (%)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:61
#, python-format
msgid "Error. Is pylint correctly installed? (http://pypi.python.org/pypi/pylint)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:125
#, python-format
msgid "Efficient"
msgstr ""
@@ -458,13 +466,13 @@ msgid "Rated Module"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:33
#, python-format
msgid "Workflow Test"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:36
#, python-format
msgid "\n"
"This test checks the Unit Test(PyUnit) Cases of the module. Note that 'unit_test/test.py' is needed in module.\n"
@@ -473,7 +481,7 @@ msgid "\n"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/method_test/method_test.py:0
+#: code:addons/base_module_quality/method_test/method_test.py:32
#, python-format
msgid "\n"
"This test checks if the module classes are raising exception when calling basic methods or not.\n"
@@ -486,43 +494,43 @@ msgid "Details"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:119
#, python-format
msgid "Warning! Not enough demo data"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:31
#, python-format
msgid "Pylint Test"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:31
#, python-format
msgid "PEP-8 Test"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:187
#, python-format
msgid "Field name"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:151
#, python-format
msgid "1"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:132
#, python-format
msgid "Warning! Object has no demo data"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
#, python-format
msgid "Tag Name"
msgstr ""
@@ -560,8 +568,8 @@ msgid "Name"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
-#: code:addons/base_module_quality/workflow_test/workflow_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
+#: code:addons/base_module_quality/workflow_test/workflow_test.py:136
#, python-format
msgid "Result of views in %"
msgstr ""
@@ -577,25 +585,25 @@ msgid "Save report as .html format"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/base_module_quality.py:0
+#: code:addons/base_module_quality/base_module_quality.py:269
#, python-format
msgid "The module has to be installed before running this test."
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/speed_test/speed_test.py:0
+#: code:addons/base_module_quality/speed_test/speed_test.py:123
#, python-format
msgid "O(1)"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/object_test/object_test.py:0
+#: code:addons/base_module_quality/object_test/object_test.py:177
#, python-format
msgid "Result of fields in %"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/unit_test/unit_test.py:0
+#: code:addons/base_module_quality/unit_test/unit_test.py:70
#: view:module.quality.detail:0
#: field:module.quality.detail,summary:0
#, python-format
@@ -603,20 +611,20 @@ msgid "Summary"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pylint_test/pylint_test.py:0
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/pylint_test/pylint_test.py:99
+#: code:addons/base_module_quality/structure_test/structure_test.py:172
#, python-format
msgid "File Name"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/pep8_test/pep8_test.py:0
+#: code:addons/base_module_quality/pep8_test/pep8_test.py:274
#, python-format
msgid "Line number"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/structure_test/structure_test.py:0
+#: code:addons/base_module_quality/structure_test/structure_test.py:32
#, python-format
msgid "Structure Test"
msgstr ""
@@ -627,7 +635,7 @@ msgid "Quality"
msgstr ""
#. module: base_module_quality
-#: code:addons/base_module_quality/terp_test/terp_test.py:0
+#: code:addons/base_module_quality/terp_test/terp_test.py:140
#, python-format
msgid "Feed back About terp file of Module"
msgstr ""
diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot
index 364cefca5ab..c2c33c6be93 100644
--- a/addons/base_module_record/i18n/base_module_record.pot
+++ b/addons/base_module_record/i18n/base_module_record.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -202,7 +202,7 @@ msgid "Export Customizations As Data File"
msgstr ""
#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:0
+#: code:addons/base_module_record/wizard/base_module_save.py:129
#, python-format
msgid "Error"
msgstr ""
diff --git a/addons/base_report_creator/i18n/base_report_creator.pot b/addons/base_report_creator/i18n/base_report_creator.pot
index c51b850f21c..903773f74f4 100644
--- a/addons/base_report_creator/i18n/base_report_creator.pot
+++ b/addons/base_report_creator/i18n/base_report_creator.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgid "Graph Mode"
msgstr ""
#. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:0
+#: code:addons/base_report_creator/base_report_creator.py:321
#, python-format
msgid "These is/are model(s) (%s) in selection which is/are not related to any other model"
msgstr ""
@@ -116,7 +116,7 @@ msgid "Custom Reports"
msgstr ""
#. module: base_report_creator
-#: code:addons/base_report_creator/base_report_creator.py:0
+#: code:addons/base_report_creator/base_report_creator.py:321
#, python-format
msgid "No Related Models!!"
msgstr ""
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
index 8caa4b3ec9e..950ea864077 100644
--- a/addons/base_report_designer/i18n/base_report_designer.pot
+++ b/addons/base_report_designer/i18n/base_report_designer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index fe053c831df..de0ad85ba99 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -86,7 +86,7 @@ msgid "Helps you handle your accounting needs, if you are not an accountant, we
msgstr ""
#. module: base_setup
-#: code:addons/base_setup/__init__.py:0
+#: code:addons/base_setup/__init__.py:50
#, python-format
msgid "The following users have been installed : \n"
""
diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot
index 39cd7a700e6..748f2eb8c9b 100644
--- a/addons/base_synchro/i18n/base_synchro.pot
+++ b/addons/base_synchro/i18n/base_synchro.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot
index f6e7b0230d3..923e474412d 100644
--- a/addons/base_tools/i18n/base_tools.pot
+++ b/addons/base_tools/i18n/base_tools.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 74687ff0de1..71b0c9d3c10 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:51+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:51+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_vat
-#: code:addons/base_vat/base_vat.py:0
+#: code:addons/base_vat/base_vat.py:87
#, python-format
msgid "The Vat does not seems to be correct. You should have entered something like this %s"
msgstr ""
@@ -42,7 +42,7 @@ msgid "Error ! You can not create recursive associated members."
msgstr ""
#. module: base_vat
-#: code:addons/base_vat/base_vat.py:0
+#: code:addons/base_vat/base_vat.py:88
#, python-format
msgid "The VAT is invalid, It should begin with the country code"
msgstr ""
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index f5555892a60..347e9d22436 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:20+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@ msgid "Latest Connections"
msgstr ""
#. module: board
-#: code:addons/board/wizard/board_menu_create.py:0
+#: code:addons/board/wizard/board_menu_create.py:45
#, python-format
msgid "User Error!"
msgstr ""
@@ -377,7 +377,7 @@ msgid "Dashboard View"
msgstr ""
#. module: board
-#: code:addons/board/wizard/board_menu_create.py:0
+#: code:addons/board/wizard/board_menu_create.py:46
#, python-format
msgid "Please Insert Dashboard View(s) !"
msgstr ""
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
index 4ee66ba785a..76186a5f033 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgid "Ok"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:861
#, python-format
msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
msgstr ""
@@ -91,14 +91,15 @@ msgid "File name"
msgstr ""
#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
#, python-format
msgid "Error!"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#: code:addons/caldav/wizard/calendar_event_import.py:0
+#: code:addons/caldav/calendar.py:772
+#: code:addons/caldav/calendar.py:861
+#: code:addons/caldav/wizard/calendar_event_import.py:63
#, python-format
msgid "Warning !"
msgstr ""
@@ -114,7 +115,7 @@ msgid "Use the field"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:772
#, python-format
msgid "Can not create line \"%s\" more than once"
msgstr ""
@@ -173,18 +174,13 @@ msgstr ""
msgid "Type"
msgstr ""
-#. module: caldav
-#: field:basic.calendar,description:0
-msgid "description"
-msgstr ""
-
#. module: caldav
#: help:calendar.event.export,name:0
msgid "Save in .ics format"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:1275
#, python-format
msgid "Error !"
msgstr ""
@@ -256,13 +252,12 @@ msgid "Calendar"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
-#, python-format
-msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
+#: view:basic.calendar:0
+msgid "Todo"
msgstr ""
#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:0
+#: code:addons/caldav/wizard/calendar_event_import.py:63
#, python-format
msgid "Invalid format of the ics, file can not be imported"
msgstr ""
@@ -296,7 +291,7 @@ msgid "Calendar Collections"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:798
#: sql_constraint:basic.calendar.alias:0
#, python-format
msgid "The same filename cannot apply to two records!"
@@ -320,13 +315,18 @@ msgstr ""
msgid "Collection"
msgstr ""
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Write Date"
+msgstr ""
+
#. module: caldav
#: sql_constraint:document.directory:0
msgid "The directory name must be unique !"
msgstr ""
#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
#, python-format
msgid "Please provide Proper URL !"
msgstr ""
@@ -389,6 +389,7 @@ msgstr ""
#. module: caldav
#: view:basic.calendar:0
+#: field:basic.calendar,description:0
msgid "Description"
msgstr ""
@@ -403,13 +404,14 @@ msgid "Mapping"
msgstr ""
#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
+#: code:addons/caldav/wizard/calendar_event_import.py:86
+#, python-format
+msgid "Import Sucessful"
msgstr ""
#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Modifided Date"
+#: view:calendar.event.import:0
+msgid "_Import"
msgstr ""
#. module: caldav
@@ -451,7 +453,7 @@ msgid "basic.calendar.alarm"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:1275
#, python-format
msgid "Attendee must have an Email Id"
msgstr ""
@@ -462,7 +464,7 @@ msgid "Export .ics File"
msgstr ""
#. module: caldav
-#: code:addons/caldav/calendar.py:0
+#: code:addons/caldav/calendar.py:41
#, python-format
msgid "vobject Import Error!"
msgstr ""
@@ -493,8 +495,9 @@ msgid "Color"
msgstr ""
#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
+#: code:addons/caldav/calendar.py:41
+#, python-format
+msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
msgstr ""
#. module: caldav
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index 833d0530e69..9fad6a894ab 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index a3e29f91cfc..c2c03b740ea 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,6 @@ msgid "# Leads"
msgstr ""
#. module: crm
-#: selection:crm.case.stage,type:0
#: view:crm.lead:0
#: selection:crm.lead,type:0
#: selection:crm.lead.report,type:0
@@ -81,6 +80,7 @@ msgid "Select Opportunities"
msgstr ""
#. module: crm
+#: view:crm.meeting:0
#: view:crm.phonecall2opportunity:0
#: view:crm.phonecall2phonecall:0
#: view:crm.send.mail:0
@@ -99,7 +99,7 @@ msgid "Previous Stage"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:0
+#: code:addons/crm/wizard/crm_add_note.py:26
#, python-format
msgid "Can not add note!"
msgstr ""
@@ -123,13 +123,13 @@ msgid "The code of the sales team must be unique !"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:93
#, python-format
msgid "Lead '%s' has been converted to an opportunity."
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:228
#, python-format
msgid "The lead '%s' has been closed."
msgstr ""
@@ -140,9 +140,10 @@ msgid "No Repeat"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#: code:addons/crm/wizard/crm_lead_to_partner.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#: code:addons/crm/wizard/crm_lead_to_partner.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:52
#, python-format
msgid "Warning !"
msgstr ""
@@ -178,22 +179,24 @@ msgid "Search Opportunities"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
#, python-format
msgid "Opportunity must have Partner assigned before merging with other Opportunity."
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:46
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
#, python-format
msgid "Warning!"
msgstr ""
#. module: crm
-#: view:crm.lead.report:0
-#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
-#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
-msgid "Opportunities Analysis"
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
+#, python-format
+msgid "Can not send mail!"
msgstr ""
#. module: crm
@@ -227,15 +230,22 @@ msgstr ""
#: view:crm.phonecall:0
#: view:crm.phonecall2phonecall:0
#: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
+#: view:res.partner:0
msgid "Schedule Other Call"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:0
+#: help:crm.meeting,edit_all:0
+msgid "Edit all Occurrences of recurrent Meeting."
+msgstr ""
+
+#. module: crm
+#: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:134
+#: code:addons/crm/wizard/crm_phonecall_to_phonecall.py:89
#: model:crm.case.categ,name:crm.categ_meet3
#: view:crm.phonecall:0
#: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
+#: view:res.partner:0
#, python-format
msgid "Phone Call"
msgstr ""
@@ -246,7 +256,7 @@ msgid "Opt-Out"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_opportunity.py:108
#, python-format
msgid "The opportunity '%s' has been marked as lost."
msgstr ""
@@ -304,11 +314,6 @@ msgstr ""
msgid "Campaigns"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
-msgid "Create specific phone call categories to better sort the type of calls tracked in the system."
-msgstr ""
-
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_lead_categ_action
#: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
@@ -366,7 +371,7 @@ msgid "Regular Expression on Case History"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:209
#, python-format
msgid "The lead '%s' has been opened."
msgstr ""
@@ -388,7 +393,6 @@ msgid "When a real project/opportunity is detected"
msgstr ""
#. module: crm
-#: selection:crm.case.stage,type:0
#: field:crm.installer,crm_fundraising:0
msgid "Fundraising"
msgstr ""
@@ -419,6 +423,11 @@ msgstr ""
msgid "Set State To"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
+msgid "Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team."
+msgstr ""
+
#. module: crm
#: model:ir.model,name:crm.model_crm_lead2opportunity_action
msgid "Convert/Merge Opportunity"
@@ -429,11 +438,6 @@ msgstr ""
msgid "Update Date"
msgstr ""
-#. module: crm
-#: help:crm.meeting,count:0
-msgid "Repeat max that times"
-msgstr ""
-
#. module: crm
#: view:crm.lead2opportunity.action:0
#: field:crm.lead2opportunity.action,name:0
@@ -504,8 +508,10 @@ msgid "Very first contact with new prospect"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/crm_lead.py:278
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:195
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:229
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:297
#: view:crm.lead2opportunity:0
#: view:crm.partner2opportunity:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity
@@ -521,7 +527,7 @@ msgid "Configure"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:378
#: view:crm.lead:0
#: view:res.partner:0
#, python-format
@@ -566,11 +572,6 @@ msgstr ""
msgid "crm.send.mail.attachment"
msgstr ""
-#. module: crm
-#: field:crm.meeting,count:0
-msgid "Count"
-msgstr ""
-
#. module: crm
#: selection:crm.lead.report,month:0
#: selection:crm.meeting,month_list:0
@@ -621,11 +622,6 @@ msgstr ""
msgid "Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."
msgstr ""
-#. module: crm
-#: selection:crm.case.stage,type:0
-msgid "Claim"
-msgstr ""
-
#. module: crm
#: constraint:base.action.rule:0
msgid "Error: The mail is not well formated"
@@ -657,7 +653,7 @@ msgid "The channels represent the different communication
msgstr ""
#. module: crm
-#: code:addons/crm/crm_meeting.py:0
+#: code:addons/crm/crm_meeting.py:93
#, python-format
msgid "The meeting '%s' has been confirmed."
msgstr ""
@@ -668,7 +664,7 @@ msgid "Responsible User"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_partner.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_partner.py:53
#, python-format
msgid "A partner is already defined on this phonecall."
msgstr ""
@@ -698,11 +694,6 @@ msgstr ""
msgid "Partner Segmentation Lines"
msgstr ""
-#. module: crm
-#: help:crm.meeting,active:0
-msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
-msgstr ""
-
#. module: crm
#: view:crm.lead:0
#: view:crm.meeting:0
@@ -763,10 +754,10 @@ msgid "Statistics Dashboard"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#: code:addons/crm/wizard/crm_partner_to_opportunity.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
-#: selection:crm.case.stage,type:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:86
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:96
+#: code:addons/crm/wizard/crm_partner_to_opportunity.py:101
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:117
#: view:crm.lead:0
#: selection:crm.lead,type:0
#: selection:crm.lead.report,type:0
@@ -798,8 +789,10 @@ msgid "Search Phonecalls"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
-msgid "Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their leads and sales opportunities. It will allow them to easily track how is positioned a specific lead or opportunity in the sales cycle."
+#: view:crm.lead2opportunity.partner:0
+#: view:crm.lead2partner:0
+#: view:crm.phonecall2partner:0
+msgid "Continue"
msgstr ""
#. module: crm
@@ -834,7 +827,7 @@ msgid "Exclusive"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
+#: code:addons/crm/crm_opportunity.py:91
#, python-format
msgid "The opportunity '%s' has been won."
msgstr ""
@@ -964,7 +957,7 @@ msgid "March"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:230
#, python-format
msgid "The opportunity '%s' has been closed."
msgstr ""
@@ -980,7 +973,7 @@ msgid "Show time as"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:264
#: view:crm.phonecall2partner:0
#, python-format
msgid "Create Partner"
@@ -998,7 +991,7 @@ msgid "Mobile"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:53
#, python-format
msgid "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
msgstr ""
@@ -1024,9 +1017,10 @@ msgid "Opt-In"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
-#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:0
+#: code:addons/crm/crm_opportunity.py:208
+#: code:addons/crm/crm_phonecall.py:184
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:55
+#: code:addons/crm/wizard/crm_phonecall_to_meeting.py:137
#: view:crm.meeting:0
#: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_meeting_new
#: model:ir.actions.act_window,name:crm.crm_case_categ_meet
@@ -1039,9 +1033,16 @@ msgid "Meetings"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
-#, python-format
-msgid "Closed/Cancelled Leads Could not convert into Opportunity"
+#: view:crm.meeting:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead,date_action_next:0
+#: field:crm.lead,title_action:0
+#: field:crm.meeting,date_action_next:0
+#: field:crm.phonecall,date_action_next:0
+msgid "Next Action"
msgstr ""
#. module: crm
@@ -1055,18 +1056,12 @@ msgid "Deadline"
msgstr ""
#. module: crm
-#: view:crm.add.note:0
-#: view:crm.merge.opportunity:0
-#: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2phonecall:0
-#: view:crm.send.mail:0
-msgid "_Cancel"
+#: help:crm.meeting,active:0
+msgid "If the active field is set to true, it will allow you to hide the event alarm information without removing it."
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
#, python-format
msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
msgstr ""
@@ -1076,6 +1071,15 @@ msgstr ""
msgid "Partner Segmentations"
msgstr ""
+#. module: crm
+#: view:crm.meeting:0
+#: field:crm.meeting,user_id:0
+#: view:crm.phonecall:0
+#: field:crm.phonecall,user_id:0
+#: view:res.partner:0
+msgid "Responsible"
+msgstr ""
+
#. module: crm
#: view:res.partner:0
msgid "Previous"
@@ -1087,13 +1091,9 @@ msgid "Statistics"
msgstr ""
#. module: crm
-#: field:crm.meeting,attendee_ids:0
-msgid "Attendees"
-msgstr ""
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid "'Leads' allows you to manage and keep track of all first potential interests of a partner in one of your products or services. A lead is a first, unqualified, contact with a prospect or customer. After being qualified, a lead can be converted into a business opportunity with the creation of the related partner for further detailed tracking of any linked activities. You can use leads when you import a database of prospects or to integrate your website's contact form with OpenERP."
+#: view:crm.meeting:0
+#: field:crm.send.mail,email_from:0
+msgid "From"
msgstr ""
#. module: crm
@@ -1136,6 +1136,7 @@ msgstr ""
#: view:crm.meeting:0
#: view:crm.phonecall:0
#: view:crm.phonecall.report:0
+#: view:res.partner:0
msgid "Type"
msgstr ""
@@ -1176,11 +1177,6 @@ msgstr ""
msgid "Creation Date"
msgstr ""
-#. module: crm
-#: help:crm.meeting,interval:0
-msgid "Repeat every x"
-msgstr ""
-
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor5
msgid "Need a Website Design"
@@ -1205,7 +1201,7 @@ msgid "Tue"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:300
#: view:crm.case.stage:0
#: view:crm.lead:0
#: field:crm.lead,stage_id:0
@@ -1235,6 +1231,11 @@ msgstr ""
msgid "Mark as"
msgstr ""
+#. module: crm
+#: field:crm.meeting,count:0
+msgid "Repeat"
+msgstr ""
+
#. module: crm
#: help:crm.meeting,rrule_type:0
msgid "Let the event automatically repeat at that interval"
@@ -1265,6 +1266,11 @@ msgstr ""
msgid "Expected Revenue"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
+msgid "Create specific phone call categories to better define the type of calls tracked in the system."
+msgstr ""
+
#. module: crm
#: selection:crm.lead.report,month:0
#: selection:crm.meeting,month_list:0
@@ -1294,13 +1300,6 @@ msgstr ""
msgid "Duration in Minutes"
msgstr ""
-#. module: crm
-#: view:crm.lead2opportunity.partner:0
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
#. module: crm
#: help:crm.installer,crm_helpdesk:0
msgid "Manages a Helpdesk service."
@@ -1323,7 +1322,7 @@ msgid " Year "
msgstr ""
#. module: crm
-#: view:crm.meeting:0
+#: field:crm.meeting,edit_all:0
msgid "Edit All"
msgstr ""
@@ -1332,11 +1331,21 @@ msgstr ""
msgid "Fri"
msgstr ""
+#. module: crm
+#: model:ir.model,name:crm.model_crm_lead
+msgid "crm.lead"
+msgstr ""
+
#. module: crm
#: field:crm.meeting,write_date:0
msgid "Write Date"
msgstr ""
+#. module: crm
+#: view:crm.meeting:0
+msgid "End of recurrency"
+msgstr ""
+
#. module: crm
#: view:crm.meeting:0
msgid "Reminder"
@@ -1354,6 +1363,7 @@ msgstr ""
#: view:crm.phonecall2partner:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
+#: view:res.partner:0
msgid "Create a Partner"
msgstr ""
@@ -1430,6 +1440,11 @@ msgstr ""
msgid "Interval"
msgstr ""
+#. module: crm
+#: view:crm.meeting:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
#. module: crm
#: view:crm.segmentation:0
msgid "Segmentation Description"
@@ -1441,6 +1456,11 @@ msgstr ""
msgid "History"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
+msgid "Create specific partner categories which you can assign to your partners to better manage your interactions with them. The segmentation tool is able to assign categories to partners according to criteria you set."
+msgstr ""
+
#. module: crm
#: field:crm.case.section,code:0
msgid "Code"
@@ -1480,13 +1500,12 @@ msgid "References"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:392
#: view:crm.lead:0
#: view:crm.lead2opportunity:0
#: view:crm.lead2opportunity.action:0
#: view:crm.lead2opportunity.partner:0
#: view:crm.lead2partner:0
-#: view:crm.meeting:0
#: view:crm.phonecall:0
#: view:crm.phonecall2partner:0
#: view:res.partner:0
@@ -1504,11 +1523,6 @@ msgstr ""
msgid "Merge two Opportunities"
msgstr ""
-#. module: crm
-#: selection:crm.meeting,rrule_type:0
-msgid "Custom"
-msgstr ""
-
#. module: crm
#: view:crm.lead:0
#: view:crm.meeting:0
@@ -1552,7 +1566,7 @@ msgid "Sale Amount"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:0
+#: code:addons/crm/wizard/crm_send_email.py:141
#, python-format
msgid "Unable to send mail. Please check SMTP is configured properly."
msgstr ""
@@ -1562,6 +1576,11 @@ msgstr ""
msgid "="
msgstr ""
+#. module: crm
+#: view:crm.lead:0
+msgid "Search Leads"
+msgstr ""
+
#. module: crm
#: selection:crm.meeting,state:0
msgid "Unconfirmed"
@@ -1581,17 +1600,17 @@ msgstr ""
msgid "Name"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
-msgid "The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form for the traceability of every contact you get with a partner. From the call record, you can trigger a request for another call, a meeting or a business opportunity."
-msgstr ""
-
#. module: crm
#: field:crm.meeting,alarm_id:0
#: field:crm.meeting,base_calendar_alarm_id:0
msgid "Alarm"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
+msgid "Add specific stages to leads and opportunities allowing your sales to better organise their sales pipeline. Stages will allow them to easily track how a specific lead or opportunity is positioned in the sales cycle."
+msgstr ""
+
#. module: crm
#: view:crm.lead.report:0
#: view:crm.phonecall.report:0
@@ -1632,11 +1651,6 @@ msgstr ""
msgid "High"
msgstr ""
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Seconds"
-msgstr ""
-
#. module: crm
#: model:process.node,note:crm.process_node_partner0
msgid "Convert to prospect to business partner"
@@ -1647,6 +1661,11 @@ msgstr ""
msgid "_Convert"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_view_attendee_form
+msgid "With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer."
+msgstr ""
+
#. module: crm
#: selection:crm.meeting,week_list:0
msgid "Saturday"
@@ -1727,7 +1746,7 @@ msgid "Zip"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:213
#, python-format
msgid "The case '%s' has been opened."
msgstr ""
@@ -1783,6 +1802,16 @@ msgstr ""
msgid "Highest"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
+msgid "The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
#. module: crm
#: view:crm.case.section:0
#: view:crm.lead:0
@@ -1827,11 +1856,6 @@ msgstr ""
msgid "Reply-To"
msgstr ""
-#. module: crm
-#: selection:crm.meeting,freq:0
-msgid "Minutes"
-msgstr ""
-
#. module: crm
#: view:crm.case.section:0
msgid "Select stages for this Sales Team"
@@ -1842,6 +1866,11 @@ msgstr ""
msgid "Opportunities by Stage"
msgstr ""
+#. module: crm
+#: view:crm.meeting:0
+msgid "Recurrency Option"
+msgstr ""
+
#. module: crm
#: model:process.transition,note:crm.process_transition_leadpartner0
msgid "Prospect is converting to business partner"
@@ -1864,6 +1893,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
#: view:crm.phonecall:0
+#: view:res.partner:0
msgid "Reset to Draft"
msgstr ""
@@ -1905,7 +1935,7 @@ msgid "Create"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:492
#, python-format
msgid "Send"
msgstr ""
@@ -1952,7 +1982,7 @@ msgid "Schedule a normal or phone meeting"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:375
#, python-format
msgid "Error !"
msgstr ""
@@ -2006,6 +2036,16 @@ msgstr ""
msgid "July"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_section_act
+msgid "Define a Sales Team to organize your different salesmen or sales departments into separate teams. Each team will work in its own list of opportunities, sales orders, etc. Each user can set a default team in his user preferences. The opportunities and sales order displayed, will automatically be filtered according to his team."
+msgstr ""
+
+#. module: crm
+#: help:crm.meeting,count:0
+msgid "Repeat x times"
+msgstr ""
+
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_section_act
#: model:ir.model,name:crm.model_crm_case_section
@@ -2064,6 +2104,11 @@ msgstr ""
msgid "Leads"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid "Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect."
+msgstr ""
+
#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.lead2partner,action:0
@@ -2104,7 +2149,7 @@ msgid "Reset to Unconfirmed"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:0
+#: code:addons/crm/wizard/crm_add_note.py:40
#: view:crm.add.note:0
#, python-format
msgid "Note"
@@ -2148,12 +2193,7 @@ msgid "Internal Meeting"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
-msgid "Create specific categories that fit your company's activities in order to better classify and analyse them after they have been maintained in your leads and opportunities. You can use categories to reflect your product structure or the different types of sales you do."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:411
#: selection:crm.add.note,state:0
#: view:crm.lead:0
#: selection:crm.lead,state:0
@@ -2172,11 +2212,6 @@ msgstr ""
msgid "Customer Meeting"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_section_act
-msgid "Sales team allows you to organize your different salesmen or departments into separate teams. Each team will work in his own list of opportunities, sales orders, eso. Each user can set a team by default in his preferences. The opportunities and sales order he will see, will be automatically filtered according to his team."
-msgstr ""
-
#. module: crm
#: view:crm.lead:0
#: field:crm.lead,email_cc:0
@@ -2213,7 +2248,7 @@ msgid "Active"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:306
#, python-format
msgid "The stage of opportunity '%s' has been changed to '%s'."
msgstr ""
@@ -2259,18 +2294,6 @@ msgstr ""
msgid "This may help associations in their fundraising process and tracking."
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid "Opportunities allows you to manage and keep track of your sales pipeline by creating specific customer or prospect related sales documents in order to follow up potential sales. Information such as the expected revenue, opportunity stage, expected closing date, communication history and so on can be maintained in them. Opportunities can be connected with the email gateway: new emails create opportunities, each of them automatically gets the history of the conversation with the customer.\n"
-"\n"
-"You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more."
-msgstr ""
-
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
-msgid "Outbound Calls lists all the calls to be performed by your sales team. They can record the information about the call on the form view. These information will appear on the partner form for the traceability of every contact you get with a customer. You can import a .CSV file with a list of calls to be done for your sales team."
-msgstr ""
-
#. module: crm
#: field:crm.lead2opportunity.partner,action:0
#: field:crm.lead2partner,action:0
@@ -2301,9 +2324,10 @@ msgid "Weekly"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:0
-#, python-format
-msgid "Can not send mail!"
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
+#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
+msgid "Opportunities Analysis"
msgstr ""
#. module: crm
@@ -2311,11 +2335,6 @@ msgstr ""
msgid "Misc"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
-msgid "Create specific partner categories that you will then be able to assign to your partners to better manage your interactions with them. The segmentation tool will assign categories to partners based on defined criteria."
-msgstr ""
-
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor8
#: view:crm.meeting:0
@@ -2329,6 +2348,11 @@ msgstr ""
msgid "Done"
msgstr ""
+#. module: crm
+#: help:crm.meeting,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
#. module: crm
#: field:crm.segmentation,som_interval_max:0
msgid "Max Interval"
@@ -2340,7 +2364,7 @@ msgid "_Schedule Call"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:326
#: selection:crm.add.note,state:0
#: view:crm.lead:0
#: selection:crm.lead,state:0
@@ -2375,16 +2399,12 @@ msgid "Helpdesk"
msgstr ""
#. module: crm
-#: view:crm.meeting:0
-#: field:crm.meeting,user_id:0
-#: view:crm.phonecall:0
-#: field:crm.phonecall,user_id:0
-#: view:res.partner:0
-msgid "Responsible"
+#: field:crm.meeting,recurrency:0
+msgid "Recurrent"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:397
#, python-format
msgid "The case '%s' has been cancelled."
msgstr ""
@@ -2439,7 +2459,7 @@ msgid "Meeting Type"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:312
#, python-format
msgid "Merge with Existing Opportunity"
msgstr ""
@@ -2474,11 +2494,6 @@ msgstr ""
msgid "My Win/Lost Ratio for the Last Year"
msgstr ""
-#. module: crm
-#: view:crm.meeting:0
-msgid "Custom Recurrency Rule"
-msgstr ""
-
#. module: crm
#: field:crm.installer,thunderbird:0
msgid "Thunderbird"
@@ -2490,8 +2505,8 @@ msgid "# of Emails"
msgstr ""
#. module: crm
-#: view:crm.lead:0
-msgid "Search Leads"
+#: view:crm.meeting:0
+msgid "Repeat interval"
msgstr ""
#. module: crm
@@ -2502,8 +2517,8 @@ msgid "Delay to open"
msgstr ""
#. module: crm
-#: model:ir.model,name:crm.model_crm_lead
-msgid "crm.lead"
+#: view:crm.meeting:0
+msgid "Recurrency period"
msgstr ""
#. module: crm
@@ -2572,12 +2587,6 @@ msgstr ""
msgid "Duration"
msgstr ""
-#. module: crm
-#: field:crm.opportunity2phonecall,name:0
-#: field:crm.phonecall2phonecall,name:0
-msgid "Call summary"
-msgstr ""
-
#. module: crm
#: field:crm.send.mail,reply_to:0
msgid "Reply To"
@@ -2591,7 +2600,7 @@ msgid "Sales Dashboard"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:0
+#: code:addons/crm/wizard/crm_lead_to_partner.py:56
#, python-format
msgid "A partner is already defined on this lead."
msgstr ""
@@ -2636,6 +2645,13 @@ msgstr ""
msgid "Fax"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid "With opportunities you can manage and keep track of your sales pipeline by creating specific customer- or prospect-related sales documents to follow up potential sales. Information such as expected revenue, opportunity stage, expected closing date, communication history and much more can be stored. Opportunities can be connected to the email gateway: new emails may create opportunities, each of them automatically gets the history of the conversation with the customer.\n"
+"\n"
+"You and your team(s) will be able to plan meetings and phone calls from opportunities, convert them into quotations, manage related documents, track all customer related activities, and much more."
+msgstr ""
+
#. module: crm
#: view:crm.meeting:0
msgid "Assignment"
@@ -2694,7 +2710,7 @@ msgid "Add Internal Note"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:304
#, python-format
msgid "The stage of lead '%s' has been changed to '%s'."
msgstr ""
@@ -2717,16 +2733,18 @@ msgid "Change Probability on next and previous stages."
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_action_rule.py:0
-#: code:addons/crm/wizard/crm_send_email.py:0
+#: code:addons/crm/crm.py:455
+#: code:addons/crm/crm.py:457
+#: code:addons/crm/crm_action_rule.py:66
+#: code:addons/crm/wizard/crm_send_email.py:141
#, python-format
msgid "Error!"
msgstr ""
#. module: crm
-#: view:crm.meeting:0
-msgid "Exclude range"
+#: field:crm.opportunity2phonecall,name:0
+#: field:crm.phonecall2phonecall,name:0
+msgid "Call summary"
msgstr ""
#. module: crm
@@ -2746,11 +2764,6 @@ msgstr ""
msgid "Note Body"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.action_view_attendee_form
-msgid "'Meeting Invitations' allows you to create and manage the meeting invitations sent/to be sent to your colleagues/partners."
-msgstr ""
-
#. module: crm
#: view:board.board:0
msgid "My Planned Revenues by Stage"
@@ -2774,8 +2787,8 @@ msgid "Links"
msgstr ""
#. module: crm
-#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
-msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
+#: model:ir.actions.act_window,help:crm.crm_lead_categ_action
+msgid "Create specific categories that fit your company's activities to better classify and analyse your leads and opportunities. Such categories could for instance reflect your product structure or the different types of sales you do."
msgstr ""
#. module: crm
@@ -2783,6 +2796,11 @@ msgstr ""
msgid "If the partner has not purchased (or bought) during a period, decrease the state of mind by this factor. It's a multiplication"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
+msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
+msgstr ""
+
#. module: crm
#: view:crm.case.section:0
msgid "Mailgateway"
@@ -2799,7 +2817,7 @@ msgid "# Mails"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:57
#, python-format
msgid "Warning"
msgstr ""
@@ -2861,7 +2879,7 @@ msgid "Total of Planned Revenue"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:375
#, python-format
msgid "You can not escalate, You are already at the top level regarding your sales-team category."
msgstr ""
@@ -2915,11 +2933,10 @@ msgid "Schedule Call"
msgstr ""
#. module: crm
-#: field:crm.lead,date_action_next:0
-#: field:crm.lead,title_action:0
-#: field:crm.meeting,date_action_next:0
-#: field:crm.phonecall,date_action_next:0
-msgid "Next Action"
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:133
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:258
+#, python-format
+msgid "Closed/Cancelled Leads Could not convert into Opportunity"
msgstr ""
#. module: crm
@@ -2994,6 +3011,17 @@ msgstr ""
msgid "Thu"
msgstr ""
+#. module: crm
+#: view:crm.add.note:0
+#: view:crm.merge.opportunity:0
+#: view:crm.opportunity2phonecall:0
+#: view:crm.partner2opportunity:0
+#: view:crm.phonecall2opportunity:0
+#: view:crm.phonecall2phonecall:0
+#: view:crm.send.mail:0
+msgid "_Cancel"
+msgstr ""
+
#. module: crm
#: view:crm.lead.report:0
#: view:crm.phonecall.report:0
@@ -3005,11 +3033,6 @@ msgstr ""
msgid "This module relates sale from opportunity cases in the CRM."
msgstr ""
-#. module: crm
-#: view:crm.meeting:0
-msgid "of"
-msgstr ""
-
#. module: crm
#: selection:crm.meeting,rrule_type:0
msgid "Daily"
@@ -3135,6 +3158,7 @@ msgstr ""
#: field:crm.lead,job_ids:0
#: view:crm.meeting:0
#: view:crm.phonecall:0
+#: view:res.partner:0
msgid "Contacts"
msgstr ""
@@ -3170,7 +3194,7 @@ msgid "Success Probability"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:426
#: selection:crm.add.note,state:0
#: selection:crm.lead,state:0
#: selection:crm.lead.report,state:0
@@ -3188,19 +3212,16 @@ msgid "Cases by Sales Team"
msgstr ""
#. module: crm
-#: view:crm.meeting:0
-#: field:crm.send.mail,email_from:0
-msgid "From"
+#: field:crm.meeting,attendee_ids:0
+msgid "Attendees"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_meeting.py:0
#: view:crm.meeting:0
#: 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 ""
@@ -3275,7 +3296,7 @@ msgid "November"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_action_rule.py:0
+#: code:addons/crm/crm_action_rule.py:67
#, python-format
msgid "No E-Mail ID Found for your Company address!"
msgstr ""
@@ -3313,8 +3334,10 @@ msgid "Twitter Ads"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_add_note.py:0
-#: code:addons/crm/wizard/crm_send_email.py:0
+#: code:addons/crm/wizard/crm_add_note.py:26
+#: code:addons/crm/wizard/crm_send_email.py:72
+#: code:addons/crm/wizard/crm_send_email.py:169
+#: code:addons/crm/wizard/crm_send_email.py:270
#, python-format
msgid "Error"
msgstr ""
@@ -3335,7 +3358,7 @@ msgid "Error ! You can not create recursive profiles."
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:232
#, python-format
msgid "The case '%s' has been closed."
msgstr ""
@@ -3358,13 +3381,13 @@ msgid "You can not have two users with the same login !"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_merge_opportunities.py:0
+#: code:addons/crm/wizard/crm_merge_opportunities.py:100
#, python-format
msgid "Merged into Opportunity: %s"
msgstr ""
#. module: crm
-#: code:addons/crm/crm.py:0
+#: code:addons/crm/crm.py:347
#: view:crm.lead:0
#: view:res.partner:0
#, python-format
@@ -3374,6 +3397,7 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
#: view:crm.phonecall:0
+#: view:res.partner:0
msgid "Categorization"
msgstr ""
@@ -3383,7 +3407,6 @@ msgid "Action Rules"
msgstr ""
#. module: crm
-#: view:crm.meeting:0
#: field:crm.meeting,rrule_type:0
msgid "Recurrency"
msgstr ""
@@ -3431,6 +3454,7 @@ msgstr ""
#: view:crm.phonecall:0
#: field:crm.phonecall,description:0
#: field:crm.segmentation,description:0
+#: view:res.partner:0
msgid "Description"
msgstr ""
@@ -3467,7 +3491,7 @@ msgid "Interest in Accessories"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:0
+#: code:addons/crm/crm_lead.py:211
#, python-format
msgid "The opportunity '%s' has been opened."
msgstr ""
@@ -3508,6 +3532,7 @@ msgstr ""
#. module: crm
#: view:crm.phonecall:0
#: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
+#: view:res.partner:0
msgid "Schedule a Meeting"
msgstr ""
diff --git a/addons/crm_caldav/i18n/crm_caldav.pot b/addons/crm_caldav/i18n/crm_caldav.pot
index a375283849c..e60e0872cd8 100644
--- a/addons/crm_caldav/i18n/crm_caldav.pot
+++ b/addons/crm_caldav/i18n/crm_caldav.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,20 +15,20 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: crm_caldav
-#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
-msgid "Extened Module to Add CalDav future on Meeting"
-msgstr ""
-
#. module: crm_caldav
#: model:ir.model,name:crm_caldav.model_crm_meeting
msgid "Meeting"
msgstr ""
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extended Module to Add CalDav feature on Meeting"
+msgstr ""
+
#. module: crm_caldav
#: model:ir.module.module,description:crm_caldav.module_meta_information
msgid "\n"
-" New Futures in Meeting:\n"
+" New Features 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 bc13ec8ecd2..59efe9d7b8e 100644
--- a/addons/crm_claim/i18n/crm_claim.pot
+++ b/addons/crm_claim/i18n/crm_claim.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -529,8 +529,8 @@ msgid "Attachments"
msgstr ""
#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
-msgid "Record and track your customers' claims. Claims can be linked to a sales order or a lot. You can send emails with attachments and get the history of everything that happened on a specific claim (emails sent, interventions type and so on..). Claims can be automatically linked to an email address using the mail gateway module."
+#: model:ir.model,name:crm_claim.model_crm_case_stage
+msgid "Stage of case"
msgstr ""
#. module: crm_claim
@@ -644,6 +644,11 @@ msgstr ""
msgid "Report a Claim"
msgstr ""
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid "Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module."
+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 9129ae0a45b..3f974e8628e 100644
--- a/addons/crm_fundraising/i18n/crm_fundraising.pot
+++ b/addons/crm_fundraising/i18n/crm_fundraising.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:43:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:43:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -378,11 +378,6 @@ msgstr ""
msgid "Category"
msgstr ""
-#. module: crm_fundraising
-#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
-msgid "If you need to support your organization or a campaign, with 'Fund Raising' you can track all you fund raising activities. The search list allows you to filter by funds description, email, history and probability of success."
-msgstr ""
-
#. module: crm_fundraising
#: view:crm.fundraising.report:0
msgid " Year "
@@ -538,6 +533,11 @@ msgstr ""
msgid "Attachments"
msgstr ""
+#. module: crm_fundraising
+#: model:ir.model,name:crm_fundraising.model_crm_case_stage
+msgid "Stage of case"
+msgstr ""
+
#. module: crm_fundraising
#: view:crm.fundraising:0
msgid "Estimates"
@@ -576,6 +576,11 @@ msgstr ""
msgid "Open"
msgstr ""
+#. module: crm_fundraising
+#: model:ir.actions.act_window,help:crm_fundraising.crm_case_category_act_fund_all1
+msgid "If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success."
+msgstr ""
+
#. module: crm_fundraising
#: view:crm.fundraising:0
#: field:crm.fundraising,user_id:0
diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
index 3a6d643c29c..dc5b3564dd6 100644
--- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot
+++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:26+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -549,11 +549,6 @@ msgstr ""
msgid "Reply"
msgstr ""
-#. module: crm_helpdesk
-#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
-msgid "Create and manage helpdesk categories to better manage and classify your support request."
-msgstr ""
-
#. module: crm_helpdesk
#: field:crm.helpdesk,description:0
msgid "Description"
@@ -564,11 +559,6 @@ msgstr ""
msgid "May"
msgstr ""
-#. module: crm_helpdesk
-#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
-msgid "'Helpdesk and Support' allows you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary and assign a priority level. Depending on your need, you may consider using the issues system of OpenERP to manage your support activities."
-msgstr ""
-
#. module: crm_helpdesk
#: field:crm.helpdesk,probability:0
msgid "Probability (%)"
@@ -632,6 +622,11 @@ msgstr ""
msgid "ID"
msgstr ""
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Create and manage helpdesk categories to better manage and classify your support requests."
+msgstr ""
+
#. module: crm_helpdesk
#: selection:crm.helpdesk,priority:0
#: selection:crm.helpdesk.report,priority:0
@@ -650,6 +645,11 @@ msgstr ""
msgid "Last Action"
msgstr ""
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer."
+msgstr ""
+
#. module: crm_helpdesk
#: view:crm.helpdesk.report:0
#: field:crm.helpdesk.report,name:0
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 7a2b29b4819..ba918893d3f 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:26+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgid "Company"
msgstr ""
#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:0
+#: code:addons/crm_partner_assign/partner_geo_assign.py:41
#, python-format
msgid "Could not contact geolocation servers, please make sure you have a working internet connection (%s)"
msgstr ""
@@ -171,7 +171,7 @@ msgid "Previous"
msgstr ""
#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/partner_geo_assign.py:0
+#: code:addons/crm_partner_assign/partner_geo_assign.py:40
#, python-format
msgid "Network error"
msgstr ""
@@ -283,7 +283,7 @@ msgid "Stage"
msgstr ""
#. module: crm_partner_assign
-#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:0
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:271
#, python-format
msgid "Fwd"
msgstr ""
diff --git a/addons/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot
index f6029745a3f..71488840491 100644
--- a/addons/crm_profiling/i18n/crm_profiling.pot
+++ b/addons/crm_profiling/i18n/crm_profiling.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@ msgid "\n"
" "
msgstr ""
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid "You can create specific topic-related questionnaires to guide your team(s) in the sales cycle by helping them to ask the right questions. The segmentation tool allows you to automatically assign a partner to a category according to his answers to the different questionnaires."
+msgstr ""
+
#. module: crm_profiling
#: field:crm_profiling.answer,question_id:0
#: field:crm_profiling.question,name:0
@@ -47,11 +52,6 @@ msgstr ""
msgid "Open Questionnaire"
msgstr ""
-#. module: crm_profiling
-#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
-msgid "You can create specific topic related questionnaires that will be used to guide your team(s) in the sales cycle by helping them to ask the right questions. Using the segmentation tool, you will be able to automatically assign a partner to a category based on his answers to the different questionnaires."
-msgstr ""
-
#. module: crm_profiling
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
@@ -174,7 +174,7 @@ msgid "Partner"
msgstr ""
#. module: crm_profiling
-#: code:addons/crm_profiling/crm_profiling.py:0
+#: code:addons/crm_profiling/crm_profiling.py:178
#: field:crm_profiling.questionnaire,name:0
#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
#: wizard_view:open_questionnaire,init:0
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index a613ae9ff27..45c3c12a75f 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 7dd002cbe27..3e69ca4ca77 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:28+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "Delivery Order"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No price available !"
msgstr ""
@@ -63,6 +63,11 @@ msgstr ""
msgid "Volume"
msgstr ""
+#. module: delivery
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: delivery
#: field:delivery.grid,line_ids:0
msgid "Grid Line"
@@ -104,6 +109,11 @@ msgstr ""
msgid "Variable Factor"
msgstr ""
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
+msgid "The delivery price list allows you to compute the cost and sales price of the delivery according to the weight of the products and other criteria. You can define several price lists for one delivery method, per country or a zone in a specific country defined by a postal code range."
+msgstr ""
+
#. module: delivery
#: selection:delivery.grid.line,price_type:0
msgid "Fixed"
@@ -125,7 +135,7 @@ msgid "Stock Move"
msgstr ""
#. module: delivery
-#: code:addons/delivery/delivery.py:0
+#: code:addons/delivery/delivery.py:141
#, python-format
msgid "No line matched this order in the choosed delivery grids !"
msgstr ""
@@ -141,7 +151,12 @@ msgid "Net Weight"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "Create and manage the delivery methods you need for your sales activities. Each delivery method can be assigned to a price list which computes the price of the delivery according to the products sold or delivered."
+msgstr ""
+
+#. module: delivery
+#: code:addons/delivery/stock.py:98
#, python-format
msgid "Warning"
msgstr ""
@@ -255,7 +270,7 @@ msgid "If the active field is set to False, it will allow you to hide the delive
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid available !"
msgstr ""
@@ -266,7 +281,8 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -308,13 +324,8 @@ msgid "Condition"
msgstr ""
#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "Create and manage the delivery method(s) you want your sales to be processed with. Each delivery method can be assigned to a pricelist which computes the price of the delivery according to the products sold or delivered."
-msgstr ""
-
-#. module: delivery
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: field:delivery.grid.line,standard_price:0
+msgid "Cost Price"
msgstr ""
#. module: delivery
@@ -358,19 +369,14 @@ msgstr ""
msgid "Sales & Purchases"
msgstr ""
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_grid_form
-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"
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
msgstr ""
#. module: delivery
@@ -403,7 +409,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:95
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -425,7 +431,7 @@ msgid "="
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:0
+#: code:addons/delivery/stock.py:99
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -456,7 +462,8 @@ msgid "ID"
msgstr ""
#. module: delivery
-#: code:addons/delivery/wizard/delivery_sale_order.py:0
+#: code:addons/delivery/wizard/delivery_sale_order.py:66
+#: code:addons/delivery/wizard/delivery_sale_order.py:98
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index 05347f35bf3..3b81f3c65f1 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "Field to be used as name on resource directories. If empty, the \"name\"
msgstr ""
#. module: document
-#: code:addons/document/document_directory.py:0
+#: code:addons/document/document_directory.py:276
#, python-format
msgid "Directory name contains special characters!"
msgstr ""
@@ -132,7 +132,8 @@ msgid "Path"
msgstr ""
#. module: document
-#: code:addons/document/document_directory.py:0
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
#, python-format
msgid "Directory name must be unique!"
msgstr ""
@@ -172,7 +173,8 @@ msgid "Project"
msgstr ""
#. module: document
-#: code:addons/document/document_storage.py:0
+#: code:addons/document/document_storage.py:573
+#: code:addons/document/document_storage.py:601
#, python-format
msgid "Error!"
msgstr ""
@@ -225,8 +227,11 @@ msgid "Document directory"
msgstr ""
#. module: document
-#: code:addons/document/document.py:0
-#: code:addons/document/document_directory.py:0
+#: code:addons/document/document.py:154
+#: code:addons/document/document.py:222
+#: code:addons/document/document_directory.py:266
+#: code:addons/document/document_directory.py:271
+#: code:addons/document/document_directory.py:276
#, python-format
msgid "ValidateError"
msgstr ""
@@ -356,7 +361,7 @@ msgid "Modified"
msgstr ""
#. module: document
-#: code:addons/document/document_storage.py:0
+#: code:addons/document/document_storage.py:639
#, python-format
msgid "Error at doc write!"
msgstr ""
@@ -933,7 +938,8 @@ msgid "Content Name"
msgstr ""
#. module: document
-#: code:addons/document/document.py:0
+#: code:addons/document/document.py:154
+#: code:addons/document/document.py:222
#, python-format
msgid "File name must be unique!"
msgstr ""
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index db9204eb64d..6b3c74ea33c 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/document_ics/i18n/document_ics.pot b/addons/document_ics/i18n/document_ics.pot
index a454116e955..529ec9df13f 100644
--- a/addons/document_ics/i18n/document_ics.pot
+++ b/addons/document_ics/i18n/document_ics.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 17127395a27..50edefbd85c 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:05+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:05+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,14 +15,28 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr ""
+
#. module: document_webdav
#: constraint:document.directory:0
msgid "Error! You can not create recursive Directories."
msgstr ""
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr ""
+
#. module: document_webdav
#: view:document.webdav.dir.property:0
#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
msgid "Namespace"
msgstr ""
@@ -31,8 +45,14 @@ msgstr ""
msgid "DAV properties"
msgstr ""
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr ""
+
#. module: document_webdav
#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
msgid "Group By..."
msgstr ""
@@ -42,11 +62,22 @@ msgid "These properties will be added to WebDAV requests"
msgstr ""
#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:0
+#: model:ir.ui.menu,name:document_webdav.menu_file_props
+msgid "DAV properties for documents"
+msgstr ""
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
#, python-format
msgid "PyWebDAV Import Error!"
msgstr ""
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+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"
@@ -88,7 +119,7 @@ msgid "The directory name must be unique !"
msgstr ""
#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:0
+#: code:addons/document_webdav/webdav.py:37
#, python-format
msgid "Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/"
msgstr ""
@@ -101,11 +132,13 @@ msgstr ""
#. module: document_webdav
#: view:document.directory:0
#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
msgid "Properties"
msgstr ""
#. module: document_webdav
#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
msgid "Name"
msgstr ""
@@ -116,6 +149,7 @@ msgstr ""
#. module: document_webdav
#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
msgid "Value"
msgstr ""
@@ -125,11 +159,29 @@ msgstr ""
msgid "Directory"
msgstr ""
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr ""
+
#. module: document_webdav
#: view:document.webdav.dir.property:0
msgid "Dir"
msgstr ""
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr ""
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr ""
+
#. module: document_webdav
#: model:ir.module.module,shortdesc:document_webdav.module_meta_information
msgid "WebDAV server for Document Management"
@@ -140,13 +192,9 @@ msgstr ""
msgid "Directory must have a parent or a storage"
msgstr ""
-#. module: document_webdav
-#: view:document.webdav.dir.property:0
-msgid "Search Document storage"
-msgstr ""
-
#. module: document_webdav
#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
msgid "Substitute"
msgstr ""
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 49ffd971df4..42fd5432029 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:06+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:06+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:31+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:31+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,23 +26,19 @@ msgid "Email Account Configuration"
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
#, python-format
msgid "Emails for multiple items saved in outbox."
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
#, python-format
msgid "No personal email accounts are configured for you. \n"
"Either ask admin to enforce an account for this template or get yourself a personal email account."
msgstr ""
-#. module: email_template
-#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
-msgid "An email template is an email document that will be sent as part of a marketing campaign. You can personalize it based on specific customer profile fields so that their names or other partner related information can be automatically inserted in it."
-msgstr ""
-
#. module: email_template
#: view:email_template.mailbox:0
msgid "Personal Emails"
@@ -84,7 +80,7 @@ msgid "Body"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
#, python-format
msgid "Deletion of Record failed"
msgstr ""
@@ -163,7 +159,7 @@ msgid "Email Account"
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
#, python-format
msgid "Email sending failed for one or more objects."
msgstr ""
@@ -265,7 +261,7 @@ msgid "From Email"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:304
#, python-format
msgid "Warning"
msgstr ""
@@ -305,7 +301,7 @@ msgid "Subject"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:256
#, python-format
msgid "Reason: %s"
msgstr ""
@@ -322,7 +318,7 @@ msgid "Template"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:367
#, python-format
msgid "Mail from Account %s failed. Probable Reason: Server Send Error\n"
" Description: %s"
@@ -376,13 +372,13 @@ msgid "Resource"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:255
#, python-format
msgid "Out going connection test failed"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:371
#, python-format
msgid "Mail from Account %s successfully Sent."
msgstr ""
@@ -404,7 +400,7 @@ msgid "The text version of the mail"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:449
#, python-format
msgid " (Email Attachment)"
msgstr ""
@@ -445,7 +441,7 @@ msgid "Attach my signature to mail"
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
#: view:email.template:0
#, python-format
msgid "Report"
@@ -573,7 +569,7 @@ msgid "Mail Details"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:235
#, python-format
msgid "SMTP SERVER or PORT not specified"
msgstr ""
@@ -697,7 +693,7 @@ msgid "Outgoing"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:427
#, python-format
msgid "Datetime Extraction failed.Date:%s Error:%s"
msgstr ""
@@ -757,7 +753,7 @@ msgid "Save in Drafts"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:362
#, python-format
msgid "Mail from Account %s failed. Probable Reason:MIME Error\n"
"Description: %s"
@@ -774,10 +770,16 @@ msgid "Language"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
#: 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"
@@ -805,7 +807,7 @@ msgid "Only users from these groups will be allowed to send mails from this Temp
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:284
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -852,7 +854,7 @@ msgid "Text, otherwise HTML"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:0
+#: code:addons/email_template/email_template.py:319
#, python-format
msgid "Copy of template "
msgstr ""
@@ -873,7 +875,7 @@ msgid "Close"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:48
#, python-format
msgid "Error sending mail: %s"
msgstr ""
@@ -889,7 +891,7 @@ msgid "Body (HTML-Web Client Only)"
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
#, python-format
msgid "%s (Email Attachment)"
msgstr ""
@@ -899,6 +901,11 @@ msgstr ""
msgid "Sending"
msgstr ""
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid "An email template is an email document that will be sent as part of a marketing campaign. You can personalize it according to specific customer profile fields, so that a partner name or other partner related information may be inserted automatically."
+msgstr ""
+
#. module: email_template
#: field:email.template,allowed_groups:0
msgid "Allowed User Groups"
@@ -915,7 +922,13 @@ msgid "User Information"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: view:email.template:0
+msgid "Actions"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
#, python-format
msgid "Server Send Error\n"
"Description: %s"
@@ -927,8 +940,8 @@ msgid "Name of the generated report file. Placeholders can be used in the filena
msgstr ""
#. module: email_template
-#: field:email_template.mailbox,folder:0
-msgid "Folder"
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
msgstr ""
#. module: email_template
@@ -938,25 +951,25 @@ msgid "Trash"
msgstr ""
#. module: email_template
-#: help:email_template.mailbox,date_mail:0
-msgid "Date on which Email Sent or Received"
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_mailbox.py:0
+#: code:addons/email_template/email_template_mailbox.py:103
#, python-format
msgid "Sending of Mail %s failed. Probable Reason:Could not login to server\n"
"Error: %s"
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
#, python-format
msgid "Missing mail account"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:250
#, python-format
msgid "SMTP Test Connection Was Successful"
msgstr ""
@@ -1002,11 +1015,6 @@ 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"
@@ -1048,7 +1056,6 @@ msgstr ""
#. module: email_template
#: view:email_template.mailbox:0
-#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
msgid "Emails"
msgstr ""
@@ -1122,7 +1129,7 @@ msgid "Model"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:236
#, python-format
msgid "Core connection for the given ID does not exist"
msgstr ""
@@ -1133,7 +1140,7 @@ msgid "Corporate"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:275
#, python-format
msgid "Mail from Account %s failed on login. Probable Reason:Could not login to server\n"
"Error: %s"
@@ -1160,8 +1167,8 @@ msgid "Mail Format"
msgstr ""
#. module: email_template
-#: view:email.template:0
-msgid "Actions"
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
msgstr ""
#. module: email_template
@@ -1175,13 +1182,15 @@ msgid "Enter port number, eg: 25 or 587"
msgstr ""
#. module: email_template
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
#, python-format
msgid "email-template"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template_account.py:0
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
#, python-format
msgid "Mail from Account %s failed. Probable Reason:Account not approved"
msgstr ""
@@ -1197,8 +1206,8 @@ msgid "Has Attachments"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:0
-#: code:addons/email_template/wizard/email_template_send_wizard.py:0
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
#, python-format
msgid "No Description"
msgstr ""
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index e47f16b9bc3..5064e1a1f47 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:32+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -104,7 +104,7 @@ msgid "Confirmation Email"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:63
#, python-format
msgid "Registration doesn't have any partner to invoice."
msgstr ""
@@ -123,7 +123,7 @@ msgid "Invoice Date"
msgstr ""
#. module: event
-#: code:addons/event/wizard/partner_event_registration.py:0
+#: code:addons/event/wizard/partner_event_registration.py:93
#: view:event.registration:0
#: model:ir.actions.act_window,name:event.action_partner_event_registration
#: model:ir.model,name:event.model_event_registration
@@ -191,7 +191,7 @@ msgid "Ticket for Opera"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:122
#: view:event.event:0
#, python-format
msgid "Confirm Event"
@@ -204,11 +204,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: event
-#: view:event.registration:0
-msgid "Send New Email"
-msgstr ""
-
#. module: event
#: field:event.event,reply_to:0
msgid "Reply-To"
@@ -261,7 +256,7 @@ msgid "Extra Info"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:83
#, python-format
msgid "Customer Invoices"
msgstr ""
@@ -347,14 +342,17 @@ msgid "Number of Registrations or Tickets"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:50
+#: code:addons/event/wizard/event_make_invoice.py:54
+#: code:addons/event/wizard/event_make_invoice.py:58
+#: code:addons/event/wizard/event_make_invoice.py:62
#, python-format
msgid "Warning !"
msgstr ""
#. module: event
-#: model:ir.actions.act_window,help:event.action_event_view
-msgid "Event is the low-level object used by meeting and others documents that have to be synchronized with mobile or calendar applications through caldav. Most of the users should work on the Calendar menu, and not on the list of events."
+#: view:event.registration:0
+msgid "Send New Email"
msgstr ""
#. module: event
@@ -395,7 +393,7 @@ msgid "To be Invoiced"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:394
#, python-format
msgid "Error !"
msgstr ""
@@ -413,7 +411,7 @@ msgid "Cancel Registration"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:395
#, python-format
msgid "Registered partner doesn't have an address to make the invoice."
msgstr ""
@@ -465,7 +463,7 @@ msgid "Confirm Anyway"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_confirm_registration.py:0
+#: code:addons/event/wizard/event_confirm_registration.py:54
#, python-format
msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
msgstr ""
@@ -625,7 +623,7 @@ msgid "Reference 2"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:357
#: view:report.event.registration:0
#, python-format
msgid "Invoiced"
@@ -785,7 +783,7 @@ msgid "Set To Draft"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:472
#: view:event.event:0
#: view:event.registration:0
#: view:res.partner:0
@@ -833,7 +831,7 @@ msgid "Attachments"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:59
#, python-format
msgid "Event related doesn't have any product defined"
msgstr ""
@@ -854,7 +852,7 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:442
#: selection:event.event,state:0
#: view:event.make.invoice:0
#: selection:event.registration,state:0
@@ -881,7 +879,7 @@ msgid "Year"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:517
#, python-format
msgid "Cancel"
msgstr ""
@@ -899,7 +897,7 @@ msgid "Event by Registration"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:432
#, python-format
msgid "Open"
msgstr ""
@@ -910,7 +908,8 @@ msgid "Responsible User"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:538
+#: code:addons/event/event.py:545
#, python-format
msgid "Auto Confirmation: [%s] %s"
msgstr ""
@@ -1056,7 +1055,7 @@ msgid "Unconfirmed"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:542
#, python-format
msgid "Auto Registration: [%s] %s"
msgstr ""
@@ -1093,13 +1092,13 @@ msgid "Country"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:55
#, python-format
msgid "Registration is set as Cannot be invoiced"
msgstr ""
#. module: event
-#: code:addons/event/event.py:0
+#: code:addons/event/event.py:500
#: view:event.event:0
#: view:event.registration:0
#: view:res.partner:0
@@ -1162,7 +1161,7 @@ msgid "Event For Registration"
msgstr ""
#. module: event
-#: code:addons/event/wizard/event_make_invoice.py:0
+#: code:addons/event/wizard/event_make_invoice.py:51
#, python-format
msgid "Invoice cannot be created if the registration is in %s state."
msgstr ""
@@ -1196,3 +1195,8 @@ msgstr ""
msgid "Speaker Confirmed"
msgstr ""
+#. module: event
+#: model:ir.actions.act_window,help:event.action_event_view
+msgid "Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events."
+msgstr ""
+
diff --git a/addons/event_project/i18n/event_project.pot b/addons/event_project/i18n/event_project.pot
index d376f374092..9e34b201d8a 100644
--- a/addons/event_project/i18n/event_project.pot
+++ b/addons/event_project/i18n/event_project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:32+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:32+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index 3d1d28b9b41..2f3e03e0995 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/google_map/i18n/google_map.pot b/addons/google_map/i18n/google_map.pot
index d9435a2edcc..096f56056d5 100644
--- a/addons/google_map/i18n/google_map.pot
+++ b/addons/google_map/i18n/google_map.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index a7198d83e7b..b2268c60d67 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:34+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -51,15 +51,14 @@ msgid "Human Resources"
msgstr ""
#. module: hr
-#: view:hr.department:0
#: view:hr.employee:0
#: view:hr.job:0
msgid "Group By..."
msgstr ""
#. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work E-mail"
+#: model:ir.actions.act_window,help:hr.action_hr_job
+msgid "Job Positions are used to define jobs and their requirements. You can keep track of the number of employees you have per job position and how many you expect in the future. You can also attach a survey to a job position that will be used in the recruitment process to evaluate the applicants for this job position."
msgstr ""
#. module: hr
@@ -164,6 +163,11 @@ msgstr ""
msgid "Employee Passport Information"
msgstr ""
+#. module: hr
+#: model:ir.actions.act_window,help:hr.open_module_tree_department
+msgid "Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc."
+msgstr ""
+
#. module: hr
#: view:hr.employee:0
msgid "Position"
@@ -265,6 +269,11 @@ msgstr ""
msgid "Other information"
msgstr ""
+#. module: hr
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr ""
+
#. module: hr
#: field:hr.department,complete_name:0
#: field:hr.employee.category,complete_name:0
@@ -461,11 +470,6 @@ msgstr ""
msgid "Status"
msgstr ""
-#. module: hr
-#: model:ir.actions.act_window,help:hr.open_module_tree_department
-msgid "Your Company's Departments Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitements, etc."
-msgstr ""
-
#. module: hr
#: view:hr.installer:0
msgid "Configure"
@@ -624,6 +628,7 @@ 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 ""
@@ -659,6 +664,11 @@ msgstr ""
msgid "In Position"
msgstr ""
+#. module: hr
+#: field:hr.employee,mobile_phone:0
+msgid "Mobile"
+msgstr ""
+
#. module: hr
#: view:hr.department:0
msgid "department"
@@ -761,7 +771,6 @@ msgid "Expenses"
msgstr ""
#. module: hr
-#: view:hr.department:0
#: field:hr.department,manager_id:0
#: view:hr.employee:0
#: field:hr.employee,parent_id:0
@@ -778,11 +787,6 @@ msgstr ""
msgid "Generic Payroll system Integrated with Accountings."
msgstr ""
-#. module: hr
-#: model:ir.actions.act_window,help:hr.action_hr_job
-msgid "JJob Positions is used to define jobs and their requirements. You can attach a survey to a job position. This survey will be used in the recruitment process to evaluate the applicants for this job position."
-msgstr ""
-
#. module: hr
#: field:hr.employee,child_ids:0
msgid "Subordinates"
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 3e27bb67b22..c4e185afa2f 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:09+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgid "Print Attendance Report Error"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
#, python-format
msgid "The sign-out date must be in the past"
msgstr ""
@@ -66,6 +66,11 @@ msgstr ""
msgid "Date Signed"
msgstr ""
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid "The Time Tracking functionality aims to manage employee attendances from Sign in/Sign out actions. You can also link this feature to an attendance device using OpenERP's web service features."
+msgstr ""
+
#. module: hr_attendance
#: view:hr.action.reason:0
msgid "Attendance reasons"
@@ -126,7 +131,10 @@ msgid "Attendance Reasons"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:156
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
#, python-format
msgid "UserError"
msgstr ""
@@ -143,19 +151,19 @@ msgid "Employee attendance"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
+#: code:addons/hr_attendance/hr_attendance.py:136
#, python-format
msgid "Warning"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:169
#, python-format
msgid "The Sign-in date must be in the past"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:162
#, python-format
msgid "A sign-in must be right after a sign-out !"
msgstr ""
@@ -230,7 +238,7 @@ msgid "Operation"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
#, python-format
msgid "No Data Available"
msgstr ""
@@ -271,7 +279,9 @@ msgid "Sign In Sign Out"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:103
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:125
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:141
#: view:hr.sign.in.out:0
#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
@@ -279,11 +289,6 @@ msgstr ""
msgid "Sign in / Sign out"
msgstr ""
-#. module: hr_attendance
-#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
-msgid "Time Tracking functionality aims to manage employee's attendances on the basis of the actions (Sign in/Sign out) performed by them. You can also link this to an attendance machine using OpenERP's webservices features."
-msgstr ""
-
#. module: hr_attendance
#: view:hr.sign.in.out.ask:0
msgid "hr.sign.out.ask"
@@ -295,7 +300,7 @@ msgid "August"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
#, python-format
msgid "A sign-out must be right after a sign-in !"
msgstr ""
@@ -378,13 +383,17 @@ msgstr ""
msgid "If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."
msgstr ""
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+msgid "Employee ID"
+msgstr ""
+
#. module: hr_attendance
#: model:ir.model,name:hr_attendance.model_hr_attendance_week
msgid "Print Week Attendance Report"
msgstr ""
#. module: hr_attendance
-#: field:hr.sign.in.out,emp_id:0
#: field:hr.sign.in.out.ask,emp_id:0
msgid "Empoyee ID"
msgstr ""
@@ -431,7 +440,7 @@ msgid "Employee"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/hr_attendance.py:0
+#: code:addons/hr_attendance/hr_attendance.py:136
#, python-format
msgid "You tried to %s with a date anterior to another event !\n"
"Try to contact the administrator to correct attendances."
@@ -452,7 +461,6 @@ 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 ""
@@ -518,7 +526,7 @@ msgid "Bellow this delay, the error is considered to be voluntary"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/wizard/hr_attendance_error.py:0
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
#, python-format
msgid "No records found for your selection!"
msgstr ""
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index 227b539702a..4e950a815a8 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgid "Trial Start Date"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Function Arguments"
+#: view:hr.contract:0
+msgid "Passport"
msgstr ""
#. module: hr_contract
@@ -66,8 +66,8 @@ msgid "Current"
msgstr ""
#. module: hr_contract
-#: field:hr.contract,department_id:0
-msgid "Department"
+#: field:hr.contract.wage.type,factor_type:0
+msgid "Factor for hour cost"
msgstr ""
#. module: hr_contract
@@ -81,8 +81,8 @@ msgid "Wage Types"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Calculations"
+#: field:hr.contract,department_id:0
+msgid "Department"
msgstr ""
#. module: hr_contract
@@ -97,12 +97,6 @@ msgstr ""
msgid "Employee"
msgstr ""
-#. module: hr_contract
-#: view:hr.contract:0
-#: field:hr.contract,working_hours:0
-msgid "Working Schedule"
-msgstr ""
-
#. module: hr_contract
#: selection:hr.contract.wage.type,type:0
msgid "Net"
@@ -119,29 +113,12 @@ msgid "Hours in the period"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Function"
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
msgstr ""
#. module: hr_contract
#: view:hr.contract:0
-#: view:hr.contract.wage.type:0
-msgid "Group By..."
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Description"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.employee,place_of_birth:0
-msgid "Place of Birth"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.employee:0
#: field:hr.employee,contract_ids:0
#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
@@ -150,8 +127,8 @@ msgid "Contracts"
msgstr ""
#. module: hr_contract
-#: field:hr.employee,manager:0
-msgid "Is a Manager"
+#: view:hr.employee:0
+msgid "Personal Info"
msgstr ""
#. module: hr_contract
@@ -159,12 +136,6 @@ msgstr ""
msgid "Job"
msgstr ""
-#. module: hr_contract
-#: view:hr.contract:0
-#: view:hr.employee:0
-msgid "Passport"
-msgstr ""
-
#. module: hr_contract
#: view:hr.contract:0
msgid "Search Contract"
@@ -194,19 +165,16 @@ msgstr ""
#. module: hr_contract
#: view:hr.contract:0
#: field:hr.contract,advantages:0
-#: view:hr.employee:0
msgid "Advantages"
msgstr ""
#. module: hr_contract
#: view:hr.contract:0
-#: view:hr.employee:0
msgid "Valid for"
msgstr ""
#. module: hr_contract
#: view:hr.contract:0
-#: view:hr.employee:0
msgid "Work Permit"
msgstr ""
@@ -222,8 +190,12 @@ msgid "Contract Types"
msgstr ""
#. module: hr_contract
+#: field:hr.contract,wage_type_id:0
#: view:hr.contract.wage.type:0
-msgid "Search Wage Type"
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
+#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
+msgid "Wage Type"
msgstr ""
#. module: hr_contract
@@ -254,7 +226,6 @@ msgstr ""
#. module: hr_contract
#: view:hr.contract:0
#: field:hr.contract,notes:0
-#: view:hr.employee:0
msgid "Notes"
msgstr ""
@@ -263,15 +234,6 @@ msgstr ""
msgid "Error ! You cannot select a department for which the employee is the manager."
msgstr ""
-#. module: hr_contract
-#: field:hr.contract,wage_type_id:0
-#: view:hr.contract.wage.type:0
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type
-#: model:ir.model,name:hr_contract.model_hr_contract_wage_type
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type
-msgid "Wage Type"
-msgstr ""
-
#. module: hr_contract
#: view:hr.contract:0
#: field:hr.employee,contract_id:0
@@ -295,8 +257,9 @@ msgid "Search Wage Period"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Salary Computation"
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
msgstr ""
#. module: hr_contract
@@ -317,14 +280,8 @@ msgid "Job Title"
msgstr ""
#. module: hr_contract
-#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
-#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
-msgid "Wage period"
-msgstr ""
-
-#. module: hr_contract
-#: field:hr.employee,vehicle_distance:0
-msgid "Home-Work Distance"
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
msgstr ""
#. module: hr_contract
@@ -333,8 +290,13 @@ msgid "Start Date"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Company contribution"
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: hr_contract
+#: view:hr.contract.wage.type:0
+msgid "Search Wage Type"
msgstr ""
#. module: hr_contract
@@ -348,8 +310,9 @@ msgid "Trial End Date"
msgstr ""
#. module: hr_contract
-#: field:hr.contract.wage.type,factor_type:0
-msgid "Factor for hour cost"
+#: view:hr.contract:0
+#: view:hr.contract.wage.type:0
+msgid "Group By..."
msgstr ""
#. module: hr_contract
@@ -363,23 +326,14 @@ msgid "Period"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Payslip Line"
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
msgstr ""
#. module: hr_contract
-#: view:hr.employee:0
-msgid "Employee specific allowances and deductions"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Contract Details"
-msgstr ""
-
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Salary Structure"
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_wage_type_period
+msgid "Wage period"
msgstr ""
#. module: hr_contract
@@ -388,14 +342,8 @@ msgstr ""
msgid "This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee"
msgstr ""
-#. module: hr_contract
-#: view:hr.employee:0
-msgid "Personal Info"
-msgstr ""
-
#. module: hr_contract
#: view:hr.contract:0
-#: view:hr.employee:0
msgid "Duration"
msgstr ""
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index fc38400aec6..ead89f6bd42 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:36+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:36+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: hr_evaluation
+#: selection:hr.evaluation.report,state:0
+#: selection:hr_evaluation.evaluation,state:0
+msgid "Plan In Progress"
+msgstr ""
+
#. module: hr_evaluation
#: field:hr_evaluation.plan.phase,wait:0
msgid "Wait Previous Phases"
@@ -39,11 +45,6 @@ msgstr ""
msgid "Progress"
msgstr ""
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,evaluation_id:0
-msgid "Evaluation Type"
-msgstr ""
-
#. module: hr_evaluation
#: view:board.board:0
#: model:ir.actions.act_window,name:hr_evaluation.act_hr_evaluation_tree
@@ -56,7 +57,7 @@ msgid "Legend"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:311
#, python-format
msgid "You cannot start evaluation without Evaluation."
msgstr ""
@@ -78,7 +79,8 @@ msgid "Appreciation"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:242
+#: code:addons/hr_evaluation/hr_evaluation.py:311
#, python-format
msgid "Warning !"
msgstr ""
@@ -106,6 +108,11 @@ msgstr ""
msgid "Day"
msgstr ""
+#. module: hr_evaluation
+#: field:hr.evaluation.interview,evaluation_id:0
+msgid "Evaluation Form"
+msgstr ""
+
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
msgid "Send an anonymous summary to the employee"
@@ -176,7 +183,7 @@ msgid "Periodicity of Evaluations (months)"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:242
#, python-format
msgid "You cannot change state, because some appraisal in waiting answer or draft state"
msgstr ""
@@ -192,12 +199,7 @@ 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."
-msgstr ""
-
-#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:81
#, python-format
msgid "\n"
"Date: %(date)s\n"
@@ -265,7 +267,7 @@ msgid "(date)s: Current Date"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:0
+#: code:addons/hr_evaluation/hr_evaluation.py:80
#, python-format
msgid "Regarding "
msgstr ""
@@ -320,9 +322,8 @@ msgid "Send all answers to the manager"
msgstr ""
#. module: hr_evaluation
-#: selection:hr.evaluation.report,state:0
-#: selection:hr_evaluation.evaluation,state:0
-msgid "Plan In Progress"
+#: view:hr.evaluation.report:0
+msgid " Month-1 "
msgstr ""
#. module: hr_evaluation
@@ -337,6 +338,7 @@ msgstr ""
#. module: hr_evaluation
#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
msgid "Print Interview"
msgstr ""
@@ -365,8 +367,8 @@ msgid "Evaluations"
msgstr ""
#. module: hr_evaluation
-#: view:hr.evaluation.report:0
-msgid " Month-1 "
+#: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
+msgid "Each employee may be assigned an evaluation plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager."
msgstr ""
#. module: hr_evaluation
@@ -444,6 +446,7 @@ msgstr ""
#. module: hr_evaluation
#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
msgid "Interview Question"
msgstr ""
@@ -462,11 +465,6 @@ msgstr ""
msgid "Check this box if you want to wait that all preceding phases are finished before launching this phase."
msgstr ""
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid "Interview Requests are generated automatically by OpenERP according to employees evaluation plan. Each user receives automatic emails and requests to perform evaluation of their collegues periodically."
-msgstr ""
-
#. module: hr_evaluation
#: view:hr_evaluation.evaluation:0
msgid "Evaluation Data"
@@ -520,6 +518,11 @@ msgstr ""
msgid "Start Evaluation"
msgstr ""
+#. module: hr_evaluation
+#: view:hr.evaluation.interview:0
+msgid "To Do"
+msgstr ""
+
#. module: hr_evaluation
#: selection:hr.evaluation.report,month:0
msgid "June"
@@ -586,6 +589,7 @@ msgstr ""
#. module: hr_evaluation
#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
msgid "Interview Evaluation"
msgstr ""
@@ -644,6 +648,7 @@ msgstr ""
#. module: hr_evaluation
#: view:hr.evaluation.interview:0
+#: view:hr_evaluation.evaluation:0
msgid "Interviewer"
msgstr ""
@@ -702,8 +707,8 @@ msgid "In Progress"
msgstr ""
#. module: hr_evaluation
-#: view:hr.evaluation.interview:0
-msgid "To Do"
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid "Interview Requests are generated automatically by OpenERP according to an employee's evaluation plan. Each user receives automatic emails and requests to evaluate their colleagues periodically."
msgstr ""
#. module: hr_evaluation
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 3c2980cabdc..576efd84a33 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -221,12 +221,6 @@ msgstr ""
msgid "Gives the sequence order when displaying a list of expense lines."
msgstr ""
-#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
-#, python-format
-msgid "Please configure Default Expanse account for Product purchase, `property_account_expense_categ`"
-msgstr ""
-
#. module: hr_expense
#: field:hr.expense.line,analytic_account:0
#: view:hr.expense.report:0
@@ -246,6 +240,12 @@ msgstr ""
msgid "State"
msgstr ""
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:145
+#, python-format
+msgid "Please configure Default Expense account for Product purchase, `property_account_expense_categ`"
+msgstr ""
+
#. module: hr_expense
#: report:hr.expense:0
#: view:hr.expense.expense:0
@@ -261,7 +261,6 @@ msgid "Qty"
msgstr ""
#. module: hr_expense
-#: report:hr.expense:0
#: view:hr.expense.report:0
#: field:hr.expense.report,price_total:0
msgid "Total Price"
@@ -273,7 +272,8 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
+#: code:addons/hr_expense/hr_expense.py:145
+#: code:addons/hr_expense/hr_expense.py:158
#, python-format
msgid "Error !"
msgstr ""
@@ -332,7 +332,7 @@ msgid "Reimbursement"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:0
+#: code:addons/hr_expense/hr_expense.py:158
#, python-format
msgid "The employee must have a Home address"
msgstr ""
@@ -668,6 +668,11 @@ msgstr ""
msgid "Quantities"
msgstr ""
+#. module: hr_expense
+#: report:hr.expense:0
+msgid "Price"
+msgstr ""
+
#. module: hr_expense
#: field:hr.expense.report,no_of_account:0
msgid "# of Accounts"
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index cabd8244022..ea54cd49d71 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:12+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:12+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,6 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
-#: field:hr.holidays,allocation_type:0
#: field:hr.holidays,holiday_type:0
msgid "Allocation Type"
msgstr ""
@@ -32,12 +31,6 @@ msgstr ""
msgid "Waiting Second Approval"
msgstr ""
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,taken_leaves:0
-msgid "Taken Leaves"
-msgstr ""
-
#. module: hr_holidays
#: help:hr.holidays.status,remaining_leaves:0
msgid "Maximum Leaves Allowed - Leaves Already Taken"
@@ -49,9 +42,7 @@ msgid "Leaves Management"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
#: view:hr.holidays:0
-#: view:hr.holidays.status:0
msgid "Group By..."
msgstr ""
@@ -61,27 +52,19 @@ msgid "Sick Leave"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,department_id:0
#: view:hr.holidays:0
#: field:hr.holidays,department_id:0
msgid "Department"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,state:0
#: selection:hr.holidays,state:0
msgid "Refused"
msgstr ""
#. module: hr_holidays
#: help:hr.holidays,category_id:0
-msgid "Category Of employee"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,allocation_type:0
-msgid "Company Allocation"
+msgid "Category of Employee"
msgstr ""
#. module: hr_holidays
@@ -94,11 +77,6 @@ msgstr ""
msgid "Remaining Days"
msgstr ""
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "March"
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.holidays,holiday_type:0
msgid "By Employee"
@@ -121,11 +99,6 @@ msgstr ""
msgid "Holidays"
msgstr ""
-#. module: hr_holidays
-#: field:available.holidays.report,category_id:0
-msgid "Category's Name"
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Cyan"
@@ -136,6 +109,11 @@ msgstr ""
msgid "Light Green"
msgstr ""
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid "Leave requests can be recorded by employees and validated by their managers. Once a leave request is validated, it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc.) and manage allowances per type."
+msgstr ""
+
#. module: hr_holidays
#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
msgid "Summary Of Leaves"
@@ -153,7 +131,13 @@ msgid "Refuse"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
+#: code:addons/hr_holidays/hr_holidays.py:309
+#, python-format
+msgid "You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
#: view:hr.holidays:0
msgid "Leaves"
msgstr ""
@@ -163,18 +147,12 @@ msgstr ""
msgid "Leave"
msgstr ""
-#. module: hr_holidays
-#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
-msgid "Remaining leaves"
-msgstr ""
-
#. module: hr_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
msgid "Leaves by Department"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,state:0
#: selection:hr.holidays,state:0
msgid "Cancelled"
msgstr ""
@@ -190,18 +168,6 @@ msgstr ""
msgid "Validation"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for category %s while there are too few remaining leave days."
-msgstr ""
-
#. module: hr_holidays
#: field:hr.holidays.status,color_name:0
msgid "Color in Report"
@@ -213,7 +179,7 @@ msgid "HR Holidays Summary Report By Employee"
msgstr ""
#. module: hr_holidays
-#: field:available.holidays.report,holiday_status_id:0
+#: view:hr.holidays:0
#: field:hr.holidays,holiday_status_id:0
#: field:hr.holidays.remaining.leaves.user,leave_type:0
#: view:hr.holidays.status:0
@@ -226,18 +192,13 @@ msgid "Leave Type"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Validation User"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
+#: code:addons/hr_holidays/hr_holidays.py:186
+#: code:addons/hr_holidays/hr_holidays.py:309
#, python-format
msgid "Warning!"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,state:0
#: selection:hr.holidays,state:0
msgid "Draft"
msgstr ""
@@ -254,7 +215,7 @@ msgid "When the holiday request is created the state is 'Draft'.\n"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
#, python-format
msgid "You have to select at least 1 Department. And try again"
msgstr ""
@@ -271,19 +232,14 @@ msgstr ""
msgid "From"
msgstr ""
-#. module: hr_holidays
-#: help:hr.holidays,allocation_type:0
-msgid "This field is only for informative purposes, to depict if the leave request/allocation comes from an employee or from the company"
-msgstr ""
-
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Confirm"
msgstr ""
#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_available_holidays_report
-msgid "available.holidays.report"
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
msgstr ""
#. module: hr_holidays
@@ -313,15 +269,11 @@ msgid "Human Resources: Holidays tracking and workflow\n"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,remaining_leave:0
#: field:hr.holidays.status,remaining_leaves:0
msgid "Remaining Leaves"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,state:0
#: view:hr.holidays:0
#: field:hr.holidays,state:0
msgid "State"
@@ -333,7 +285,6 @@ msgid "Total holidays by type"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
#: view:hr.holidays:0
#: field:hr.holidays,employee_id:0
#: field:hr.holidays.remaining.leaves.user,name:0
@@ -341,17 +292,6 @@ msgid "Employee"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,state:0
-msgid "Waiting Validation"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "General"
-msgstr ""
-
-#. module: hr_holidays
-#: view:available.holidays.report:0
#: view:hr.holidays:0
msgid "Type"
msgstr ""
@@ -388,25 +328,14 @@ msgstr ""
msgid "Number of Days"
msgstr ""
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,max_leave:0
-msgid "Allocated Leaves"
-msgstr ""
-
-#. module: hr_holidays
-#: view:board.board:0
-msgid "Remaining Leave by Type and User"
-msgstr ""
-
#. module: hr_holidays
#: view:hr.holidays.status:0
msgid "Search Leave Type"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "July"
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
msgstr ""
#. module: hr_holidays
@@ -414,11 +343,6 @@ 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"
@@ -429,25 +353,14 @@ msgstr ""
msgid "Employee(s)"
msgstr ""
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid " Month "
-msgstr ""
-
-#. module: hr_holidays
-#: view:board.board:0
-msgid "Leaves By Month"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You cannot validate leaves for employee %s while there are too few remaining leave days."
-msgstr ""
-
#. module: hr_holidays
#: help:hr.holidays.status,categ_id:0
-msgid "If you link this type of leave with a category in the CRM, it will synchronize each leave asked with a case in this category, to display it in the company shared calendar for example."
+msgid "If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
msgstr ""
#. module: hr_holidays
@@ -455,37 +368,11 @@ msgstr ""
msgid "Parent"
msgstr ""
-#. module: hr_holidays
-#: help:hr.holidays,manager_id2:0
-msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
-msgid "Remaining Leaves by User"
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Lavender"
msgstr ""
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,month:0
-msgid "Month"
-msgstr ""
-
#. module: hr_holidays
#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
@@ -504,7 +391,6 @@ msgid "Employee's Holidays"
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
#: field:hr.holidays,category_id:0
msgid "Category"
msgstr ""
@@ -514,23 +400,11 @@ msgstr ""
msgid "This value is given by the sum of all holidays requests with a positive value."
msgstr ""
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid "Available Holidays"
-msgstr ""
-
#. module: hr_holidays
#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
msgid "All Employee Leaves"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "No user related to the selected employee."
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.holidays.status,color_name:0
msgid "Light Coral"
@@ -553,13 +427,9 @@ msgid "Holiday"
msgstr ""
#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Leaves Allowed"
-msgstr ""
-
-#. module: hr_holidays
-#: view:available.holidays.report:0
-msgid " Year "
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
msgstr ""
#. module: hr_holidays
@@ -567,16 +437,6 @@ msgstr ""
msgid "Ivory"
msgstr ""
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "June"
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
@@ -589,7 +449,6 @@ msgid "Leaves Already Taken"
msgstr ""
#. module: hr_holidays
-#: field:available.holidays.report,user_id:0
#: field:hr.holidays,user_id:0
#: field:hr.holidays.remaining.leaves.user,user_id:0
msgid "User"
@@ -601,34 +460,18 @@ msgid "Active"
msgstr ""
#. module: hr_holidays
-#: field:hr.holidays,date_from:0
-msgid "Start Date"
+#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_manager_board
+msgid "Leaves To Validate"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: hr_holidays
-#: view:available.holidays.report:0
#: view:hr.holidays:0
msgid "Extended Filters..."
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,allocation_type:0
-msgid "Employee Request"
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
msgstr ""
#. module: hr_holidays
@@ -641,11 +484,6 @@ msgstr ""
msgid "Casual Leave"
msgstr ""
-#. module: hr_holidays
-#: field:available.holidays.report,date:0
-msgid "Date"
-msgstr ""
-
#. module: hr_holidays
#: view:hr.holidays:0
#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
@@ -653,7 +491,7 @@ msgid "Leaves Summary"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
#, python-format
msgid "Error"
msgstr ""
@@ -663,12 +501,6 @@ msgstr ""
msgid "Light Blue"
msgstr ""
-#. module: hr_holidays
-#: constraint:hr.holidays:0
-msgid "Start date should not be larger than end date!\n"
-"Number of Days should be greater than 1!"
-msgstr ""
-
#. module: hr_holidays
#: field:hr.holidays,type:0
msgid "Request Type"
@@ -680,9 +512,13 @@ msgid "If the active field is set to false, it will allow you to hide the leave
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,day:0
-msgid "Day"
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
msgstr ""
#. module: hr_holidays
@@ -692,18 +528,11 @@ msgid "Reasons"
msgstr ""
#. module: hr_holidays
-#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
-msgid "Leaves requests can be recorded by employees and validated by their managers. Once a leave request is validated it appears automatically in the agenda of the employee. You can define several allowance types (paid holidays, sickness, etc) and manage allowances per type."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
msgid "Leaves Analysis"
msgstr ""
#. module: hr_holidays
-#: view:hr.holidays:0
#: view:hr.holidays.summary.dept:0
#: view:hr.holidays.summary.employee:0
msgid "Cancel"
@@ -715,8 +544,6 @@ msgid "This color will be used in the leaves summary located in Reporting\\Leave
msgstr ""
#. module: hr_holidays
-#: view:available.holidays.report:0
-#: selection:available.holidays.report,state:0
#: view:hr.holidays:0
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
@@ -751,14 +578,13 @@ msgid "Details"
msgstr ""
#. module: hr_holidays
-#: view:board.board:0
-#: model:ir.actions.act_window,name:hr_holidays.action_view_holiday_status_board
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
msgid "My Leaves"
msgstr ""
#. module: hr_holidays
-#: field:hr.holidays.summary.dept,depts:0
-msgid "Department(s)"
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
msgstr ""
#. module: hr_holidays
@@ -772,22 +598,17 @@ msgstr ""
msgid "Description"
msgstr ""
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.status:0
-#: field:hr.holidays.status,categ_id:0
-msgid "Meeting Category"
-msgstr ""
-
#. module: hr_holidays
#: help:hr.holidays,holiday_type:0
msgid "By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category"
msgstr ""
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:186
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Search Leave"
@@ -799,18 +620,13 @@ msgid "Select Holiday Type"
msgstr ""
#. module: hr_holidays
-#: field:available.holidays.report,employee_id:0
-msgid "Employee's Name"
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
msgstr ""
#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
-msgid "Leaves by Month"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,holiday_type:0
-msgid "By Employee Category"
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
msgstr ""
#. module: hr_holidays
@@ -823,21 +639,11 @@ msgstr ""
msgid "Second Approval"
msgstr ""
-#. module: hr_holidays
-#: field:hr.holidays,case_id:0
-msgid "Case"
-msgstr ""
-
#. module: hr_holidays
#: field:hr.holidays,date_to:0
msgid "End Date"
msgstr ""
-#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "February"
-msgstr ""
-
#. module: hr_holidays
#: help:hr.holidays.status,limit:0
msgid "If you tick this checkbox, the system will allow, for this section, the employees to take more leaves than the available ones."
@@ -854,8 +660,13 @@ msgid "Violet"
msgstr ""
#. module: hr_holidays
-#: selection:available.holidays.report,month:0
-msgid "April"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid "This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)"
msgstr ""
#. module: hr_holidays
@@ -879,8 +690,8 @@ msgid "Approve"
msgstr ""
#. module: hr_holidays
-#: field:hr.holidays,linked_request_ids:0
-msgid "Linked Requests"
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
msgstr ""
#. module: hr_holidays
@@ -899,12 +710,6 @@ msgstr ""
msgid "Light Pink"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "Wrong leave definition."
-msgstr ""
-
#. module: hr_holidays
#: view:hr.holidays:0
msgid "Manager"
@@ -915,20 +720,8 @@ msgstr ""
msgid "To Confirm"
msgstr ""
-#. module: hr_holidays
-#: view:available.holidays.report:0
-#: field:available.holidays.report,year:0
-msgid "Year"
-msgstr ""
-
#. module: hr_holidays
#: view:hr.holidays:0
msgid "To Approve"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:0
-#, python-format
-msgid "You Cannot Validate leaves while available leaves are less than asked leaves."
-msgstr ""
-
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index c5a94bcc69d..c2f7b686f65 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -143,7 +143,13 @@ msgid "Set to Draft"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
#, python-format
msgid "Variable Error: %s "
msgstr ""
@@ -254,7 +260,7 @@ msgid "Amount"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:1225
#, python-format
msgid "Please check configuration of %s, payroll head is missing"
msgstr ""
@@ -534,7 +540,8 @@ msgid "#"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:1225
#, python-format
msgid "Error !"
msgstr ""
@@ -637,7 +644,13 @@ msgid "To"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:180
+#: code:addons/hr_payroll/hr_payroll.py:195
+#: code:addons/hr_payroll/hr_payroll.py:285
+#: code:addons/hr_payroll/hr_payroll.py:835
+#: code:addons/hr_payroll/hr_payroll.py:1111
+#: code:addons/hr_payroll/hr_payroll.py:1126
+#: code:addons/hr_payroll/hr_payroll.py:1410
#, python-format
msgid "Variable Error !"
msgstr ""
@@ -683,18 +696,17 @@ msgstr ""
msgid "Bank Advice Note"
msgstr ""
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contibution Register"
-msgstr ""
-
#. module: hr_payroll
#: view:hr.payroll.register:0
#: view:hr.payslip:0
msgid "Payslip"
msgstr ""
+#. module: hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
#. module: hr_payroll
#: selection:hr.allounce.deduction.categoty,type:0
#: selection:hr.payslip.line,type:0
@@ -878,7 +890,6 @@ msgid "For"
msgstr ""
#. module: hr_payroll
-#: view:hr.passport:0
#: field:hr.passport,contracts_ids:0
msgid "Contracts"
msgstr ""
@@ -1213,7 +1224,9 @@ msgstr ""
#. module: hr_payroll
#: field:company.contribution,register_id:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
#: model:ir.model,name:hr_payroll.model_hr_contibution_register
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
msgid "Contribution Register"
msgstr ""
@@ -1499,7 +1512,7 @@ msgid "Payroll Configurtion"
msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:0
+#: code:addons/hr_payroll/hr_payroll.py:469
#, python-format
msgid "Please define bank account for the %s employee"
msgstr ""
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 6953f24bffa..64882a8c921 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,12 @@ msgstr ""
msgid "Analytic Account for Salary Analysis"
msgstr ""
+#. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
#. module: hr_payroll_account
#: field:hr.contibution.register.line,period_id:0
msgid "Period"
@@ -57,14 +63,13 @@ msgid "Other Informations"
msgstr ""
#. module: hr_payroll_account
-#: field:hr.payroll.register,journal_id:0
-#: field:hr.payslip,journal_id:0
-msgid "Expanse Journal"
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
msgstr ""
#. module: hr_payroll_account
-#: field:hr.employee,salary_account:0
-msgid "Salary Account"
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
msgstr ""
#. module: hr_payroll_account
@@ -83,13 +88,13 @@ msgid "Description"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
#, python-format
msgid "Please Confirm all Expense Invoice appear for Reimbursement"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
#, python-format
msgid "Please defined partner in bank account for %s !"
msgstr ""
@@ -100,7 +105,12 @@ msgid "Accounting Informations"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
#, python-format
msgid "Please defined bank account for %s !"
msgstr ""
@@ -126,19 +136,16 @@ msgid "Payment Lines"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
#, python-format
msgid "Please define fiscal year for perticular contract"
msgstr ""
#. module: hr_payroll_account
-#: help:hr.employee,property_bank_account:0
-msgid "Select Bank Account from where Salary Expanse will be Paid"
-msgstr ""
-
-#. module: hr_payroll_account
-#: help:hr.employee,salary_account:0
-msgid "Expanse account when Salary Expanse will be recorded"
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
msgstr ""
#. module: hr_payroll_account
@@ -205,7 +212,13 @@ msgid "Accounting vouchers"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
#, python-format
msgid "Warning !"
msgstr ""
@@ -230,12 +243,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: hr_payroll_account
-#: field:hr.payslip.account.move,slip_id:0
-#: model:ir.model,name:hr_payroll_account.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
#. module: hr_payroll_account
#: field:hr.payroll.register,period_id:0
#: field:hr.payslip,period_id:0
@@ -248,7 +255,8 @@ msgid "Leave Type"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
#, python-format
msgid "Fiscal Year is not defined for slip date %s"
msgstr ""
@@ -278,7 +286,7 @@ msgid "Salary Structure"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
#, python-format
msgid "Please Configure Partners Receivable Account!!"
msgstr ""
@@ -289,29 +297,28 @@ msgid "Year"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
#, python-format
msgid "Period is not defined for slip date %s"
msgstr ""
-#. module: hr_payroll_account
-#: view:hr.employee:0
-msgid "Accounting"
-msgstr ""
-
#. module: hr_payroll_account
#: view:hr.payslip:0
msgid "Accounting Details"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
#, python-format
msgid "Please Configure Partners Payable Account!!"
msgstr ""
#. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
#, python-format
msgid "Integrity Error !"
msgstr ""
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index dbac449f470..1b72377eeec 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -217,7 +217,7 @@ msgid "Previous"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
#: view:hr.applicant:0
#, python-format
msgid "Phone Call"
@@ -249,7 +249,7 @@ msgid "Send New Email"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
#, python-format
msgid "A partner is already defined on this job request."
msgstr ""
@@ -284,11 +284,17 @@ msgid "Good"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
#, python-format
msgid "Error !"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid "Define here your stages of the recruitment process, for example: qualification call, first interview, second interview, refused, hired."
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
#: field:hr.applicant,create_date:0
@@ -699,6 +705,11 @@ msgstr ""
msgid "Are you sure you want to create a partner based on this job request ?"
msgstr ""
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid "From this menu you can track applicants in the recruitment process and manage all operations: meetings, interviews, phone calls, etc. If you setup the email gateway, applicants and their attached CV are created automatically when an email is sent to jobs@yourcompany.com. If you install the document management modules, all documents (CV and motivation letters) are indexed automatically, so that you can easily search through their content."
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "History"
@@ -739,7 +750,7 @@ msgid "Open"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:0
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
#, python-format
msgid "A partner is already existing with the same name."
msgstr ""
@@ -829,7 +840,7 @@ msgid "Refused"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:0
+#: code:addons/hr_recruitment/hr_recruitment.py:412
#, python-format
msgid "Applicant '%s' is being hired."
msgstr ""
@@ -902,7 +913,7 @@ msgid "Assign To"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:0
+#: code:addons/hr_recruitment/hr_recruitment.py:396
#, python-format
msgid "The job request '%s' has been set 'in progress'."
msgstr ""
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index e75c386eb79..3e9e588ee6c 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:41+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:41+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid "Service on Timesheet"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Wed"
msgstr ""
@@ -33,7 +33,7 @@ msgid "(Keep empty for current_time)"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "No employee defined for your user !"
msgstr ""
@@ -87,8 +87,8 @@ msgid "janvier"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Mon"
msgstr ""
@@ -141,26 +141,28 @@ msgid "Print Employees Timesheet"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:174
+#: code:addons/hr_timesheet/hr_timesheet.py:176
#, python-format
msgid "Warning !"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
#, python-format
msgid "UserError"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
#, python-format
msgid "No cost unit defined for this employee !"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Tue"
msgstr ""
@@ -171,7 +173,7 @@ msgid "Analytic Account"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
#, python-format
msgid "Warning"
msgstr ""
@@ -188,24 +190,19 @@ msgid "Sign In/Out By Project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Sat"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Sun"
msgstr ""
-#. module: hr_timesheet
-#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
-msgid "Working Hours allows you to log your working hours by project every day."
-msgstr ""
-
#. module: hr_timesheet
#: view:hr.analytical.timesheet.employee:0
#: view:hr.analytical.timesheet.users:0
@@ -229,8 +226,8 @@ msgid "Monthly Employees Timesheet"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "July"
msgstr ""
@@ -252,6 +249,11 @@ msgstr ""
msgid "novembre"
msgstr ""
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid "Through Working Hours you can register your working hours by project every day."
+msgstr ""
+
#. module: hr_timesheet
#: model:ir.module.module,description:hr_timesheet.module_meta_information
msgid "\n"
@@ -268,8 +270,8 @@ msgid "\n"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "March"
msgstr ""
@@ -286,8 +288,8 @@ msgid "décembre"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "September"
msgstr ""
@@ -332,13 +334,12 @@ msgstr ""
#. module: hr_timesheet
#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
-#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_sign_in
msgid "Sign in / Sign out by project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Fri"
msgstr ""
@@ -349,7 +350,7 @@ msgid "Sign in / Sign out"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:174
#, python-format
msgid "Analytic journal is not defined for employee %s \n"
"Define an employee for the selected user and assign an analytic journal!"
@@ -377,15 +378,15 @@ msgid "août"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "August"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "June"
msgstr ""
@@ -407,8 +408,8 @@ msgid "Date"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "November"
msgstr ""
@@ -424,15 +425,15 @@ msgid "Closing Date"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "October"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "January"
msgstr ""
@@ -443,8 +444,8 @@ msgid "Key dates"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:42
+#: code:addons/hr_timesheet/report/users_timesheet.py:76
#, python-format
msgid "Thu"
msgstr ""
@@ -481,8 +482,8 @@ msgid "Analysis summary"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "December"
msgstr ""
@@ -554,8 +555,8 @@ msgid "Invoicing"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "May"
msgstr ""
@@ -589,8 +590,8 @@ msgid "Sign In By Project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "February"
msgstr ""
@@ -617,14 +618,14 @@ msgid "octobre"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/report/user_timesheet.py:0
-#: code:addons/hr_timesheet/report/users_timesheet.py:0
+#: code:addons/hr_timesheet/report/user_timesheet.py:39
+#: code:addons/hr_timesheet/report/users_timesheet.py:72
#, python-format
msgid "April"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:0
+#: code:addons/hr_timesheet/hr_timesheet.py:176
#, python-format
msgid "No analytic account defined on the project.\n"
"Please set one or we can not automatically fill the timesheet."
@@ -653,7 +654,7 @@ msgid "Stats by user"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
#, python-format
msgid "No employee defined for this user"
msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 0b69b771880..2007acd6560 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:17+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:17+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:42+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:42+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgid "Profit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:68
#, python-format
msgid "Analytic account incomplete"
msgstr ""
@@ -47,11 +47,6 @@ msgstr ""
msgid "Force to use a specific product"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
-msgid "This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically."
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid " 7 Days "
@@ -122,7 +117,6 @@ msgid "Day"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,uom_id:0
#: field:report.account.analytic.line.to.invoice,product_uom_id:0
msgid "UoM"
msgstr ""
@@ -133,8 +127,9 @@ msgid "Account"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:report.random.timesheet:0
-msgid "Random Timesheets"
+#: field:hr.timesheet.invoice.create,time:0
+#: field:hr.timesheet.invoice.create.final,time:0
+msgid "Time spent"
msgstr ""
#. module: hr_timesheet_invoice
@@ -147,11 +142,6 @@ msgstr ""
msgid "Uninvoiced line with billing rate"
msgstr ""
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Random Timesheets Lines"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,account_id:0
msgid "Project"
@@ -163,14 +153,13 @@ msgid "Sale Pricelist"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,amount:0
#: field:report.account.analytic.line.to.invoice,amount:0
msgid "Amount"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:board.board:0
-msgid "Uninvoice Lines With Billing Rate"
+#: view:account.analytic.account:0
+msgid "Reactivate Account"
msgstr ""
#. module: hr_timesheet_invoice
@@ -178,11 +167,6 @@ msgstr ""
msgid "The detail of each work done will be displayed on the invoice"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_board
-msgid "Random Timesheet"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
msgid "Create invoice from timesheet"
@@ -199,12 +183,11 @@ msgid "Analytic account to close"
msgstr ""
#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
-msgid "OpenERP allows you to create default invoicing types. You could need to regularly make discounts based on a specific contract or agreement with a customer. From this menu, you can create additional default types of invoicing that will speed up your invoicing."
+#: view:board.board:0
+msgid "Uninvoice Lines With Billing Rate"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
#: view:report.timesheet.line:0
msgid "Group By..."
msgstr ""
@@ -227,16 +210,13 @@ msgid "Final invoice for analytic account"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:76
#, python-format
msgid "Analytic Account incomplete"
msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_account
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,analytic_account_id:0
-#: field:report.random.timesheet,analytic_account_id:0
#: field:report.timesheet.line,account_id:0
#: field:report_timesheet.account,account_id:0
#: field:report_timesheet.account.date,account_id:0
@@ -307,13 +287,12 @@ msgid "Analytic account"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
#: field:report.analytic.account.close,state:0
msgid "State"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "Data Insufficient!"
msgstr ""
@@ -349,7 +328,7 @@ msgid "Lines to Invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:119
#, python-format
msgid "Error !"
msgstr ""
@@ -381,7 +360,7 @@ msgid "Timesheet Profit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:80
#, python-format
msgid "Partner incomplete"
msgstr ""
@@ -400,11 +379,6 @@ msgstr ""
msgid "July"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_report_random_timesheet
-msgid "Random Timesheet Report"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Printing date"
@@ -428,7 +402,7 @@ msgid "Theorical"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:0
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:120
#, python-format
msgid "You can not modify an invoiced analytic line!"
msgstr ""
@@ -470,7 +444,7 @@ msgid "Employee or Journal Name"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:189
#, python-format
msgid "Invoices"
msgstr ""
@@ -500,9 +474,6 @@ msgid "Currency"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,user_id:0
-#: field:report.random.timesheet,user_id:0
#: view:report.timesheet.line:0
#: field:report.timesheet.line,user_id:0
#: field:report_timesheet.account,user_id:0
@@ -552,6 +523,11 @@ msgstr ""
msgid "From"
msgstr ""
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Pending"
+msgstr ""
+
#. module: hr_timesheet_invoice
#: help:account.analytic.account,amount_invoiced:0
msgid "Total invoiced"
@@ -616,14 +592,12 @@ msgstr ""
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,date:0
#: field:hr.timesheet.invoice.create.final,date:0
-#: field:random.timesheet.lines,date:0
-#: field:report.random.timesheet,date:0
#: field:report.timesheet.line,date:0
msgid "Date"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:81
#, python-format
msgid "Please fill in the Address field in the Partner: %s."
msgstr ""
@@ -683,14 +657,19 @@ msgid "Credit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:69
#, python-format
msgid "Please fill in the partner and pricelist field in the analytic account:\n"
"%s"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
#, python-format
msgid "Error"
msgstr ""
@@ -707,9 +686,7 @@ msgid "Balance"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,quantity:0
#: field:report.analytic.account.close,quantity:0
-#: field:report.random.timesheet,quantity:0
#: view:report.timesheet.line:0
#: field:report.timesheet.line,quantity:0
#: field:report_timesheet.account,quantity:0
@@ -725,8 +702,6 @@ msgid "Date/Code"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,general_account_id:0
#: field:report.timesheet.line,general_account_id:0
msgid "General Account"
msgstr ""
@@ -783,6 +758,7 @@ msgid "Invoice"
msgstr ""
#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
#: view:hr.timesheet.analytic.cost.ledger:0
#: view:hr.timesheet.analytic.profit:0
#: view:hr.timesheet.invoice.create:0
@@ -790,6 +766,16 @@ msgstr ""
msgid "Cancel"
msgstr ""
+#. module: hr_timesheet_invoice
+#: view:account.analytic.account:0
+msgid "Close"
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
+msgid "OpenERP allows you to create default invoicing types. You might have to regularly assign discounts because of a specific contract or agreement with a customer. From this menu, you can create additional types of invoicing to speed up your invoicing."
+msgstr ""
+
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_line_stat_all
#: model:ir.model,name:hr_timesheet_invoice.model_hr_analytic_timesheet
@@ -799,7 +785,7 @@ msgid "Timesheet Line"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
#, python-format
msgid "Balance product needed"
msgstr ""
@@ -810,7 +796,7 @@ msgid "Billing Data"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:77
#, python-format
msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n"
"%s"
@@ -821,22 +807,12 @@ msgstr ""
msgid "Label for the customer"
msgstr ""
-#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Current"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.cost.ledger:0
#: view:hr.timesheet.analytic.profit:0
msgid "Print"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_random_timesheet_lines
-msgid "Random Timesheet Lines"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: selection:report.account.analytic.line.to.invoice,month:0
#: selection:report.timesheet.line,month:0
@@ -857,7 +833,7 @@ msgid "The real date of each work will be displayed on the invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120
#, python-format
msgid "At least one line has no product !"
msgstr ""
@@ -867,23 +843,11 @@ msgstr ""
msgid "Timesheets to invoice"
msgstr ""
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:0
-#, python-format
-msgid "Please fill a Balance product in the wizard"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:hr.timesheet.analytic.cost.ledger,date1:0
msgid "Start of period"
msgstr ""
-#. module: hr_timesheet_invoice
-#: field:hr.timesheet.invoice.create,time:0
-#: field:hr.timesheet.invoice.create.final,time:0
-msgid "Time spent"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_account_date_stat_all
msgid "Daily Timesheet by Account"
@@ -891,8 +855,6 @@ msgstr ""
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create,product:0
-#: view:random.timesheet.lines:0
-#: field:random.timesheet.lines,product_id:0
#: field:report.account.analytic.line.to.invoice,product_id:0
#: view:report.timesheet.line:0
#: field:report.timesheet.line,product_id:0
@@ -910,8 +872,8 @@ msgid "%"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:random.timesheet.lines,to_invoice:0
-msgid "Invoicing"
+#: field:hr_timesheet_invoice.factor,name:0
+msgid "Internal name"
msgstr ""
#. module: hr_timesheet_invoice
@@ -934,7 +896,12 @@ msgid "The product that will be used to invoice the remaining amount"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:0
+#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree
+msgid "This list shows you every task you can invoice to the customer. Select the lines and click the Action button to generate the invoices automatically."
+msgstr ""
+
+#. module: hr_timesheet_invoice
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py:58
#, python-format
msgid "No Records Found for Report!"
msgstr ""
@@ -953,11 +920,6 @@ msgstr ""
msgid "This Month"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_random_timesheet_lines_board
-msgid "Working Hours"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.cost.ledger:0
msgid "Select Period"
@@ -997,16 +959,6 @@ msgstr ""
msgid "Employees"
msgstr ""
-#. module: hr_timesheet_invoice
-#: field:report.account.analytic.line.to.invoice,name:0
-#: view:report.timesheet.line:0
-#: field:report.timesheet.line,name:0
-#: field:report_timesheet.account,name:0
-#: field:report_timesheet.account.date,name:0
-#: field:report_timesheet.user,name:0
-msgid "Year"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timesheet_user
msgid "Timesheets per day"
@@ -1042,8 +994,8 @@ msgid "Timesheets per account"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:hr_timesheet_invoice.factor,name:0
-msgid "Internal name"
+#: field:hr.timesheet.invoice.create,name:0
+msgid "Description"
msgstr ""
#. module: hr_timesheet_invoice
@@ -1063,10 +1015,9 @@ msgid "Analytic Lines to Invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: field:hr.timesheet.invoice.create,name:0
-#: field:random.timesheet.lines,name:0
-#: field:report.random.timesheet,name:0
-msgid "Description"
+#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:147
+#, python-format
+msgid "Please fill a Balance product in the wizard"
msgstr ""
#. module: hr_timesheet_invoice
@@ -1085,7 +1036,12 @@ msgid "Cost"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:random.timesheet.lines:0
-msgid "Search Timesheet Lines"
+#: field:report.account.analytic.line.to.invoice,name:0
+#: view:report.timesheet.line:0
+#: field:report.timesheet.line,name:0
+#: field:report_timesheet.account,name:0
+#: field:report_timesheet.account.date,name:0
+#: field:report_timesheet.user,name:0
+msgid "Year"
msgstr ""
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index beab0a3d3da..e517f1d04ea 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:43+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
#: constraint:hr_timesheet_sheet.sheet:0
#, python-format
msgid "You can not have 2 timesheets that overlaps !\n"
@@ -37,7 +37,7 @@ msgid "Service"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "No employee defined for your user !"
msgstr ""
@@ -74,7 +74,7 @@ msgid "Today"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
#, python-format
msgid "Please verify that the total difference of the sheet is lower than %.2f !"
msgstr ""
@@ -146,7 +146,8 @@ msgid "Total Cost"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
#, python-format
msgid "UserError"
msgstr ""
@@ -158,7 +159,8 @@ msgid "Refuse"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:608
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:624
#, python-format
msgid "You cannot enter an attendance date outside the current timesheet dates!"
msgstr ""
@@ -169,7 +171,7 @@ msgid "My Timesheet opens your timesheet so that you can book your activities in
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
#, python-format
msgid "You can not sign in from an other date than today"
msgstr ""
@@ -186,7 +188,7 @@ msgid "Validation"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:199
#, python-format
msgid "Warning !"
msgstr ""
@@ -311,7 +313,7 @@ msgid "New"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
#, python-format
msgid "You cannot duplicate a timesheet !"
msgstr ""
@@ -322,8 +324,16 @@ msgid "My Total Attendances By Week"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:174
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:188
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "Error !"
msgstr ""
@@ -360,7 +370,8 @@ msgid "No employee defined"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -382,7 +393,8 @@ msgid "Configuration"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:179
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:186
#, python-format
msgid "You cannot create a timesheet for an employee that does not have any user defined !"
msgstr ""
@@ -509,12 +521,6 @@ msgstr ""
msgid "Timesheet allowed difference(Hours)"
msgstr ""
-#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
-#, python-format
-msgid "You can not sign out from an other date than today"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
msgid "The invoice is created based on the timesheet."
@@ -554,7 +560,8 @@ msgid "Current Status"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:604
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:631
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet !"
msgstr ""
@@ -618,6 +625,11 @@ msgstr ""
msgid "October"
msgstr ""
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid "Check your timesheets for a specific period. You can also encode time spent on a project (i.e. an analytic account) thus generating costs in the analytic account concerned."
+msgstr ""
+
#. module: hr_timesheet_sheet
#: selection:hr.timesheet.report,month:0
#: selection:timesheet.report,month:0
@@ -659,7 +671,8 @@ msgid "Period"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:480
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:494
#, python-format
msgid "You can not modify an entry in a confirmed timesheet !"
msgstr ""
@@ -696,8 +709,8 @@ msgid "Validated"
msgstr ""
#. module: hr_timesheet_sheet
-#: view:hr.timesheet.current.open:0
-msgid "Open"
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
msgstr ""
#. module: hr_timesheet_sheet
@@ -706,13 +719,13 @@ msgid "Timesheet by Accounts"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:0
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
#, python-format
msgid "Open Timesheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:372
#, python-format
msgid "Cannot delete Sheet(s) which are already confirmed !"
msgstr ""
@@ -742,7 +755,7 @@ msgid "Search Timesheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:170
#, python-format
msgid "The timesheet cannot be validated as it does not contain equal no. of sign ins and sign outs!"
msgstr ""
@@ -796,7 +809,7 @@ msgid "Sign Out"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:374
#, python-format
msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
msgstr ""
@@ -861,11 +874,6 @@ msgstr ""
msgid "Invoice rate"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
-msgid "Invoice on Work"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Approve"
@@ -888,11 +896,6 @@ msgstr ""
msgid "#Total Attendance"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
-msgid "This view allows you to check timesheet sheets following a specific period. You can also encode time spent on a project that is an analytic account and the time spent on a project generate costs on the analytic account."
-msgstr ""
-
#. module: hr_timesheet_sheet
#: field:hr.timesheet.report,cost:0
msgid "Cost"
@@ -918,6 +921,11 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Open"
+msgstr ""
+
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "To Approve"
diff --git a/addons/html_view/i18n/html_view.pot b/addons/html_view/i18n/html_view.pot
index c7c2abe8946..792ee770015 100644
--- a/addons/html_view/i18n/html_view.pot
+++ b/addons/html_view/i18n/html_view.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:43+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:43+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index 329f879048a..338d62f84e9 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:44+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgid "March"
msgstr ""
#. module: idea
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/wizard/idea_post_vote.py:92
#, python-format
msgid "Idea must be in 'Open' state before vote for that idea."
msgstr ""
@@ -124,8 +124,9 @@ msgid "Category of ideas"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:0
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/idea.py:253
+#: code:addons/idea/wizard/idea_post_vote.py:89
+#: code:addons/idea/wizard/idea_post_vote.py:92
#, python-format
msgid "Warning !"
msgstr ""
@@ -170,7 +171,7 @@ msgid "# of Lines"
msgstr ""
#. module: idea
-#: code:addons/idea/wizard/idea_post_vote.py:0
+#: code:addons/idea/wizard/idea_post_vote.py:89
#, python-format
msgid "You can not give Vote for this idea more than %s times"
msgstr ""
@@ -597,7 +598,7 @@ msgid "Refused"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:0
+#: code:addons/idea/idea.py:253
#, python-format
msgid "Draft/Accepted/Cancelled ideas Could not be voted"
msgstr ""
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index e934613de1a..8b876bf2426 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:44+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:44+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/l10n_be/i18n/l10n_be.pot b/addons/l10n_be/i18n/l10n_be.pot
index 071d8436301..d91b04398c4 100644
--- a/addons/l10n_be/i18n/l10n_be.pot
+++ b/addons/l10n_be/i18n/l10n_be.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:22+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:22+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:46+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:46+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,14 +16,82 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_receiv
-msgid "Tiers - Recevable"
+#: field:partner.vat,test_xml:0
+#: field:partner.vat.intra,test_xml:0
+msgid "Test XML file"
msgstr ""
#. module: l10n_be
-#: field:l1on_be.vat.declaration,tax_code_id:0
-#: field:partner.vat.intra,tax_code_id:0
-msgid "Tax Code"
+#: field:vat.listing.clients,name:0
+msgid "Client Name"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "XML File has been Created."
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#, python-format
+msgid "No partner has a VAT Number asociated with him."
+msgstr ""
+
+#. module: l10n_be
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat,test_xml:0
+#: help:partner.vat.intra,test_xml:0
+msgid "Sets the XML output as test file"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "No VAT Number Associated with Main Company!"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:64
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:122
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
+#, python-format
+msgid "Data Insufficient!"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+#: view:partner.vat.list:0
+msgid "Create XML"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+#: view:partner.vat.intra:0
+msgid "Save the File with '.xml' extension."
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Save XML"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:150
+#, python-format
+msgid "Save"
msgstr ""
#. module: l10n_be
@@ -32,20 +100,38 @@ msgid "Régime Intra-Communautaire"
msgstr ""
#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat_intra
-#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
-msgid "Partner VAT Intra"
+#: field:l1on_be.vat.declaration,msg:0
+#: field:partner.vat.intra,msg:0
+#: field:partner.vat.list,msg:0
+msgid "File created"
msgstr ""
#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:116
#, python-format
msgid "Save XML For Vat declaration"
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_immo
-msgid "Immobilisation"
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
+#, python-format
+msgid "The period code you entered is not valid."
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_resitution:0
+msgid "It indicates whether a resitution is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
+msgid "Vat Declaraion"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+#: field:partner.vat.intra,no_vat:0
+msgid "Partner With No VAT"
msgstr ""
#. module: l10n_be
@@ -55,13 +141,122 @@ msgid "Company"
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers_payable
-msgid "Tiers - Payable"
+#: field:l1on_be.vat.declaration,tax_code_id:0
+#: field:partner.vat.intra,tax_code_id:0
+msgid "Tax Code"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_list
+msgid "partner.vat.list"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
+msgid "Annual Listing Of VAT-Subjected Customers"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
+msgid "Belgium - Plan Comptable Minimum Normalise"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "Select Fiscal Year"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_resitution:0
+msgid "Ask Restitution"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_partner_vat_intra
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
+msgid "Partner VAT Intra"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
+#: view:l1on_be.vat.declaration:0
+msgid "Periodical VAT Declaration"
msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
-msgid "Save XML"
+msgid "Note: "
+msgstr ""
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
+msgid "Régime National"
+msgstr ""
+
+#. module: l10n_be
+#: view:vat.listing.clients:0
+msgid "VAT listing"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.intra:0
+msgid "Periods"
+msgstr ""
+
+#. module: l10n_be
+#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
+msgid "Régime Extra-Communautaire"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat,limit_amount:0
+msgid "Limit Amount"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Ok"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,no_vat:0
+msgid "The Partner whose VAT number is not defined they doesn't include in XML File."
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,vat:0
+msgid "VAT"
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,country:0
+msgid "Country"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+#: field:partner.vat.list,partner_ids:0
+msgid "Clients"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,client_nihil:0
+msgid "Tick this case only if it concerns only the last statement on the civil or cessation of activity"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.intra,period_ids:0
+msgid "Select here the period(s) you want to include in your intracom declaration"
msgstr ""
#. module: l10n_be
@@ -69,14 +264,57 @@ msgstr ""
msgid "Amount"
msgstr ""
+#. module: l10n_be
+#: model:ir.model,name:l10n_be.model_vat_listing_clients
+msgid "vat.listing.clients"
+msgstr ""
+
#. module: l10n_be
#: view:l1on_be.vat.declaration:0
msgid "Is Last Declaration"
msgstr ""
#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_vat_listing_clients
-msgid "vat.listing.clients"
+#: model:ir.model,name:l10n_be.model_partner_vat
+msgid "partner.vat"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,client_nihil:0
+msgid "Last Declaration of Enterprise"
+msgstr ""
+
+#. module: l10n_be
+#: help:l1on_be.vat.declaration,ask_payment:0
+msgid "It indicates whether a payment is to made or not?"
+msgstr ""
+
+#. module: l10n_be
+#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:155
+#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:69
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:88
+#, python-format
+msgid "Data Insufficient"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
+msgid "Belgium Statements"
+msgstr ""
+
+#. module: l10n_be
+#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
+msgid "Partner Vat Intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:vat.listing.clients,turnover:0
+msgid "Turnover"
+msgstr ""
+
+#. module: l10n_be
+#: view:l1on_be.vat.declaration:0
+msgid "Declare Periodical VAT"
msgstr ""
#. module: l10n_be
@@ -86,13 +324,21 @@ msgid "This identifies the representative of the sending company. This is a stri
msgstr ""
#. module: l10n_be
-#: field:vat.listing.clients,vat:0
-msgid "VAT"
+#: view:l1on_be.vat.declaration:0
+msgid "Save xml"
msgstr ""
#. module: l10n_be
-#: field:vat.listing.clients,turnover:0
-msgid "Turnover"
+#: field:partner.vat,mand_id:0
+#: field:partner.vat.intra,mand_id:0
+msgid "MandataireId"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,file_save:0
+#: field:partner.vat.intra,file_save:0
+#: field:partner.vat.list,file_save:0
+msgid "Save File"
msgstr ""
#. module: l10n_be
@@ -108,125 +354,26 @@ msgid "This is where you have to set the period code for the intracom declaratio
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tax
-msgid "Tax"
+#: field:l1on_be.vat.declaration,name:0
+#: field:partner.vat.intra,name:0
+#: field:partner.vat.list,name:0
+msgid "File Name"
msgstr ""
#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:95
#, python-format
-msgid "No VAT Number Associated with Main Company!"
+msgid "Wrong Period Code"
msgstr ""
#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "XML File has been Created."
+#: field:partner.vat,fyear:0
+msgid "Fiscal Year"
msgstr ""
#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_financiers
-msgid "Financier"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat:0
-msgid "View Client"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Please select at least one Period."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1
-msgid "Régime National"
-msgstr ""
-
-#. module: l10n_be
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat,test_xml:0
-#: help:partner.vat.intra,test_xml:0
-msgid "Sets the XML output as test file"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Data Insufficient!"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.list,partner_ids:0
-msgid "You can remove clients/partners which you do not want to show in xml file"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Save"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "General Information"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,file_save:0
-#: field:partner.vat.intra,file_save:0
-#: field:partner.vat.list,file_save:0
-msgid "Save File"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "Select Fiscal Year"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.intra,period_ids:0
-msgid "Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_tiers
-msgid "Tiers"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-msgid "You can remove clients/partners which you do not want in exported xml file"
-msgstr ""
-
-#. module: l10n_be
-#: help:l1on_be.vat.declaration,client_nihil:0
-msgid "Tick this case only if it concerns only the last statement on the civil or cessation of activity"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.list:0
-#: field:partner.vat.list,partner_ids:0
-msgid "Clients"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,test_xml:0
-#: field:partner.vat.intra,test_xml:0
-msgid "Test XML file"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Save xml"
+#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
+msgid "Vat Declaration"
msgstr ""
#. module: l10n_be
@@ -235,100 +382,6 @@ msgstr ""
msgid "European Countries"
msgstr ""
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Create an XML file for Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Partner VAT intra"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,msg:0
-#: field:partner.vat.intra,msg:0
-#: field:partner.vat.list,msg:0
-msgid "File created"
-msgstr ""
-
-#. module: l10n_be
-#: help:l1on_be.vat.declaration,ask_resitution:0
-msgid "It indicates whether a resitution is to made or not?"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat_list
-msgid "partner.vat.list"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,ask_resitution:0
-msgid "Ask Restitution"
-msgstr ""
-
-#. module: l10n_be
-#: help:partner.vat.intra,no_vat:0
-msgid "The Partner whose VAT number is not defined they doesn't include in XML File."
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
-msgid "Vat Declaraion"
-msgstr ""
-
-#. module: l10n_be
-#: view:vat.listing.clients:0
-msgid "VAT listing"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_produit
-msgid "Produit"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,limit_amount:0
-msgid "Limit Amount"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_2
-msgid "Régime Extra-Communautaire"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.actions.act_window,name:l10n_be.action_vat_intra
-msgid "Partner Vat Intra"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,mand_id:0
-#: field:partner.vat.intra,mand_id:0
-msgid "MandataireId"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Wrong Period Code"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
-msgid "Vat Declaration"
-msgstr ""
-
#. module: l10n_be
#: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing
#: view:partner.vat:0
@@ -337,13 +390,37 @@ msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
-#: field:partner.vat.intra,no_vat:0
-msgid "Partner With No VAT"
+msgid "General Information"
+msgstr ""
+
+#. module: l10n_be
+#: help:partner.vat.list,partner_ids:0
+msgid "You can remove clients/partners which you do not want to show in xml file"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat.list:0
+msgid "You can remove clients/partners which you do not want in exported xml file"
msgstr ""
#. module: l10n_be
#: view:partner.vat.intra:0
-msgid "Periods"
+msgid "Create an XML file for Vat Intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_code:0
+msgid "Period Code"
+msgstr ""
+
+#. module: l10n_be
+#: field:l1on_be.vat.declaration,ask_payment:0
+msgid "Ask Payment"
+msgstr ""
+
+#. module: l10n_be
+#: view:partner.vat:0
+msgid "View Client"
msgstr ""
#. module: l10n_be
@@ -359,145 +436,9 @@ msgid "Close"
msgstr ""
#. module: l10n_be
-#: field:partner.vat.intra,period_ids:0
-msgid "Period (s)"
-msgstr ""
-
-#. module: l10n_be
-#: field:vat.listing.clients,name:0
-msgid "Client Name"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
+#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:125
#, python-format
-msgid "No partner has a VAT Number asociated with him."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_charge
-msgid "Charge"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-#: view:partner.vat.intra:0
-#: view:partner.vat.list:0
-msgid "Create XML"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_capitaux
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-#: view:partner.vat.intra:0
-msgid "Save the File with '.xml' extension."
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Ok"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "The period code you entered is not valid."
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_stock
-msgid "Stock et Encours"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.partner_vat_listing
-msgid "Annual Listing Of VAT-Subjected Customers"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.module.module,shortdesc:l10n_be.module_meta_information
-msgid "Belgium - Plan Comptable Minimum Normalise"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat.intra:0
-msgid "Note: "
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
-#: view:l1on_be.vat.declaration:0
-msgid "Periodical VAT Declaration"
-msgstr ""
-
-#. module: l10n_be
-#: model:account.account.type,name:l10n_be.user_type_view
-msgid "Vue"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,ask_payment:0
-msgid "Ask Payment"
-msgstr ""
-
-#. module: l10n_be
-#: field:vat.listing.clients,country:0
-msgid "Country"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat,fyear:0
-msgid "Fiscal Year"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,client_nihil:0
-msgid "Last Declaration of Enterprise"
-msgstr ""
-
-#. module: l10n_be
-#: code:addons/l10n_be/wizard/l10_be_partner_vat_listing.py:0
-#: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:0
-#: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:0
-#, python-format
-msgid "Data Insufficient"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
-msgid "Belgium Statements"
-msgstr ""
-
-#. module: l10n_be
-#: view:l1on_be.vat.declaration:0
-msgid "Declare Periodical VAT"
-msgstr ""
-
-#. module: l10n_be
-#: model:ir.model,name:l10n_be.model_partner_vat
-msgid "partner.vat"
-msgstr ""
-
-#. module: l10n_be
-#: field:l1on_be.vat.declaration,name:0
-#: field:partner.vat.intra,name:0
-#: field:partner.vat.list,name:0
-msgid "File Name"
-msgstr ""
-
-#. module: l10n_be
-#: field:partner.vat.intra,period_code:0
-msgid "Period Code"
-msgstr ""
-
-#. module: l10n_be
-#: view:partner.vat:0
-msgid "This wizard will create an XML file for Vat details and total invoiced amounts per partner."
+msgid "Please select at least one Period."
msgstr ""
#. module: l10n_be
@@ -523,7 +464,12 @@ msgid "\n"
msgstr ""
#. module: l10n_be
-#: help:l1on_be.vat.declaration,ask_payment:0
-msgid "It indicates whether a payment is to made or not?"
+#: view:partner.vat.intra:0
+msgid "Partner VAT intra"
+msgstr ""
+
+#. module: l10n_be
+#: field:partner.vat.intra,period_ids:0
+msgid "Period (s)"
msgstr ""
diff --git a/addons/l10n_es/i18n/l10n_es.pot b/addons/l10n_es/i18n/l10n_es.pot
index 3e5e90d0007..218bd78a35d 100644
--- a/addons/l10n_es/i18n/l10n_es.pot
+++ b/addons/l10n_es/i18n/l10n_es.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:27+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:27+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:50+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:50+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
+msgid "Régimen Nacional"
+msgstr ""
+
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_extra
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_extra
@@ -27,92 +33,12 @@ msgstr ""
msgid "Retención IRPF 15%"
msgstr ""
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.stock
-msgid "Existencias"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
-#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
-msgid "Recargo de Equivalencia"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros - rec
-msgid "Terceros - A Cobrar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.capital
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros
-msgid "Terceros"
-msgstr ""
-
#. module: l10n_es
#: model:account.fiscal.position.template,name:l10n_es.fp_irpf1
#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf1
msgid "Retención IRPF 1%"
msgstr ""
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.terceros - pay
-msgid "Terceros - A Pagar"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos_neto
-msgid "Gastos patrimonio neto"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.tax
-msgid "Impuestos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
-msgid "Retención IRPF 7%"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_nacional
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_nacional
-msgid "Régimen Nacional"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.inmo
-msgid "Inmobilizado"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
-msgid "Retención IRPF 18%"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.account.type,name:l10n_es.view
-msgid "View"
-msgstr ""
-
-#. module: l10n_es
-#: model:account.fiscal.position.template,name:l10n_es.fp_intra
-#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
-msgid "Régimen Intracomunitario"
-msgstr ""
-
#. module: l10n_es
#: model:ir.module.module,description:l10n_es.module_meta_information
msgid "Spanish Charts of Accounts (PGCE 2008)\n"
@@ -129,18 +55,27 @@ msgid "Spanish Charts of Accounts (PGCE 2008)\n"
msgstr ""
#. module: l10n_es
-#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
-msgid "Spanish Charts of Accounts (PGCE 2008)"
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_recargo
+#: model:account.fiscal.position.template,name:l10n_es.fp_recargo
+msgid "Recargo de Equivalencia"
msgstr ""
#. module: l10n_es
-#: model:account.account.type,name:l10n_es.ingresos_neto
-msgid "Ingresos patrimonio neto"
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf7
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf7
+msgid "Retención IRPF 7%"
msgstr ""
#. module: l10n_es
-#: model:account.account.type,name:l10n_es.financieras
-msgid "Financieras"
+#: model:account.fiscal.position.template,name:l10n_es.fp_irpf18
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_irpf18
+msgid "Retención IRPF 18%"
+msgstr ""
+
+#. module: l10n_es
+#: model:account.fiscal.position.template,name:l10n_es.fp_intra
+#: model:account.fiscal.position.template,name:l10n_es.fp_pymes_intra
+msgid "Régimen Intracomunitario"
msgstr ""
#. module: l10n_es
@@ -156,7 +91,7 @@ msgid "Retención IRPF 2%"
msgstr ""
#. module: l10n_es
-#: model:account.account.type,name:l10n_es.gastos
-msgid "Gastos"
+#: model:ir.module.module,shortdesc:l10n_es.module_meta_information
+msgid "Spanish Charts of Accounts (PGCE 2008)"
msgstr ""
diff --git a/addons/l10n_fr/i18n/l10n_fr.pot b/addons/l10n_fr/i18n/l10n_fr.pot
index a9665579cc6..37ef8a71197 100644
--- a/addons/l10n_fr/i18n/l10n_fr.pot
+++ b/addons/l10n_fr/i18n/l10n_fr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:28+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:28+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:52+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:52+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,45 +15,12 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_fr
-#: model:ir.module.module,description:l10n_fr.module_meta_information
-msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
-"\n"
-"Credits: Sistheo Zeekom CrysaLEAD\n"
-""
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_immobilisations
-msgid "Immobilisations"
-msgstr ""
-
#. module: l10n_fr
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
msgid "France"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_equity
-msgid "Equity"
-msgstr ""
-
#. module: l10n_fr
#: view:account.bilan.report:0
#: view:account.cdr.report:0
@@ -66,8 +33,11 @@ msgid "Account Bilan Report"
msgstr ""
#. module: l10n_fr
-#: model:ir.model,name:l10n_fr.model_l10n_fr_report
-msgid "Report for l10n_fr"
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid "This is the module to manage the accounting chart for France in OpenERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+""
msgstr ""
#. module: l10n_fr
@@ -75,34 +45,19 @@ msgstr ""
msgid "Zone Euro"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_expense
-msgid "Expense"
-msgstr ""
-
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_account_cdr_report
msgid "Account CDR Report"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_provision
-msgid "Provisions"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_payable
-msgid "Payable"
-msgstr ""
-
#. module: l10n_fr
#: view:account.cdr.report:0
msgid "Compte de resultant"
msgstr ""
#. module: l10n_fr
-#: field:l10n.fr.line,report_id:0
-msgid "Report"
+#: sql_constraint:l10n.fr.report:0
+msgid "The code report must be unique !"
msgstr ""
#. module: l10n_fr
@@ -110,11 +65,6 @@ msgstr ""
msgid "Hors Euro"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_commitment
-msgid "Engagements"
-msgstr ""
-
#. module: l10n_fr
#: model:ir.model,name:l10n_fr.model_l10n_fr_line
msgid "Report Lines for l10n_fr"
@@ -141,29 +91,14 @@ msgstr ""
msgid "Compte de resultat Report"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stock
-msgid "Stocks"
-msgstr ""
-
#. module: l10n_fr
#: field:l10n.fr.report,line_ids:0
msgid "Lines"
msgstr ""
#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_special
-msgid "Comptes spéciaux"
-msgstr ""
-
-#. module: l10n_fr
-#: sql_constraint:l10n.fr.report:0
-msgid "The code report must be unique !"
+#: field:l10n.fr.line,report_id:0
+msgid "Report"
msgstr ""
#. module: l10n_fr
@@ -173,18 +108,8 @@ msgid "Fiscal Year"
msgstr ""
#. module: l10n_fr
-#: field:l10n.fr.report,code:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_dettes
-msgid "Dettes long terme"
-msgstr ""
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_view
-msgid "View"
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
msgstr ""
#. module: l10n_fr
@@ -193,8 +118,8 @@ msgid "The variable name must be unique !"
msgstr ""
#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stocks
-msgid "Actif circulant"
+#: field:l10n.fr.report,code:0
+msgid "Code"
msgstr ""
#. module: l10n_fr
@@ -213,11 +138,6 @@ msgstr ""
msgid "France - Plan Comptable Général"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_tax
-msgid "Tax"
-msgstr ""
-
#. module: l10n_fr
#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
msgid "DOM-TOM"
@@ -229,11 +149,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_cloture
-msgid "Cloture"
-msgstr ""
-
#. module: l10n_fr
#: field:l10n.fr.line,code:0
msgid "Variable Name"
diff --git a/addons/l10n_fr/test/l10n_fr_report.yml b/addons/l10n_fr/test/l10n_fr_report.yml
index 7cf9b161223..aadd2c97311 100644
--- a/addons/l10n_fr/test/l10n_fr_report.yml
+++ b/addons/l10n_fr/test/l10n_fr_report.yml
@@ -1,23 +1,9 @@
--
- In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
--
- !record {model: account.fiscalyear, id: account_fiscalyear_01}:
- code: FY2011
- company_id: base.main_company
- date_start: '2012-01-01'
- date_stop: '2012-12-31'
- name: Fiscal Year 2012
--
- I create the fiscal periods
--
- !python {model: account.fiscalyear}:
- self.create_period(cr, uid, [ref('account_fiscalyear_01'),])
-
In order to test the PDF reports defined on a l10n_fr, we will print an Account Move Line Report for l10n_fr
-
!python {model: account.move.line}: |
import netsvc, tools, os, time
- (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account_fiscalyear_01')}}, {})
+ (data, format) = netsvc.LocalService('report.l10n.fr.bilan').create(cr, uid, [], {'model':'account.move.line', 'form':{'fiscalyear_id': ref('account.data_fiscalyear')}}, {})
if tools.config['test_report_directory']:
file(os.path.join(tools.config['test_report_directory'], 'l10n_fr-bilan_report.'+format), 'wb+').write(data)
diff --git a/addons/l10n_gr/i18n/l10n_gr.pot b/addons/l10n_gr/i18n/l10n_gr.pot
index 5564bce48de..14ae239e816 100644
--- a/addons/l10n_gr/i18n/l10n_gr.pot
+++ b/addons/l10n_gr/i18n/l10n_gr.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:29+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:29+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,26 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
#. module: l10n_gr
#: model:ir.module.module,description:l10n_gr.module_meta_information
msgid "This is the base module to manage the accounting chart for Greece."
msgstr ""
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_tax
-msgid "Tax"
-msgstr ""
-
#. module: l10n_gr
#: model:ir.module.module,shortdesc:l10n_gr.module_meta_information
msgid "Greece - minimal"
@@ -46,38 +31,3 @@ msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pa
" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_payable
-msgid "Payable"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_other
-msgid "Other"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_gr
-#: model:account.account.type,name:l10n_gr.account_type_view
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index da81c7b11e4..034fd23f52d 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,43 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_vista
-msgid "Vista"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_cxp
-msgid "Cuentas por Pagar"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_cxc
-msgid "Cuentas por Cobrar"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,description:l10n_gt.module_meta_information
-msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_gastos
-msgid "Gastos"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_pasivo
-msgid "Pasivo"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_ingresos
-msgid "Ingresos"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_activo
-msgid "Activo"
+#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
+msgid "Guatemala - Plan contable general"
msgstr ""
#. module: l10n_gt
@@ -61,17 +26,7 @@ msgid "Generar la nomenclatura contable a partir de un modelo. Deberá seleccio
msgstr ""
#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_capital
-msgid "Capital"
-msgstr ""
-
-#. module: l10n_gt
-#: model:ir.module.module,shortdesc:l10n_gt.module_meta_information
-msgid "Guatemala - Plan contable general"
-msgstr ""
-
-#. module: l10n_gt
-#: model:account.account.type,name:l10n_gt.cuenta_efectivo
-msgid "Efectivo"
+#: model:ir.module.module,description:l10n_gt.module_meta_information
+msgid "Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency"
msgstr ""
diff --git a/addons/l10n_in/i18n/l10n_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index 7ba3b01b31c..b702fb84a6b 100644
--- a/addons/l10n_in/i18n/l10n_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:30+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:30+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:53+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset_view
-msgid "Asset View"
-msgstr ""
-
#. module: l10n_in
#: model:ir.module.module,description:l10n_in.module_meta_information
msgid "\n"
@@ -28,13 +23,8 @@ msgid "\n"
msgstr ""
#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense_view
-msgid "Expense View"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income_view
-msgid "Income View"
+#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+msgid "Indian Chart of Account"
msgstr ""
#. module: l10n_in
@@ -43,43 +33,3 @@ msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pa
" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability1
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_asset1
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_closed1
-msgid "Closed"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_income1
-msgid "Income"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_liability_view
-msgid "Liability View"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_expense1
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
-msgid "Indian Chart of Account"
-msgstr ""
-
-#. module: l10n_in
-#: model:account.account.type,name:l10n_in.account_type_root_ind1
-msgid "View"
-msgstr ""
-
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
index c1d6d6de6fd..9687635e7a8 100644
--- a/addons/l10n_lu/i18n/l10n_lu.pot
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:32+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:32+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:54+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,25 +20,14 @@ msgstr ""
msgid "Print Tax Statements"
msgstr ""
-#. module: l10n_lu
-#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
-#: model:ir.model,name:l10n_lu.model_vat_declaration_report
-msgid "VAT Declaration Report"
-msgstr ""
-
#. module: l10n_lu
#: field:vat.declaration.report,tax_code_id:0
msgid "Company"
msgstr ""
#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_moves
-msgid "Cash"
+#: field:vat.declaration.report,period_id:0
+msgid "Period"
msgstr ""
#. module: l10n_lu
@@ -57,12 +46,7 @@ msgid "\n"
msgstr ""
#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_liability
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
+#: code:addons/l10n_lu/wizard/print_vat.py:65
#, python-format
msgid "pdf not created !"
msgstr ""
@@ -73,26 +57,11 @@ msgid "VAT Declaration"
msgstr ""
#. module: l10n_lu
-#: field:vat.declaration.report,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_lu
-#: code:addons/l10n_lu/wizard/print_vat.py:0
+#: code:addons/l10n_lu/wizard/print_vat.py:65
#, python-format
msgid "Please check if package pdftk is installed!"
msgstr ""
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_cash_equity
-msgid "Equity"
-msgstr ""
-
#. module: l10n_lu
#: view:vat.declaration.report:0
msgid "Cancel"
@@ -104,17 +73,8 @@ msgid "Luxembourg - Plan Comptable Minimum Normalise"
msgstr ""
#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_creances
-msgid "Créances"
-msgstr ""
-
-#. module: l10n_lu
-#: model:account.account.type,name:l10n_lu.account_type_root
-msgid "View"
+#: model:ir.actions.act_window,name:l10n_lu.action_vat_report
+#: model:ir.model,name:l10n_lu.model_vat_declaration_report
+msgid "VAT Declaration Report"
msgstr ""
diff --git a/addons/l10n_ma/i18n/l10n_ma.pot b/addons/l10n_ma/i18n/l10n_ma.pot
index 7913362a486..dd7643a0278 100644
--- a/addons/l10n_ma/i18n/l10n_ma.pot
+++ b/addons/l10n_ma/i18n/l10n_ma.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:33+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:33+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:55+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,48 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: l10n_ma
-#: model:ir.module.module,description:l10n_ma.module_meta_information
-msgid "Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_imm
-msgid "Immobilisations"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_ach
-msgid "Charges Achats"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_tpl
-msgid "Titres de placement"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_vue
-msgid "Vue"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_dct
-msgid "Dettes à court terme"
-msgstr ""
-
-#. module: l10n_ma
-#: field:l10n.ma.line,report_id:0
-msgid "Report"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_stk
-msgid "Stocks"
-msgstr ""
-
-#. module: l10n_ma
-#: field:l10n.ma.line,code:0
-msgid "Variable Name"
+#: sql_constraint:l10n.ma.line:0
+msgid "The variable name must be unique !"
msgstr ""
#. module: l10n_ma
@@ -66,8 +26,13 @@ msgid "Definition"
msgstr ""
#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_dlt
-msgid "Dettes à long terme"
+#: model:ir.model,name:l10n_ma.model_l10n_ma_report
+msgid "Report for l10n_ma_kzc"
+msgstr ""
+
+#. module: l10n_ma
+#: field:l10n.ma.report,code:0
+msgid "Code"
msgstr ""
#. module: l10n_ma
@@ -77,13 +42,13 @@ msgid "Name"
msgstr ""
#. module: l10n_ma
-#: field:l10n.ma.report,line_ids:0
-msgid "Lines"
+#: model:ir.module.module,description:l10n_ma.module_meta_information
+msgid "Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010"
msgstr ""
#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_tax
-msgid "Taxes"
+#: field:l10n.ma.report,line_ids:0
+msgid "Lines"
msgstr ""
#. module: l10n_ma
@@ -102,52 +67,12 @@ msgid "Maroc - Plan Comptable Général"
msgstr ""
#. module: l10n_ma
-#: sql_constraint:l10n.ma.line:0
-msgid "The variable name must be unique !"
+#: field:l10n.ma.line,report_id:0
+msgid "Report"
msgstr ""
#. module: l10n_ma
-#: model:ir.model,name:l10n_ma.model_l10n_ma_report
-msgid "Report for l10n_ma_kzc"
-msgstr ""
-
-#. module: l10n_ma
-#: field:l10n.ma.report,code:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_per
-msgid "Charges Personnel"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_liq
-msgid "Liquidité"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_pdt
-msgid "Produits"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_reg
-msgid "Régularisation"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_cp
-msgid "Capitaux Propres"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_cre
-msgid "Créances"
-msgstr ""
-
-#. module: l10n_ma
-#: model:account.account.type,name:l10n_ma.cpt_type_aut
-msgid "Charges Autres"
+#: field:l10n.ma.line,code:0
+msgid "Variable Name"
msgstr ""
diff --git a/addons/l10n_uk/i18n/l10n_uk.pot b/addons/l10n_uk/i18n/l10n_uk.pot
index 1c3372445c6..fe712bbc694 100644
--- a/addons/l10n_uk/i18n/l10n_uk.pot
+++ b/addons/l10n_uk/i18n/l10n_uk.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:36+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:36+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:58+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:58+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,57 +15,6 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_receivable
-msgid "Receivable"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_asset_view
-msgid "Asset View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_expense
-msgid "Expense"
-msgstr ""
-
-#. module: l10n_uk
-#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_income_view
-msgid "Income View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_income
-msgid "Income"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_tax
-msgid "Tax"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_cash
-msgid "Cash"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_liability
-msgid "Liability"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_payable
-msgid "Payable"
-msgstr ""
-
#. module: l10n_uk
#: model:ir.module.module,shortdesc:l10n_uk.module_meta_information
msgid "United Kingdom - minimal"
@@ -77,27 +26,8 @@ msgid "This is the base module to manage the accounting chart for United Kingdom
msgstr ""
#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_asset
-msgid "Asset"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_equity
-msgid "Equity"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_liability_view
-msgid "Liability View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.acct_type_expense_view
-msgid "Expense View"
-msgstr ""
-
-#. module: l10n_uk
-#: model:account.account.type,name:l10n_uk.account_type_view
-msgid "View"
+#: model:ir.actions.todo,note:l10n_uk.config_call_account_template_uk_minimal
+msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
+" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
msgstr ""
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index f262558ff6b..157e540c611 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot
index 06ca7604705..46ebf92f2a7 100644
--- a/addons/mail_gateway/i18n/mail_gateway.pot
+++ b/addons/mail_gateway/i18n/mail_gateway.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:37+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:37+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,9 @@ msgid "Resource ID"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:68
+#: code:addons/mail_gateway/mail_gateway.py:71
+#: code:addons/mail_gateway/mail_gateway.py:89
#, python-format
msgid "Method is not implemented"
msgstr ""
@@ -58,7 +60,7 @@ msgid "Mailgateway History"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:249
#, python-format
msgid "Note"
msgstr ""
@@ -111,7 +113,7 @@ msgid "Partner"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:242
#, python-format
msgid " wrote on "
msgstr ""
@@ -164,7 +166,7 @@ msgid "Mailgateway Threads"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:247
#, python-format
msgid "Opportunity"
msgstr ""
@@ -178,13 +180,13 @@ msgid "Emails"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:252
#, python-format
msgid "Stage"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:250
#, python-format
msgid " added note on "
msgstr ""
@@ -216,7 +218,7 @@ msgid "User Responsible"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:248
#, python-format
msgid "Converted to Opportunity"
msgstr ""
@@ -242,7 +244,7 @@ msgid "mailgate message"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:148
#: view:mailgate.thread:0
#: view:res.partner:0
#, python-format
@@ -284,7 +286,7 @@ msgid "Cc"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:246
#, python-format
msgid " on "
msgstr ""
@@ -300,7 +302,7 @@ msgid "Email Search"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:561
#, python-format
msgid "receive"
msgstr ""
@@ -313,7 +315,7 @@ msgid "The generic email gateway system allows to send and receive emails\n"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:255
#, python-format
msgid "Changed Status to: "
msgstr ""
@@ -329,7 +331,7 @@ msgid "Owner"
msgstr ""
#. module: mail_gateway
-#: code:addons/mail_gateway/mail_gateway.py:0
+#: code:addons/mail_gateway/mail_gateway.py:253
#, python-format
msgid "Changed Stage to: "
msgstr ""
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index e54e8b7142d..92e7b675870 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
+"POT-Creation-Date: 2011-01-03 16:57:59+0000\n"
+"PO-Revision-Date: 2011-01-03 16:57:59+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index fa2b4e99a00..ba482b169c6 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:38+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:38+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:00+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:00+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Previous Activity"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:772
#, python-format
msgid "The current step for this item has no email or report to preview."
msgstr ""
@@ -37,7 +37,7 @@ msgid "The To/From Activity of transition must be of the same Campaign "
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:144
#, python-format
msgid "The campaign cannot be started: it doesn't have any starting activity (or any activity with a signal and no previous activity)"
msgstr ""
@@ -53,7 +53,7 @@ msgid "Custom Action"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:139
#, python-format
msgid "The campaign cannot be started: the email account is missing in email activity '%s'"
msgstr ""
@@ -139,7 +139,7 @@ msgid "This Year"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:772
#, python-format
msgid "No preview"
msgstr ""
@@ -182,7 +182,7 @@ msgid "Year(s)"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:209
#, python-format
msgid "Sorry, campaign duplication is not supported at the moment."
msgstr ""
@@ -511,12 +511,6 @@ msgstr ""
msgid "Campaign Statistics"
msgstr ""
-#. module: marketing_campaign
-#: view:marketing.campaign.workitem:0
-#: field:marketing.campaign.workitem,res_id:0
-msgid "Resource ID"
-msgstr ""
-
#. module: marketing_campaign
#: help:marketing.campaign.activity,server_action_id:0
msgid "The action to perform when this activity is activated"
@@ -664,7 +658,7 @@ msgid "October"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:141
#, python-format
msgid "The campaign cannot be started: the email account is not approved in email activity '%s'"
msgstr ""
@@ -701,7 +695,11 @@ msgid "This folder is used to store the generated reports"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:125
+#: code:addons/marketing_campaign/marketing_campaign.py:139
+#: code:addons/marketing_campaign/marketing_campaign.py:141
+#: code:addons/marketing_campaign/marketing_campaign.py:144
+#: code:addons/marketing_campaign/marketing_campaign.py:154
#, python-format
msgid "Error"
msgstr ""
@@ -713,7 +711,7 @@ msgid "Action"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:488
#, python-format
msgid "Automatic transition"
msgstr ""
@@ -735,7 +733,7 @@ msgid "Process"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:490
#: selection:marketing.campaign.transition,trigger:0
#, python-format
msgid "Cosmetic"
@@ -746,6 +744,11 @@ msgstr ""
msgid "How is the destination workitem triggered"
msgstr ""
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid "A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered from a specific situation. One action could be sending an email template that has previously been created in the system."
+msgstr ""
+
#. module: marketing_campaign
#: view:campaign.analysis:0
#: selection:campaign.analysis,state:0
@@ -756,7 +759,7 @@ msgid "Done"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:209
#, python-format
msgid "Operation not supported"
msgstr ""
@@ -783,14 +786,15 @@ msgid "Synchronize Manually"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:154
#, python-format
msgid "The campaign cannot be marked as done before all segments are done"
msgstr ""
#. module: marketing_campaign
-#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
-msgid "A marketing campaign is an event or activity that will help you manage and reach your partners with specific messages. A campaign can have many activities that will be triggered based on a specific situation. One possible action could be sending an email template that has previously been created in the system."
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
msgstr ""
#. module: marketing_campaign
@@ -858,7 +862,7 @@ msgid "Running"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:489
#, python-format
msgid "After %(interval_nbr)d %(interval_type)s"
msgstr ""
@@ -895,7 +899,7 @@ msgid "Fixed cost for running this campaign. You may also specify variable cost
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:746
#, python-format
msgid "Email Preview"
msgstr ""
@@ -906,7 +910,7 @@ msgid "Signal"
msgstr ""
#. module: marketing_campaign
-#: code:addons/marketing_campaign/marketing_campaign.py:0
+#: code:addons/marketing_campaign/marketing_campaign.py:125
#, python-format
msgid "The campaign cannot be started: there are no activities in it"
msgstr ""
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index f58277884ca..800154bed63 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:01+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 162f7f8664d..e65813787e0 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:39+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:39+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:01+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgid "Date from"
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:414
#, python-format
msgid "Partner doesn't have an address to make the invoice."
msgstr ""
@@ -215,7 +215,8 @@ msgid "Start membership date"
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:410
+#: code:addons/membership/membership.py:413
#, python-format
msgid "Error !"
msgstr ""
@@ -386,7 +387,7 @@ msgid "Group by..."
msgstr ""
#. module: membership
-#: code:addons/membership/membership.py:0
+#: code:addons/membership/membership.py:411
#, python-format
msgid "Partner is a free Member."
msgstr ""
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 24f420781ef..86edff02694 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:03+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,13 +22,8 @@ msgid "Moves Created"
msgstr ""
#. module: mrp
-#: report:mrp.production.order:0
-msgid "No. Of Cycles"
-msgstr ""
-
-#. module: mrp
-#: help:mrp.routing.workcenter,cycle_nbr:0
-msgid "Number of iterations this work center has to do in the specified operation of the routing."
+#: model:ir.actions.act_window,help:mrp.mrp_production_action
+msgid "Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumption of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed."
msgstr ""
#. module: mrp
@@ -41,11 +36,6 @@ msgstr ""
msgid "Work Centers Utilisation"
msgstr ""
-#. module: mrp
-#: view:report.workcenter.load:0
-msgid "Work Centers load"
-msgstr ""
-
#. module: mrp
#: view:mrp.routing.workcenter:0
msgid "Routing Work Centers"
@@ -56,6 +46,11 @@ msgstr ""
msgid "Manufacturing Resource Planning"
msgstr ""
+#. module: mrp
+#: report:mrp.production.order:0
+msgid "No. Of Cycles"
+msgstr ""
+
#. module: mrp
#: field:mrp.routing.workcenter,cycle_nbr:0
msgid "Number of Cycles"
@@ -73,13 +68,13 @@ msgid "Picking list"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Hourly Cost"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
#, python-format
msgid "Cost Price per Uom"
msgstr ""
@@ -139,11 +134,6 @@ msgstr ""
msgid "Finished Products"
msgstr ""
-#. module: mrp
-#: selection:mrp.production.order,month:0
-msgid "May"
-msgstr ""
-
#. module: mrp
#: model:process.transition,name:mrp.process_transition_servicerfq0
#: model:process.transition,name:mrp.process_transition_stockrfq0
@@ -165,11 +155,6 @@ msgstr ""
msgid "The system launches automatically a RFQ to the preferred supplier."
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_routing_action
-msgid "Routings allows you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
-msgstr ""
-
#. module: mrp
#: view:mrp.production:0
msgid "Products to Finish"
@@ -209,8 +194,13 @@ msgid "UOM"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "Define specific property groups that can be assigned to the properties of your bills of materials."
+#: field:change.production.qty,product_qty:0
+#: field:mrp.bom,product_qty:0
+#: field:mrp.production,product_qty:0
+#: view:mrp.production.order:0
+#: field:mrp.production.order,product_qty:0
+#: field:mrp.production.product.line,product_qty:0
+msgid "Product Qty"
msgstr ""
#. module: mrp
@@ -239,7 +229,7 @@ msgid "Cycle Account"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Work Cost"
msgstr ""
@@ -274,6 +264,11 @@ msgstr ""
msgid "Master Data"
msgstr ""
+#. module: mrp
+#: model:process.transition,note:mrp.process_transition_stockmts0
+msgid "The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."
+msgstr ""
+
#. module: mrp
#: report:mrp.production.order:0
msgid "Partner Ref"
@@ -329,6 +324,12 @@ msgstr ""
msgid "October"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/report/price.py:177
+#, python-format
+msgid "Components Cost of "
+msgstr ""
+
#. module: mrp
#: model:process.transition,name:mrp.process_transition_procurestockableproduct0
msgid "Procurement of stockable Product"
@@ -340,7 +341,7 @@ msgid "Default UOM"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
#: report:bom.structure:0
#: field:mrp.product_price,number:0
#: report:mrp.production.order:0
@@ -425,6 +426,11 @@ msgstr ""
msgid "Product type is service"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid "Define specific property groups that can be assigned to the properties of your bill of materials."
+msgstr ""
+
#. module: mrp
#: model:process.transition,name:mrp.process_transition_bom0
msgid "Manufacturing decomposition"
@@ -446,12 +452,6 @@ msgstr ""
msgid "Complete this only if you want automatic analytic accounting entries on production orders."
msgstr ""
-#. module: mrp
-#: help:mrp.workcenter,product_id:0
-#: help:mrp.workcenter,product_id:0
-msgid "Fill this product to track easily your production costs in the analytic accounting."
-msgstr ""
-
#. module: mrp
#: field:mrp.production.workcenter.line,cycle:0
msgid "Nbr of cycles"
@@ -463,12 +463,6 @@ msgstr ""
msgid "Request for Quotation."
msgstr ""
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component suppliers"
-msgstr ""
-
#. module: mrp
#: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
msgid "The Bill of Material is linked to a routing, i.e. the succession of work centers."
@@ -479,11 +473,6 @@ msgstr ""
msgid "Error: Invalid ean code"
msgstr ""
-#. module: mrp
-#: help:mrp.workcenter,costs_hour:0
-msgid "Specify Cost of Work center per hour."
-msgstr ""
-
#. module: mrp
#: view:mrp.routing:0
#: field:mrp.routing,location_id:0
@@ -521,7 +510,7 @@ msgid "Search Production"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:130
#, python-format
msgid "Supplier Price per Uom"
msgstr ""
@@ -531,16 +520,6 @@ msgstr ""
msgid "March"
msgstr ""
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_workcenter_load
-msgid "Work Center Load"
-msgstr ""
-
-#. module: mrp
-#: help:mrp.workcenter,costs_cycle:0
-msgid "Specify Cost of Work center per cycle."
-msgstr ""
-
#. module: mrp
#: field:mrp.bom,child_complete_ids:0
msgid "BoM Hierarchy"
@@ -553,6 +532,11 @@ msgstr ""
msgid "Produce"
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,costs_cycle:0
+msgid "Specify Cost of Work center per cycle."
+msgstr ""
+
#. module: mrp
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
@@ -601,7 +585,7 @@ msgid "Work Center Load"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:0
+#: code:addons/mrp/procurement.py:45
#, python-format
msgid "No BoM defined for this product !"
msgstr ""
@@ -627,9 +611,14 @@ msgstr ""
msgid "Ready"
msgstr ""
+#. module: mrp
+#: help:mrp.production,routing_id:0
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
+msgstr ""
+
#. module: mrp
#: help:mrp.workcenter,time_cycle:0
-msgid "Time in hours for this work center to achieve the operation of the specified routing."
+msgid "Time in hours for doing one cycle."
msgstr ""
#. module: mrp
@@ -638,6 +627,7 @@ msgid "BOM Ref"
msgstr ""
#. module: mrp
+#: view:mrp.production:0
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
#: selection:mrp.production.order,state:0
@@ -667,7 +657,8 @@ msgid "Type"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:150
+#: code:addons/mrp/report/price.py:201
#, python-format
msgid "Total Cost of "
msgstr ""
@@ -683,24 +674,20 @@ msgid "Per month"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
#, python-format
msgid "Couldn't find bill of material for product"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid "The Properties in OpenERP are used to select the right bill of material in order to manufacture a product, when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will select automatically the BoM to use according the the needs."
-msgstr ""
-
#. module: mrp
#: report:bom.structure:0
msgid "Product Name"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:491
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -731,6 +718,11 @@ msgstr ""
msgid "Procurement rule"
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,costs_hour:0
+msgid "Specify Cost of Work center per hour."
+msgstr ""
+
#. module: mrp
#: view:mrp.production:0
msgid "Partial"
@@ -767,11 +759,6 @@ msgstr ""
msgid "Manufacturing Order"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
-msgid "Bills of materials Components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM is used a specific component."
-msgstr ""
-
#. module: mrp
#: model:process.transition,name:mrp.process_transition_productionprocureproducts0
msgid "Procurement of raw material"
@@ -818,7 +805,7 @@ msgid "Extended Filters..."
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:0
+#: code:addons/mrp/procurement.py:47
#, python-format
msgid "Procurement '%s' has an exception: 'No BoM defined for this product !'"
msgstr ""
@@ -863,7 +850,7 @@ msgid "Stockable Product"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Work Center name"
msgstr ""
@@ -924,6 +911,11 @@ msgstr ""
msgid "Split in production lots"
msgstr ""
+#. module: mrp
+#: help:mrp.workcenter,capacity_per_cycle:0
+msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
+msgstr ""
+
#. module: mrp
#: model:process.transition,note:mrp.process_transition_servicerfq0
msgid "If the service has a 'Buy' supply method, this creates a RFQ, a subcontracting demand for instance."
@@ -944,6 +936,11 @@ msgstr ""
msgid "Make to stock"
msgstr ""
+#. module: mrp
+#: help:mrp.routing.workcenter,sequence:0
+msgid "Gives the sequence order when displaying a list of routing work centers."
+msgstr ""
+
#. module: mrp
#: report:bom.structure:0
msgid "BOM Name"
@@ -960,12 +957,6 @@ msgstr ""
msgid "Production Dashboard"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component"
-msgstr ""
-
#. module: mrp
#: view:mrp.production:0
msgid "Source Loc."
@@ -1018,8 +1009,13 @@ msgid "]"
msgstr ""
#. module: mrp
-#: help:mrp.routing.workcenter,sequence:0
-msgid "Gives the sequence order when displaying a list of routing work centers."
+#: field:mrp.workcenter.load,measure_unit:0
+msgid "Amount measuring unit"
+msgstr ""
+
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
+msgid "Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each production stage. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP is capable of automatically deciding on the manufacturing route depending on the needs of the company."
msgstr ""
#. module: mrp
@@ -1027,6 +1023,11 @@ msgstr ""
msgid "Order quantity cannot be negative or zero !"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,name:mrp.mrp_production_action3
+msgid "Manufacturing Orders in Progress"
+msgstr ""
+
#. module: mrp
#: model:ir.module.module,description:mrp.module_meta_information
msgid "\n"
@@ -1036,7 +1037,7 @@ msgid "\n"
" * Make to Stock / Make to Order (by line)\n"
" * Multi-level BoMs, no limit\n"
" * Multi-level routing, no limit\n"
-" * Routing and workcenter integrated with analytic accounting\n"
+" * Routing and work center integrated with analytic accounting\n"
" * Scheduler computation periodically / Just In Time module\n"
" * Multi-pos, multi-warehouse\n"
" * Different reordering policies\n"
@@ -1063,16 +1064,6 @@ msgid "\n"
" "
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action3
-msgid "Manufacturing Orders in Progress"
-msgstr ""
-
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
-msgid "Manufacturing Orders describe the operations that need to be carried out and the raw materials usage for each stage of production. You use specifications (bills of materials or BoM) to work out the raw material requirements and the manufacturing orders needed for the finished products. Once the bills of materials have been defined, OpenERP becomes capable of automatically deciding on the manufacturing route depending on the needs of the company."
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,name:mrp.mrp_production_action4
msgid "Manufacturing Orders Waiting Products"
@@ -1089,7 +1080,7 @@ msgid "Group By..."
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:121
#, python-format
msgid "Cycles Cost"
msgstr ""
@@ -1129,18 +1120,8 @@ msgid "Per week"
msgstr ""
#. module: mrp
-#: model:process.transition,note:mrp.process_transition_stockmts0
-msgid "The system waits for the products to be available in the stock. These products are typically procured manually or through a minimum stock rule."
-msgstr ""
-
-#. module: mrp
-#: field:change.production.qty,product_qty:0
-#: field:mrp.bom,product_qty:0
-#: field:mrp.production,product_qty:0
-#: view:mrp.production.order:0
-#: field:mrp.production.order,product_qty:0
-#: field:mrp.production.product.line,product_qty:0
-msgid "Product Qty"
+#: model:ir.actions.act_window,help:mrp.mrp_routing_action
+msgid "Routings allow you to create and manage the manufacturing operations that should be followed within your work centers in order to produce a product. They are attached to bills of materials that will define the required raw materials."
msgstr ""
#. module: mrp
@@ -1217,11 +1198,6 @@ msgstr ""
msgid "Configure Your Manufacturing Resource Planning Application"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_production_action
-msgid "Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed."
-msgstr ""
-
#. module: mrp
#: field:mrp.production,priority:0
#: field:mrp.production.order,priority:0
@@ -1239,7 +1215,7 @@ msgid "Month -1"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:914
#, python-format
msgid "Manufacturing order '%s' is scheduled for the %s."
msgstr ""
@@ -1250,7 +1226,7 @@ msgid "Production Order N° :"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:630
#, python-format
msgid "Manufacturing order '%s' is ready to produce."
msgstr ""
@@ -1277,6 +1253,11 @@ msgstr ""
msgid "July"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
+msgid "Master Bills of Materials allow you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoMs to automatically propose manufacturing orders according to product needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials."
+msgstr ""
+
#. module: mrp
#: model:process.transition,note:mrp.process_transition_stockrfq0
msgid "In case the Supply method of the product is Buy, the system creates a purchase order."
@@ -1293,6 +1274,12 @@ msgstr ""
msgid "Product Cost Structure"
msgstr ""
+#. module: mrp
+#: code:addons/mrp/report/price.py:130
+#, python-format
+msgid "Components suppliers"
+msgstr ""
+
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_installer
msgid "mrp.installer"
@@ -1310,12 +1297,7 @@ msgid "Month"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
-msgid "Work Centers allows you to create and manage manufacturing units consisting of one or several people and/or machines that can be considered as a unit for capacity and planning forecasting."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/wizard/change_production_qty.py:62
#, python-format
msgid "Active Id is not found"
msgstr ""
@@ -1351,6 +1333,11 @@ msgstr ""
msgid "Product Consumed"
msgstr ""
+#. module: mrp
+#: view:mrp.production:0
+msgid "Pending"
+msgstr ""
+
#. module: mrp
#: field:mrp.bom,active:0
#: field:mrp.routing,active:0
@@ -1364,6 +1351,7 @@ msgstr ""
#. module: mrp
#: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
+#: view:report.workcenter.load:0
msgid "Work Center Loads"
msgstr ""
@@ -1379,8 +1367,8 @@ msgid "Properties"
msgstr ""
#. module: mrp
-#: field:mrp.production,date_planned:0
-msgid "Scheduled date"
+#: help:mrp.production,origin:0
+msgid "Reference of the document that generated this production order request."
msgstr ""
#. module: mrp
@@ -1405,7 +1393,6 @@ msgid "Drives the procurement orders for raw material."
msgstr ""
#. module: mrp
-#: view:mrp.production:0
#: view:mrp.production.order:0
msgid "Current"
msgstr ""
@@ -1420,12 +1407,6 @@ msgstr ""
msgid "SO Number"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/report/price.py:0
-#, python-format
-msgid "Component Cost of "
-msgstr ""
-
#. module: mrp
#: selection:mrp.production,state:0
#: view:mrp.production.order:0
@@ -1462,7 +1443,7 @@ msgid "Manufacturing Orders To Start"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:491
#, python-format
msgid "Cannot delete Production Order(s) which are in %s State!"
msgstr ""
@@ -1518,12 +1499,8 @@ msgid "Product UOS"
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,name:mrp.mrp_production_action
-#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-#: view:mrp.production:0
-msgid "Manufacturing Orders"
+#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
+msgid "Work Centers allow you to create and manage manufacturing units consisting of one or more persons and/or machines that can be considered as a unit for capacity and planning forecasting."
msgstr ""
#. module: mrp
@@ -1553,7 +1530,7 @@ msgid "Production Analysis"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
+#: code:addons/mrp/mrp.py:345
#, python-format
msgid "Copy"
msgstr ""
@@ -1596,6 +1573,11 @@ msgstr ""
msgid "Very Urgent"
msgstr ""
+#. module: mrp
+#: help:mrp.bom,routing_id:0
+msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
+msgstr ""
+
#. module: mrp
#: view:change.production.qty:0
msgid "Approve"
@@ -1628,8 +1610,12 @@ msgid "Production Products Consommation"
msgstr ""
#. module: mrp
-#: help:mrp.workcenter,note:0
-msgid "Description of the work center. Explain here what's a cycle according to this work center."
+#: model:ir.actions.act_window,name:mrp.mrp_production_action
+#: model:ir.actions.act_window,name:mrp.mrp_production_action_planning
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_action
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+#: view:mrp.production:0
+msgid "Manufacturing Orders"
msgstr ""
#. module: mrp
@@ -1701,11 +1687,6 @@ msgstr ""
msgid "Production Order"
msgstr ""
-#. module: mrp
-#: help:mrp.production,routing_id:0
-msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."
-msgstr ""
-
#. module: mrp
#: model:process.node,note:mrp.process_node_productminimumstockrule0
msgid "Automatic procurement rule"
@@ -1722,7 +1703,9 @@ msgid "Product UoS Qty"
msgstr ""
#. module: mrp
+#: code:addons/mrp/report/price.py:130
#: view:mrp.bom:0
+#, python-format
msgid "Components"
msgstr ""
@@ -1733,8 +1716,8 @@ msgid "BOM Structure"
msgstr ""
#. module: mrp
-#: help:mrp.workcenter,capacity_per_cycle:0
-msgid "Number of operations this work center can do in parallel. If this work center represents a team of 5 workers, the capacity per cycle is 5."
+#: field:mrp.bom,date_stop:0
+msgid "Valid Until"
msgstr ""
#. module: mrp
@@ -1758,11 +1741,6 @@ msgstr ""
msgid "Product UOS Qty"
msgstr ""
-#. module: mrp
-#: field:mrp.bom,date_stop:0
-msgid "Valid Until"
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,help:mrp.action_report_in_out_picking_tree
msgid "Weekly Stock Value Variation enables you to track the stock value evolution linked to manufacturing activities, receptions of products and delivery orders."
@@ -1975,7 +1953,7 @@ msgid "Manufacturing Steps."
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:136
#: model:ir.actions.report.xml,name:mrp.report_cost_structure
#, python-format
msgid "Cost Structure"
@@ -1997,8 +1975,8 @@ msgid "Parent BoM"
msgstr ""
#. module: mrp
-#: field:mrp.workcenter.load,measure_unit:0
-msgid "Amount measuring unit"
+#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action2
+msgid "Bills of materials components are components and sub-products used to create master bills of materials. Use this menu to search in which BoM a specific component is used."
msgstr ""
#. module: mrp
@@ -2012,8 +1990,9 @@ msgid "Product type is Stockable or Consumable."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:0
-#: code:addons/mrp/wizard/change_production_qty.py:0
+#: code:addons/mrp/mrp.py:591
+#: code:addons/mrp/wizard/change_production_qty.py:77
+#: code:addons/mrp/wizard/change_production_qty.py:82
#, python-format
msgid "Error"
msgstr ""
@@ -2053,14 +2032,14 @@ msgid "Productions"
msgstr ""
#. module: mrp
-#: code:addons/mrp/report/price.py:0
+#: code:addons/mrp/report/price.py:194
#, python-format
msgid "Work Cost of "
msgstr ""
#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_bom_form_action
-msgid "Master Bill of Materials allows you to create and manage the list of necessary raw materials used to make a finished product. OpenERP will use these BoM in order to propose automatically manufacturing orders according to products' needs. You can either create a bill of materials to define specific production steps or define a single multi-level bill of materials."
+#: help:mrp.workcenter,note:0
+msgid "Description of the work center. Explain here what's a cycle according to this work center."
msgstr ""
#. module: mrp
@@ -2081,8 +2060,8 @@ msgid "Manufacturing Operations"
msgstr ""
#. module: mrp
-#: help:mrp.production,origin:0
-msgid "Reference of the document that generated this production order request."
+#: field:mrp.production,date_planned:0
+msgid "Scheduled date"
msgstr ""
#. module: mrp
@@ -2090,6 +2069,11 @@ msgstr ""
msgid "You must assign a production lot for this product"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid "The Properties in OpenERP are used to select the right bill of materials for manufacturing a product when you have different ways of building the same product. You can assign several properties to each Bill of Materials. When a sales person creates a sales order, he can relate it to several properties and OpenERP will automatically select the BoM to use according the the needs."
+msgstr ""
+
#. module: mrp
#: view:mrp.production.order:0
#: field:stock.move,production_id:0
@@ -2146,8 +2130,8 @@ msgid "Description"
msgstr ""
#. module: mrp
-#: help:mrp.bom,routing_id:0
-msgid "The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production planning."
+#: selection:mrp.production.order,month:0
+msgid "May"
msgstr ""
#. module: mrp
diff --git a/addons/mrp_jit/i18n/mrp_jit.pot b/addons/mrp_jit/i18n/mrp_jit.pot
index da0621d10dc..8f45a01e70f 100644
--- a/addons/mrp_jit/i18n/mrp_jit.pot
+++ b/addons/mrp_jit/i18n/mrp_jit.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:42+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:42+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:03+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index e2426cf3684..4e2372d335b 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:04+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgid "mrp_operations.operation.code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:133
#, python-format
msgid "Production Order Cannot start in [%s] state"
msgstr ""
@@ -116,7 +116,7 @@ msgid "Creation of the work order"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:461
#, python-format
msgid "You cannot Pause the Operation other then Start/Resume state !"
msgstr ""
@@ -134,7 +134,11 @@ msgid "The work orders are created on the basis of the production order."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:133
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:477
+#: code:addons/mrp_operations/mrp_operations.py:480
#, python-format
msgid "Error!"
msgstr ""
@@ -214,7 +218,7 @@ msgid "* When a work order is created it is set in 'Draft' state.\n"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:470
#, python-format
msgid "You cannot finish the operation without Starting/Resuming it !"
msgstr ""
@@ -225,7 +229,7 @@ msgid "Planned Date"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:477
#, python-format
msgid "There is no Operation to be cancelled !"
msgstr ""
@@ -251,6 +255,11 @@ msgstr ""
msgid "Status"
msgstr ""
+#. module: mrp_operations
+#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
+msgid "To manufacture or assemble products, and use raw materials and finished products you must also handle manufacturing operations. Manufacturing operations are often called Work Orders. The various operations will have different impacts on the costs of manufacturing and planning depending on the available workload."
+msgstr ""
+
#. module: mrp_operations
#: field:mrp_operations.operation,order_date:0
msgid "Order Date"
@@ -262,7 +271,7 @@ msgid "Future Work Orders"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:457
#, python-format
msgid "Operation has already started !You can either Pause /Finish/Cancel the operation"
msgstr ""
@@ -376,7 +385,7 @@ msgid "Production Operation Code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:465
#, python-format
msgid " You cannot Resume the operation other then Pause state !"
msgstr ""
@@ -426,7 +435,7 @@ msgid "June"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:480
#, python-format
msgid "Operation is already finished !"
msgstr ""
@@ -483,7 +492,7 @@ msgid "Finish the operation."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:450
#, python-format
msgid "Operation is not started yet !"
msgstr ""
@@ -494,7 +503,10 @@ msgid "Information from the production order."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:450
+#: code:addons/mrp_operations/mrp_operations.py:457
+#: code:addons/mrp_operations/mrp_operations.py:470
+#: code:addons/mrp_operations/mrp_operations.py:473
#, python-format
msgid "Sorry!"
msgstr ""
@@ -511,16 +523,11 @@ msgid "Code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:0
+#: code:addons/mrp_operations/mrp_operations.py:473
#, python-format
msgid "Operation is Already Cancelled !"
msgstr ""
-#. module: mrp_operations
-#: model:ir.actions.act_window,help:mrp_operations.mrp_production_wc_action_planning
-msgid "To manufacture or assemble products, as well as using raw materials and finished product you must also handle manufacturing operations. Manufacturing operations are often called work orders. The different operations will have different impacts on the costs of manufacture and planning depending on the available workload."
-msgstr ""
-
#. module: mrp_operations
#: model:ir.module.module,shortdesc:mrp_operations.module_meta_information
msgid "Work Center Production start end workflow"
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 33809832e15..90a6cd5dd8f 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:43+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:43+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,6 +35,11 @@ msgstr ""
msgid "Inventory Move"
msgstr ""
+#. module: mrp_repair
+#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
+msgid "Repair orders allow you to organize your product repairs. In a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if whether the repair should be invoiced to the customer or not."
+msgstr ""
+
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Group By..."
@@ -73,7 +78,7 @@ msgid "Group by partner invoice address"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:427
#, python-format
msgid "No product defined on Fees!"
msgstr ""
@@ -147,7 +152,7 @@ msgid "Net Total :"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:427
#, python-format
msgid "Warning !"
msgstr ""
@@ -168,7 +173,7 @@ msgid "Move"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:362
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form !"
msgstr ""
@@ -201,7 +206,7 @@ msgid "Draft"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:376
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
@@ -218,11 +223,6 @@ msgstr ""
msgid "Repairs order"
msgstr ""
-#. module: mrp_repair
-#: model:ir.actions.act_window,help:mrp_repair.action_repair_order_tree
-msgid "Repair orders allows you to organize your reparations on the products. On a repair order, you can detail the components you remove, add or replace and record the time you spent on the different operations. The repair order uses the warranty date on the production lot in order to know if you have to invoice the reparation to the customer or not."
-msgstr ""
-
#. module: mrp_repair
#: report:repair.order:0
msgid "Repair Order N° :"
@@ -260,7 +260,9 @@ msgid "Shipping address :"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:405
+#: code:addons/mrp_repair/mrp_repair.py:434
#, python-format
msgid "Error !"
msgstr ""
@@ -300,7 +302,7 @@ msgid "Quotation Notes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Warning!"
msgstr ""
@@ -487,7 +489,8 @@ msgid "End Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:405
+#: code:addons/mrp_repair/mrp_repair.py:434
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
@@ -645,13 +648,13 @@ msgid "Untaxed amount"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:41
#, python-format
msgid "Active ID is not Found"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/wizard/cancel_repair.py:0
+#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Repair order is not invoiced."
msgstr ""
@@ -729,7 +732,7 @@ msgid "Ready to Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:0
+#: code:addons/mrp_repair/mrp_repair.py:362
#, python-format
msgid "No partner !"
msgstr ""
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
index e9b03c3ab69..2ea0ac88a17 100644
--- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot
+++ b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index 4cf8b28cfd1..dc22c0c15b2 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:44+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:44+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:05+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/outlook/i18n/outlook.pot b/addons/outlook/i18n/outlook.pot
index 1111fc6218e..88138e5bcaa 100644
--- a/addons/outlook/i18n/outlook.pot
+++ b/addons/outlook/i18n/outlook.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:06+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,19 +15,14 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: outlook
-#: field:outlook.installer,plugin_file:0
-msgid "Outlook Plug-in"
-msgstr ""
-
#. module: outlook
#: field:outlook.installer,doc_file:0
msgid "Installation Manual"
msgstr ""
#. module: outlook
-#: view:outlook.installer:0
-msgid "Configure"
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
msgstr ""
#. module: outlook
@@ -43,7 +38,7 @@ msgstr ""
#. module: outlook
#: view:outlook.installer:0
-msgid "title"
+msgid "Skip"
msgstr ""
#. module: outlook
@@ -80,6 +75,11 @@ msgstr ""
msgid "The documentation file :- how to install Outlook Plug-in."
msgstr ""
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
#. module: outlook
#: model:ir.actions.act_window,name:outlook.action_outlook_installer
#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
@@ -88,13 +88,8 @@ msgid "Outlook Plug-In Configuration"
msgstr ""
#. module: outlook
-#: help:outlook.installer,outlook:0
-msgid "Allows you to select an object that you’d like to add to your email and its attachments."
-msgstr ""
-
-#. module: outlook
-#: model:ir.model,name:outlook.model_outlook_installer
-msgid "outlook.installer"
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
msgstr ""
#. module: outlook
@@ -102,9 +97,14 @@ msgstr ""
msgid "This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."
msgstr ""
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid "Allows you to select an object that you would like to add to your email and its attachments."
+msgstr ""
+
#. module: outlook
#: view:outlook.installer:0
-msgid "Skip"
+msgid "title"
msgstr ""
#. module: outlook
@@ -128,7 +128,7 @@ msgid "outlook plug-in file. Save as this file and install this plug-in in outlo
msgstr ""
#. module: outlook
-#: field:outlook.installer,progress:0
-msgid "Configuration Progress"
+#: view:outlook.installer:0
+msgid "Configure"
msgstr ""
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index e00bb0d770c..963c5d8ece2 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:45+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:45+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:06+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: pad
-#: code:addons/pad/web/editors.py:0
+#: code:addons/pad/web/editors.py:32
#, python-format
msgid "Ok"
msgstr ""
#. module: pad
-#: code:addons/pad/web/editors.py:0
+#: code:addons/pad/web/editors.py:29
#, python-format
msgid "Name"
msgstr ""
@@ -42,6 +42,12 @@ msgstr ""
msgid "Error! You can not create recursive companies."
msgstr ""
+#. module: pad
+#: code:addons/pad/web/editors.py:17
+#, python-format
+msgid "Write"
+msgstr ""
+
#. module: pad
#: model:ir.module.module,description:pad.module_meta_information
msgid "\n"
@@ -57,9 +63,7 @@ msgid "Pad root URL"
msgstr ""
#. module: pad
-#: code:addons/pad/web/editors.py:0
#: view:res.company:0
-#, python-format
msgid "Pad"
msgstr ""
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index c1f0dad4910..e4dcfccbe50 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:47+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:47+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:08+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:08+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -61,11 +61,6 @@ msgstr ""
msgid "Add product :"
msgstr ""
-#. module: point_of_sale
-#: report:pos.lines:0
-msgid "Net Total"
-msgstr ""
-
#. module: point_of_sale
#: view:all.closed.cashbox.of.the.day:0
msgid "All Cashboxes Of the day :"
@@ -146,6 +141,11 @@ msgstr ""
msgid "VAT"
msgstr ""
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr ""
+
#. module: point_of_sale
#: report:pos.invoice:0
msgid "Tax"
@@ -249,7 +249,7 @@ msgid "Sales Report"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
#, python-format
msgid "No Order Lines"
msgstr ""
@@ -281,7 +281,8 @@ msgid "Cash register management"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1075
#, python-format
msgid "No valid pricelist line found !"
msgstr ""
@@ -318,7 +319,7 @@ msgid "Sales by user monthly"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
#, python-format
msgid "You can not open a Cashbox for \"%s\".\n"
"Please close its related cash register."
@@ -475,14 +476,15 @@ msgid "Unit Price"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
#, python-format
msgid "Please check that income account is set to %s"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
-#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:56
+#: code:addons/point_of_sale/wizard/pos_return.py:166
+#: code:addons/point_of_sale/wizard/pos_return.py:327
#: model:ir.actions.act_window,name:point_of_sale.action_add_product
#: model:ir.model,name:point_of_sale.model_pos_add_product
#, python-format
@@ -537,13 +539,19 @@ msgid "Sale by Date and User"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
#, python-format
msgid "Cannot delete a point of sale which is closed or contains confirmed cashboxes!"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
+#: report:pos.details:0
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
#, python-format
msgid "Cash registers are already closed."
msgstr ""
@@ -605,7 +613,8 @@ msgid "User's Product"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1042
+#: code:addons/point_of_sale/point_of_sale.py:1067
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
@@ -617,11 +626,6 @@ msgstr ""
msgid "Subtotal"
msgstr ""
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Partner Ref."
-msgstr ""
-
#. module: point_of_sale
#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
#: model:ir.model,name:point_of_sale.model_pos_close_statement
@@ -718,7 +722,7 @@ msgid "Total :"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1206
#, python-format
msgid "Create line failed !"
msgstr ""
@@ -730,7 +734,7 @@ msgid "Product Name"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:69
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -815,6 +819,11 @@ msgstr ""
msgid "Opening Date"
msgstr ""
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr ""
+
#. module: point_of_sale
#: field:report.transaction.pos,disc:0
msgid "Disc."
@@ -868,7 +877,7 @@ msgid "transaction for the pos"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
#, python-format
msgid "UserError "
msgstr ""
@@ -879,7 +888,7 @@ msgid "Pos Box Entries"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_get_sale.py:0
+#: code:addons/point_of_sale/wizard/pos_get_sale.py:54
#, python-format
msgid "You can't modify this order. It has already been paid"
msgstr ""
@@ -890,6 +899,11 @@ msgstr ""
msgid "Date End"
msgstr ""
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Your Reference"
+msgstr ""
+
#. module: point_of_sale
#: field:report.transaction.pos,no_trans:0
msgid "Number of Transaction"
@@ -1054,11 +1068,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Document"
-msgstr ""
-
#. module: point_of_sale
#: view:pos.order:0
msgid "POS Orders"
@@ -1070,7 +1079,8 @@ msgid "All Closed CashBox"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1041
+#: code:addons/point_of_sale/point_of_sale.py:1066
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -1114,7 +1124,6 @@ msgstr ""
#. module: point_of_sale
#: report:pos.invoice:0
-#: report:pos.lines:0
#: field:pos.order,amount_tax:0
msgid "Taxes"
msgstr ""
@@ -1225,10 +1234,15 @@ msgid "Sale by User"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
-#: code:addons/point_of_sale/report/pos_invoice.py:0
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/point_of_sale.py:743
+#: code:addons/point_of_sale/point_of_sale.py:851
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:107
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
#, python-format
msgid "Error !"
msgstr ""
@@ -1255,7 +1269,7 @@ msgid "July"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:544
#, python-format
msgid "Please provide an account for the product: %s"
msgstr ""
@@ -1292,7 +1306,7 @@ msgid "Discount(Amount)"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:51
#, python-format
msgid "Active ID is not found"
msgstr ""
@@ -1340,7 +1354,7 @@ msgid "Point of sale receipt"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
#, python-format
msgid "No order lines defined for this sale "
msgstr ""
@@ -1356,7 +1370,7 @@ msgid "Customer Note"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
#, python-format
msgid "No order lines defined for this sale."
msgstr ""
@@ -1563,7 +1577,7 @@ msgid "Yes"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:743
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1574,9 +1588,8 @@ msgid "The cash register must be opened to be able to execute a payment."
msgstr ""
#. module: point_of_sale
-#: report:pos.details:0
-#: report:pos.details_summary:0
-msgid "Mode of Taxes"
+#: report:pos.lines:0
+msgid "Net Total :"
msgstr ""
#. module: point_of_sale
@@ -1665,7 +1678,8 @@ msgid "Invoice Date"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1057
+#: code:addons/point_of_sale/point_of_sale.py:1076
#, python-format
msgid "Couldn't find a pricelist line matching this product and quantity.\n"
"You have to change either the product, the quantity or the pricelist."
@@ -1682,9 +1696,9 @@ msgid "Reprint"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
-#: code:addons/point_of_sale/wizard/pos_box_entries.py:0
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/point_of_sale.py:555
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:103
+#: code:addons/point_of_sale/wizard/pos_box_out.py:101
#, python-format
msgid "You have to open at least one cashbox"
msgstr ""
@@ -1700,8 +1714,8 @@ msgid "Pos order"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_discount.py:0
-#: code:addons/point_of_sale/wizard/pos_payment.py:0
+#: code:addons/point_of_sale/wizard/pos_discount.py:52
+#: code:addons/point_of_sale/wizard/pos_payment.py:91
#, python-format
msgid "Error!"
msgstr ""
@@ -1828,7 +1842,7 @@ msgid "Supplier Invoice"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:1214
#, python-format
msgid "Modify line failed !"
msgstr ""
@@ -1880,7 +1894,8 @@ msgid "Validation Date"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
#, python-format
msgid "You don't have enough access to validate this sale!"
msgstr ""
@@ -1919,8 +1934,8 @@ msgid "Control for Output Operations"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_close_statement.py:0
-#: code:addons/point_of_sale/wizard/pos_open_statement.py:0
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:48
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:54
#, python-format
msgid "Message"
msgstr ""
@@ -1955,11 +1970,6 @@ msgstr ""
msgid "Invoiced"
msgstr ""
-#. module: point_of_sale
-#: report:pos.invoice:0
-msgid "Must be after setLang()"
-msgstr ""
-
#. module: point_of_sale
#: view:pos.close.statement:0
#: view:pos.confirm:0
@@ -2004,13 +2014,13 @@ msgid "PRO-FORMA"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:637
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:852
#, python-format
msgid "There is no receivable account defined for this journal: \"%s\" (id:%d)"
msgstr ""
@@ -2067,7 +2077,13 @@ msgid "POS Orders lines"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:0
+#: code:addons/point_of_sale/point_of_sale.py:337
+#: code:addons/point_of_sale/point_of_sale.py:504
+#: code:addons/point_of_sale/point_of_sale.py:506
+#: code:addons/point_of_sale/point_of_sale.py:544
+#: code:addons/point_of_sale/point_of_sale.py:637
+#: code:addons/point_of_sale/point_of_sale.py:1206
+#: code:addons/point_of_sale/point_of_sale.py:1214
#, python-format
msgid "Error"
msgstr ""
@@ -2083,7 +2099,7 @@ msgid "Refund"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/report/pos_invoice.py:0
+#: code:addons/point_of_sale/report/pos_invoice.py:46
#, python-format
msgid "Please create an invoice for this sale."
msgstr ""
@@ -2163,7 +2179,7 @@ msgid "Please fill these fields for entries to the box:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:99
#, python-format
msgid "please check that account is set to %s"
msgstr ""
@@ -2243,7 +2259,7 @@ msgid " Today "
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box_out.py:0
+#: code:addons/point_of_sale/wizard/pos_box_out.py:95
#, python-format
msgid "The maximum value you can still withdraw is exceeded. \n"
" Remaining value is equal to %d "
@@ -2300,8 +2316,8 @@ msgid "Account Entry"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_add_product.py:0
-#: code:addons/point_of_sale/wizard/pos_return.py:0
+#: code:addons/point_of_sale/wizard/pos_add_product.py:84
+#: code:addons/point_of_sale/wizard/pos_return.py:407
#: view:pos.make.payment:0
#: view:pos.order:0
#, python-format
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 61e77ec57ab..203e9d3e316 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:49+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:49+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:09+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:09+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 92b93e249e0..2e12cd60aec 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:50+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:50+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:10+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:10+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr ""
+
#. module: procurement
#: model:ir.ui.menu,name:procurement.menu_stock_sched
msgid "Schedulers"
@@ -41,7 +46,7 @@ msgid "Draft procurement of the product and location of that orderpoint"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:288
#, python-format
msgid "No supplier defined for this product !"
msgstr ""
@@ -57,7 +62,7 @@ msgid "Procurement Method"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:298
#, python-format
msgid "No address defined for the supplier"
msgstr ""
@@ -67,11 +72,6 @@ msgstr ""
msgid "Compute Stock Minimum Rules Only"
msgstr ""
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_action
-msgid "A procurement order is used to record a need in a specific product at a specific location. They are usually created automatically by the sales orders, the Pull Logistics rules or the minimum stock rules. When the procurement order is confirmed, it creates automatically the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc."
-msgstr ""
-
#. module: procurement
#: field:procurement.order,company_id:0
#: field:stock.warehouse.orderpoint,company_id:0
@@ -114,6 +114,11 @@ msgstr ""
msgid "Notes"
msgstr ""
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr ""
+
#. module: procurement
#: help:procurement.order,message:0
msgid "Exception occurred while computing procurement orders."
@@ -236,11 +241,6 @@ msgstr ""
msgid "Warehouse"
msgstr ""
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
-msgid "You can define your minimum stock rules, so that OpenERP will trigger automatically the propositions of manufacturing or purchase orders according to the stock level. Once the virtual stock of a product (=stock on hand minus all confirmed orders and reservations) is bellow the minimum quantity, OpenERP will generate a procurement request in order to fullfil the stock up to the maximum quantity."
-msgstr ""
-
#. module: procurement
#: selection:stock.warehouse.orderpoint,logic:0
msgid "Best price (not yet active!)"
@@ -268,8 +268,8 @@ msgid "Scheduler Range Days"
msgstr ""
#. module: procurement
-#: view:make.procurement:0
-msgid "Ask New Products"
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid "A procurement order is used to record a need for a specific product at a specific location. A procurement order is usually created automatically from sales orders, a Pull Logistics rule or Minimum Stock Rules. When the procurement order is confirmed, it automatically creates the necessary operations to fullfil the need: purchase order proposition, manufacturing order, etc."
msgstr ""
#. module: procurement
@@ -289,13 +289,13 @@ msgid "Quantity"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:370
#, python-format
msgid "Not enough stock and no minimum orderpoint rule defined."
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:137
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -395,6 +395,11 @@ msgstr ""
msgid "Related Procurement Orders"
msgstr ""
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+
#. module: procurement
#: field:stock.warehouse.orderpoint,product_min_qty:0
msgid "Min Quantity"
@@ -411,7 +416,7 @@ msgid "plus"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:319
#, python-format
msgid "Please check the Quantity in Procurement Order(s), it should not be less than 1!"
msgstr ""
@@ -457,21 +462,11 @@ msgstr ""
msgid "This wizard will schedule procurements."
msgstr ""
-#. module: procurement
-#: model:ir.actions.act_window,help:procurement.procurement_exceptions
-msgid "Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sale Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the products configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, or ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)"
-msgstr ""
-
#. module: procurement
#: view:procurement.order:0
msgid "Status"
msgstr ""
-#. module: procurement
-#: help:res.company,schedule_range:0
-msgid "This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for futur computation."
-msgstr ""
-
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Normal"
@@ -503,7 +498,7 @@ msgid "Exception"
msgstr ""
#. module: procurement
-#: code:addons/procurement/schedulers.py:0
+#: code:addons/procurement/schedulers.py:179
#, python-format
msgid "Automatic OP: %s"
msgstr ""
@@ -559,19 +554,19 @@ msgid "Date Closed"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:372
#, python-format
msgid "Procurement '%s' is in exception: not enough stock."
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:138
#, python-format
msgid "Cannot delete Procurement Order(s) which are in %s State!"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:318
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -746,8 +741,8 @@ msgid "Waiting"
msgstr ""
#. module: procurement
-#: selection:procurement.order,procure_method:0
-msgid "on order"
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid "You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity."
msgstr ""
#. module: procurement
@@ -787,7 +782,7 @@ msgid "Product UoS"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:0
+#: code:addons/procurement/procurement.py:347
#, python-format
msgid "from stock: products assigned."
msgstr ""
@@ -800,8 +795,8 @@ msgid "Compute Schedulers"
msgstr ""
#. module: procurement
-#: view:procurement.orderpoint.compute:0
-msgid "Wizard checks all the stock minimum rules and generate procurement order."
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid "Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message)."
msgstr ""
#. module: procurement
@@ -814,6 +809,11 @@ msgstr ""
msgid "Search Procurement"
msgstr ""
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid "This is the time frame analysed by the scheduler when computing procurements. All procurements that are not between today and today+range are skipped for future computation."
+msgstr ""
+
#. module: procurement
#: selection:procurement.order,priority:0
msgid "Very Urgent"
@@ -830,7 +830,7 @@ msgid "Procurement Details"
msgstr ""
#. module: procurement
-#: code:addons/procurement/schedulers.py:0
+#: code:addons/procurement/schedulers.py:180
#, python-format
msgid "SCHEDULER"
msgstr ""
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 4d36296ab2c..d74f410573b 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:12+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -96,7 +96,9 @@ msgid "Fixed"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:186
+#: code:addons/product/pricelist.py:339
+#: code:addons/product/pricelist.py:357
#, python-format
msgid "Warning !"
msgstr ""
@@ -236,7 +238,7 @@ msgid " e.g: 1 * (this unit) = ratio * (reference unit)"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:378
#, python-format
msgid "Products: "
msgstr ""
@@ -370,6 +372,11 @@ msgstr ""
msgid "Medium PC"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action_puchased
+msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
#. module: product
#: view:product.pricelist:0
msgid "Products Price Search"
@@ -464,6 +471,11 @@ msgstr ""
msgid "Working Time"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_pricelist_action2
+msgid "A price list contains rules to be evaluated in order to compute the purchase or sales price for all the partners assigned to a price list. Price lists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of a product category will be based on the supplier price multiplied by 1.80."
+msgstr ""
+
#. module: product
#: help:product.product,active:0
msgid "If the active field is set to False, it will allow you to hide the product without removing it."
@@ -475,7 +487,7 @@ msgid "Metal Cleats"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:340
#, python-format
msgid "No active version for the selected pricelist !\n"
"Please create or activate one."
@@ -632,11 +644,6 @@ msgstr ""
msgid "To Purchase"
msgstr ""
-#. module: product
-#: model:product.template,name:product.product_product_mb1_product_template
-msgid "Mainboard ASUStek A7N8X"
-msgstr ""
-
#. module: product
#: help:product.supplierinfo,min_qty:0
msgid "The minimal quantity to purchase to this supplier, expressed in the supplier Product UoM if not empty, in the default unit of measure of the product otherwise."
@@ -730,6 +737,12 @@ msgstr ""
msgid "Set a product if this rule only apply to one product. Keep empty for all products"
msgstr ""
+#. module: product
+#: view:product.product:0
+#: view:product.template:0
+msgid "Procurement & Locations"
+msgstr ""
+
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
msgid "Kitchen Design Project"
@@ -800,9 +813,8 @@ msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
msgstr ""
#. module: product
-#: view:product.product:0
-#: view:product.template:0
-msgid "Procurement & Locations"
+#: model:ir.actions.act_window,help:product.product_uom_form_action
+msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate between several Units of Measure within the same category."
msgstr ""
#. module: product
@@ -863,8 +875,8 @@ msgid "Lead time in days between the confirmation of the purchase order and the
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action2
-msgid "A pricelist contains rules to be evaluated in order to compute the purchase or sale price for all the partners assigned to a pricelist. Pricelists have several versions (2010, 2011, Promotion of February 2010, etc.) and each version has several rules. Example: the customer price of this category of product will be based on the supplier price multiplied by 1.80."
+#: model:ir.actions.act_window,help:product.product_pricelist_action
+msgid "There can be more than one version of a pricelist. Here you can create and manage new versions of a price list. Some examples of versions: 2010, 2011, Summer Promotion, etc."
msgstr ""
#. module: product
@@ -897,16 +909,6 @@ msgstr ""
msgid "Partner Information"
msgstr ""
-#. module: product
-#: model:ir.actions.act_window,help:product.product_normal_action
-msgid "You must define a Product for everything you buy or sell. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information of your products related to procurement logistics, sales price, product category, suppliers and so on."
-msgstr ""
-
-#. module: product
-#: model:ir.model,name:product.model_res_users
-msgid "res.users"
-msgstr ""
-
#. module: product
#: selection:product.ul,type:0
#: model:product.uom.categ,name:product.product_uom_categ_unit
@@ -934,6 +936,11 @@ msgstr ""
msgid "Price List Items"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
+msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days."
+msgstr ""
+
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
@@ -960,8 +967,8 @@ msgid "Price Surcharge"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_form_action
-msgid "Create and manage the units of measure you want to be used in your system. You can define a conversion rate to be used between the several Unit of Measure within the same category."
+#: model:product.template,name:product.product_product_mb1_product_template
+msgid "Mainboard ASUStek A7N8X"
msgstr ""
#. module: product
@@ -975,6 +982,7 @@ msgstr ""
#: field:product.pricelist.type,name:0
#: field:product.pricelist.version,name:0
#: view:product.product:0
+#: field:product.product,name_template:0
#: field:product.template,name:0
#: field:product.ul,name:0
#: field:product.uom,name:0
@@ -992,6 +1000,11 @@ msgstr ""
msgid "Wood Lintel 4m"
msgstr ""
+#. module: product
+#: model:ir.actions.act_window,help:product.product_normal_action
+msgid "You must define a Product for everything you buy or sell. Products can be raw materials, stockable products, consumables or services. The Product form contains detailed information about your products related to procurement logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
#. module: product
#: model:product.uom,name:product.product_uom_kgm
msgid "kg"
@@ -1137,7 +1150,7 @@ msgid "Pallet Dimension"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:603
#, python-format
msgid " (copy)"
msgstr ""
@@ -1147,21 +1160,11 @@ msgstr ""
msgid "Partners"
msgstr ""
-#. module: product
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
#. module: product
#: help:product.template,sale_delay:0
msgid "This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."
msgstr ""
-#. module: product
-#: model:ir.actions.act_window,help:product.product_uom_categ_form_action
-msgid "Create and manage the units of measure categories you want to be used in your system. If several units of measures are in the same category, they can be converted within each other. For example, in the unit of measure category \"Time\", you will have the following UoM: Hours, Days."
-msgstr ""
-
#. module: product
#: view:product.product:0
#: view:product.template:0
@@ -1169,7 +1172,7 @@ msgid "Second UoM"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:142
#, python-format
msgid "Error !"
msgstr ""
@@ -1249,13 +1252,13 @@ msgid "Purchase Unit of Measure"
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_category_action
-msgid "Here is a list of all your products classified by category. You can click on a category to get the list of all products linked to this category or to a child of this category."
+#: field:product.template,supply_method:0
+msgid "Supply method"
msgstr ""
#. module: product
-#: field:product.template,supply_method:0
-msgid "Supply method"
+#: model:ir.actions.act_window,help:product.product_category_action
+msgid "Here is a list of all your products classified by category. You can click a category to get the list of all products linked to this category or to a child of this category."
msgstr ""
#. module: product
@@ -1269,7 +1272,7 @@ msgid "Regular processor config"
msgstr ""
#. module: product
-#: code:addons/product/product.py:0
+#: code:addons/product/product.py:142
#, python-format
msgid "Conversion from Product UoM m to Default UoM PCE is not possible as they both belong to different Category!."
msgstr ""
@@ -1319,11 +1322,6 @@ msgstr ""
msgid "Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
-#. module: product
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-
#. module: product
#: field:product.uom,rounding:0
msgid "Rounding Precision"
@@ -1395,6 +1393,7 @@ msgstr ""
#. module: product
#: model:ir.actions.act_window,name:product.product_pricelist_type_action
+#: model:ir.ui.menu,name:product.menu_product_pricelist_type_action2
msgid "Pricelists Types"
msgstr ""
@@ -1424,11 +1423,6 @@ msgstr ""
msgid "Unit Price"
msgstr ""
-#. module: product
-#: model:ir.actions.act_window,help:product.product_normal_action_puchased
-msgid "Products can be purchased and/or sold. They can be raw materials, stockable products, consumables or services. The Product form contains a detailed information on your products related to procurement logistics, sales price, product category, suppliers and so on."
-msgstr ""
-
#. module: product
#: model:product.category,name:product.product_category_7
#: model:product.template,name:product.product_product_1_product_template
@@ -1470,6 +1464,11 @@ msgstr ""
msgid "Warranty (months)"
msgstr ""
+#. module: product
+#: help:product.pricelist.item,categ_id:0
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
+msgstr ""
+
#. module: product
#: model:ir.model,name:product.model_product_product
#: model:ir.ui.menu,name:product.prod_config_main
@@ -1590,7 +1589,7 @@ msgid "Base price for computing the customer price. Sometimes called the catalog
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:515
#, python-format
msgid "Partner section of the product form"
msgstr ""
@@ -1988,7 +1987,7 @@ msgid "Description"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:358
#, python-format
msgid "Could not resolve product category, you have defined cyclic categories of products!"
msgstr ""
@@ -2029,7 +2028,7 @@ msgid "Shelves"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:0
+#: code:addons/product/pricelist.py:514
#, python-format
msgid "Other Pricelist"
msgstr ""
@@ -2099,23 +2098,13 @@ msgid "Coefficient to convert UOM to UOS\n"
" uos = uom * coeff"
msgstr ""
-#. module: product
-#: field:product.pricelist.item,price_discount:0
-msgid "Price Discount"
-msgstr ""
-
#. module: product
#: help:product.template,volume:0
msgid "The volume in m3."
msgstr ""
#. module: product
-#: model:ir.actions.act_window,help:product.product_pricelist_action
-msgid "There can be more than one version of a pricelist. If you need to create new versions of a pricelist, you can do it and manage them from here. Some examples of versions: 2010, 2011, Promotion of February 2010, etc."
-msgstr ""
-
-#. module: product
-#: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
+#: field:product.pricelist.item,price_discount:0
+msgid "Price Discount"
msgstr ""
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index aa629f6deba..7aab02c055d 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:52+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:52+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:12+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:12+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index c2a8ffae19c..d187880675e 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 237b0d0b0e4..d42dd84770f 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:53+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:53+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:13+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -234,7 +234,7 @@ msgid "Sales"
msgstr ""
#. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:0
+#: code:addons/product_margin/wizard/product_margin.py:73
#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
#: view:product.product:0
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index e6581f5570a..6846df363d1 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:147
#, python-format
msgid "No Purchase Pricelist Found !"
msgstr ""
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:155
#, python-format
msgid "No Sale Pricelist Found "
msgstr ""
@@ -51,7 +51,7 @@ msgid "Invoice Line"
msgstr ""
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:155
#, python-format
msgid "You must first define a pricelist for Customer !"
msgstr ""
@@ -62,7 +62,7 @@ msgid "Pricelist"
msgstr ""
#. module: product_visible_discount
-#: code:addons/product_visible_discount/product_visible_discount.py:0
+#: code:addons/product_visible_discount/product_visible_discount.py:147
#, python-format
msgid "You must first define a pricelist for Supplier !"
msgstr ""
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
index 474b5c2cff3..807891ec80f 100644
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ b/addons/profile_tools/i18n/profile_tools.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:54+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:54+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:14+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,24 +25,19 @@ msgstr ""
msgid "Allows you to give restricted access to your OpenERP documents to external users, such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project tasks, support requests, invoices, etc."
msgstr ""
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Here are applications that can help you improve your organization without being key in its management."
-msgstr ""
-
#. module: profile_tools
#: help:misc_tools.installer,lunch:0
msgid "A simple module to help you to manage Lunch orders."
msgstr ""
#. module: profile_tools
-#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
-msgid "Tools Configuration"
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
msgstr ""
#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure Extra Tools"
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
msgstr ""
#. module: profile_tools
@@ -52,6 +47,11 @@ msgid "Installs tools for lunch,survey,subscription and audittrail\n"
" "
msgstr ""
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools are applications that can help you improve your organization although they are not key for company management."
+msgstr ""
+
#. module: profile_tools
#: view:misc_tools.installer:0
msgid "Configure"
@@ -93,8 +93,13 @@ msgid "Helps to generate automatically recurring documents."
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,pad:0
+msgid "Collaborative Note Pads"
msgstr ""
#. module: profile_tools
@@ -103,8 +108,8 @@ msgid "Survey"
msgstr ""
#. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
msgstr ""
#. module: profile_tools
@@ -113,8 +118,8 @@ msgid "Configuration Progress"
msgstr ""
#. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Native pad integration"
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
msgstr ""
#. module: profile_tools
@@ -127,8 +132,3 @@ msgstr ""
msgid "Web Share"
msgstr ""
-#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index ad2be7f43eb..8479d639beb 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:55+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:55+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:15+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:15+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,17 @@ msgid "Reinclude the description of the task in the task of the user"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:657
#, python-format
msgid "The task '%s' has been delegated to %s."
msgstr ""
+#. module: project
+#: help:res.company,project_time_mode_id:0
+msgid "This will set the unit of measure used in projects and tasks.\n"
+"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+msgstr ""
+
#. module: project
#: constraint:res.users:0
msgid "The chosen company is not in the allowed companies for this user"
@@ -47,13 +53,17 @@ msgid "Deadlines"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:121
#, python-format
msgid "Operation Not Permitted !"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_delegate.py:0
+#: code:addons/project/wizard/project_task_delegate.py:55
+#: code:addons/project/wizard/project_task_delegate.py:56
+#: code:addons/project/wizard/project_task_delegate.py:63
+#: code:addons/project/wizard/project_task_delegate.py:64
+#: code:addons/project/wizard/project_task_delegate.py:67
#, python-format
msgid "CHECK: "
msgstr ""
@@ -91,7 +101,7 @@ msgid "Total remaining time, can be re-estimated periodically by the assignee of
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:86
#, python-format
msgid "Task '%s' Closed"
msgstr ""
@@ -224,7 +234,7 @@ msgid "Day"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:570
#, python-format
msgid "The task '%s' is done"
msgstr ""
@@ -409,7 +419,7 @@ msgid "Reactivate Project"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:552
#, python-format
msgid "Task '%s' closed"
msgstr ""
@@ -426,8 +436,8 @@ msgid "Done by"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_task_type_form
-msgid "Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue."
+#: view:project.task:0
+msgid "Planning"
msgstr ""
#. module: project
@@ -459,16 +469,12 @@ msgid "Error! You can not create recursive analytic accounts."
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:224
+#: code:addons/project/project.py:245
#, python-format
msgid " (copy)"
msgstr ""
-#. module: project
-#: field:project.task,user_id:0
-msgid "Responsible"
-msgstr ""
-
#. module: project
#: help:project.installer,hr_timesheet_sheet:0
msgid "Tracks and helps employees encode and validate timesheets and attendances."
@@ -490,6 +496,11 @@ msgstr ""
msgid "Reevaluate Task"
msgstr ""
+#. module: project
+#: field:report.project.task.user,user_id:0
+msgid "Assigned To"
+msgstr ""
+
#. module: project
#: view:project.project:0
msgid "Date Stop: %(date)s"
@@ -552,8 +563,9 @@ msgid "Percent of tasks closed according to the total of tasks todo."
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.action_view_task
-msgid "A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to antoher user. If you delegate a task to another user, you get a new task in pending state, which will be re-opened when you have to review the work achieved. If you install the project_timesheet module, tasks works can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed."
+#: view:project.task.delegate:0
+#: field:project.task.delegate,new_task_description:0
+msgid "New Task Description"
msgstr ""
#. module: project
@@ -593,7 +605,7 @@ msgid "Reevaluate"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:530
#, python-format
msgid "Send Email after close task"
msgstr ""
@@ -683,7 +695,7 @@ msgid "Starting Date"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:266
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.ui.menu,name:project.menu_open_view_project_all
#: view:project.project:0
@@ -700,12 +712,12 @@ msgid "Stage"
msgstr ""
#. module: project
-#: field:report.project.task.user,user_id:0
-msgid "Assigned To"
+#: model:ir.actions.act_window,help:project.open_task_type_form
+msgid "Define the steps that will be used in the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress in solving a task or an issue."
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:621
#, python-format
msgid "The task '%s' is opened."
msgstr ""
@@ -799,7 +811,7 @@ msgid "My Board"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:79
#, python-format
msgid "Please specify the email address of Project Manager."
msgstr ""
@@ -843,6 +855,11 @@ msgstr ""
msgid "Task Delegate"
msgstr ""
+#. module: project
+#: model:ir.actions.act_window,help:project.action_view_task
+msgid "A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed."
+msgstr ""
+
#. module: project
#: selection:report.project.task.user,month:0
msgid "September"
@@ -929,8 +946,8 @@ msgid "Gives the sequence order when displaying a list of task"
msgstr ""
#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
msgstr ""
#. module: project
@@ -1061,11 +1078,6 @@ msgstr ""
msgid "New state of your own task. Pending will be reopened automatically when the delegated task is closed"
msgstr ""
-#. module: project
-#: field:project.project,warn_customer:0
-msgid "Warn Partner"
-msgstr ""
-
#. module: project
#: selection:report.project.task.user,month:0
msgid "June"
@@ -1089,7 +1101,7 @@ msgid "Project Dashboard"
msgstr ""
#. module: project
-#: view:project.project:0
+#: field:project.project,parent_id:0
msgid "Parent Project"
msgstr ""
@@ -1119,7 +1131,7 @@ msgid "Customer Email"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:189
#, python-format
msgid "The project '%s' has been closed."
msgstr ""
@@ -1160,7 +1172,7 @@ msgid "When task is completed, it will come into the done state."
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:211
#, python-format
msgid "The project '%s' has been opened."
msgstr ""
@@ -1176,13 +1188,15 @@ msgid "Dashboard"
msgstr ""
#. module: project
-#: help:res.company,project_time_mode_id:0
-msgid "This will set the unit of measure used in projects and tasks.\n"
-"If you use the timesheet linked to projects (project_timesheet module), don't forget to setup the right unit of measure in your employees."
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:79
+#: code:addons/project/wizard/project_task_close.py:82
+#: code:addons/project/wizard/project_task_close.py:91
+#: code:addons/project/wizard/project_task_close.py:111
#, python-format
msgid "Error"
msgstr ""
@@ -1203,7 +1217,7 @@ msgid "_Delegate"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:91
#, python-format
msgid "Couldn't send mail because your email address is not configured!"
msgstr ""
@@ -1282,7 +1296,7 @@ msgid "This report allows you to analyse the performance of your projects and us
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:581
#, python-format
msgid "Task '%s' set in progress"
msgstr ""
@@ -1328,7 +1342,7 @@ msgid "Open"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:121
#, python-format
msgid "You can not delete a project with tasks. I suggest you to deactivate it."
msgstr ""
@@ -1347,7 +1361,7 @@ msgid "In Progress"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:82
#, python-format
msgid "Please specify the email address of Customer."
msgstr ""
@@ -1369,9 +1383,8 @@ msgid "Current Activity"
msgstr ""
#. module: project
-#: view:project.task.delegate:0
-#: field:project.task.delegate,new_task_description:0
-msgid "New Task Description"
+#: field:project.task,user_id:0
+msgid "Responsible"
msgstr ""
#. module: project
@@ -1402,11 +1415,6 @@ msgstr ""
msgid "Very Low"
msgstr ""
-#. module: project
-#: view:project.task:0
-msgid "Planning"
-msgstr ""
-
#. module: project
#: field:project.project,warn_manager:0
#: field:project.task.close,manager_warn:0
@@ -1571,7 +1579,7 @@ msgid "Task By Days"
msgstr ""
#. module: project
-#: code:addons/project/wizard/project_task_close.py:0
+#: code:addons/project/wizard/project_task_close.py:111
#, python-format
msgid "Couldn't send mail! Check the email ids and smtp configuration settings"
msgstr ""
@@ -1644,7 +1652,7 @@ msgid "Spent Hours"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:664
#, python-format
msgid "The task '%s' is pending."
msgstr ""
@@ -1693,6 +1701,11 @@ msgstr ""
msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
msgstr ""
+#. module: project
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section."
+msgstr ""
+
#. module: project
#: field:project.project,total_hours:0
msgid "Total Time"
@@ -1704,7 +1717,7 @@ msgid "Validation State"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:601
#, python-format
msgid "Task '%s' cancelled"
msgstr ""
@@ -1730,7 +1743,7 @@ msgid "Create Date"
msgstr ""
#. module: project
-#: code:addons/project/project.py:0
+#: code:addons/project/project.py:609
#, python-format
msgid "The task '%s' is cancelled."
msgstr ""
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index 50784e517f7..99e7cb2ef64 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,6 +30,11 @@ msgstr ""
msgid "Monthly"
msgstr ""
+#. module: project_caldav
+#: help:project.task,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
#. module: project_caldav
#: selection:project.task,week_list:0
msgid "Sunday"
@@ -86,11 +91,6 @@ msgstr ""
msgid "All Day"
msgstr ""
-#. module: project_caldav
-#: field:project.task,vtimezone:0
-msgid "Timezone"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,show_as:0
msgid "Free"
@@ -121,21 +121,16 @@ msgstr ""
msgid "No Repeat"
msgstr ""
-#. module: project_caldav
-#: view:project.task:0
-msgid "Exclude range"
-msgstr ""
-
-#. module: project_caldav
-#: selection:project.task,freq:0
-msgid "Minutes"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,rrule_type:0
msgid "Yearly"
msgstr ""
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Option"
+msgstr ""
+
#. module: project_caldav
#: field:project.task,tu:0
msgid "Tue"
@@ -146,17 +141,17 @@ msgstr ""
msgid "Repeat Until"
msgstr ""
-#. module: project_caldav
-#: help:project.task,interval:0
-msgid "Repeat every x"
-msgstr ""
-
#. module: project_caldav
#: field:project.task,organizer:0
#: field:project.task,organizer_id:0
msgid "Organizer"
msgstr ""
+#. module: project_caldav
+#: help:project.task,edit_all:0
+msgid "Edit all Occurrences of recurrent Meeting."
+msgstr ""
+
#. module: project_caldav
#: field:project.task,sa:0
msgid "Sat"
@@ -202,11 +197,6 @@ msgstr ""
msgid "Confidential"
msgstr ""
-#. module: project_caldav
-#: selection:project.task,freq:0
-msgid "Seconds"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,freq:0
msgid "Hours"
@@ -227,6 +217,11 @@ msgstr ""
msgid "Thu"
msgstr ""
+#. module: project_caldav
+#: help:project.task,count:0
+msgid "Repeat x times"
+msgstr ""
+
#. module: project_caldav
#: selection:project.task,rrule_type:0
msgid "Daily"
@@ -237,6 +232,11 @@ msgstr ""
msgid "Mark as"
msgstr ""
+#. module: project_caldav
+#: field:project.task,count:0
+msgid "Repeat"
+msgstr ""
+
#. module: project_caldav
#: help:project.task,rrule_type:0
msgid "Let the event automatically repeat at that interval"
@@ -248,7 +248,7 @@ msgid "First"
msgstr ""
#. module: project_caldav
-#: code:addons/project_caldav/project_caldav.py:0
+#: code:addons/project_caldav/project_caldav.py:67
#, python-format
msgid "Tasks"
msgstr ""
@@ -279,13 +279,8 @@ msgid "CalDAV for task management"
msgstr ""
#. module: project_caldav
-#: view:project.task:0
-msgid "Custom Recurrency Rule"
-msgstr ""
-
-#. module: project_caldav
-#: help:project.task,count:0
-msgid "Repeat max that times"
+#: field:project.task,vtimezone:0
+msgid "Timezone"
msgstr ""
#. module: project_caldav
@@ -294,7 +289,7 @@ msgid "Weekly"
msgstr ""
#. module: project_caldav
-#: view:project.task:0
+#: field:project.task,edit_all:0
msgid "Edit All"
msgstr ""
@@ -363,11 +358,6 @@ msgstr ""
msgid "November"
msgstr ""
-#. module: project_caldav
-#: field:project.task,count:0
-msgid "Count"
-msgstr ""
-
#. module: project_caldav
#: selection:project.task,month_list:0
msgid "October"
@@ -388,6 +378,11 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#. module: project_caldav
+#: view:project.task:0
+msgid "Repeat Times"
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
msgid "To"
@@ -403,6 +398,11 @@ msgstr ""
msgid "Frequency"
msgstr ""
+#. module: project_caldav
+#: help:project.task,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
msgid "of"
@@ -413,6 +413,11 @@ msgstr ""
msgid "Busy"
msgstr ""
+#. module: project_caldav
+#: field:project.task,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
#. module: project_caldav
#: view:project.task:0
#: field:project.task,rrule_type:0
@@ -424,11 +429,6 @@ msgstr ""
msgid "Thursday"
msgstr ""
-#. module: project_caldav
-#: selection:project.task,rrule_type:0
-msgid "Custom"
-msgstr ""
-
#. module: project_caldav
#: field:project.task,exrule:0
msgid "Exception Rule"
@@ -470,6 +470,11 @@ msgstr ""
msgid "Assign Task"
msgstr ""
+#. module: project_caldav
+#: view:project.task:0
+msgid "Recurrency Rule"
+msgstr ""
+
#. module: project_caldav
#: selection:project.task,month_list:0
msgid "February"
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index 926df07cbde..d50deaa3d6a 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:56+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:56+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:16+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:16+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,18 +46,13 @@ msgid "Timebox Empty Process Completed Successfully."
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
#, python-format
msgid "No timebox child of this one !"
msgstr ""
#. module: project_gtd
-#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
-msgid "Timeboxes are defined in the \"Getting Things Done\" methodology. It defines a period of time in order to categorize your tasks: today, this week, this month, long term."
-msgstr ""
-
-#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:112
#, python-format
msgid "GTD"
msgstr ""
@@ -96,7 +91,7 @@ msgid "Set to Timebox"
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_empty.py:0
+#: code:addons/project_gtd/wizard/project_gtd_empty.py:52
#, python-format
msgid "Error !"
msgstr ""
@@ -117,6 +112,11 @@ msgstr ""
msgid "Empty Timebox"
msgstr ""
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
+msgid "Timeboxes are defined in the \"Getting Things Done\" methodology. A timebox defines a period of time in order to categorize your tasks: today, this week, this month, long term."
+msgstr ""
+
#. module: project_gtd
#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
msgid "This Week"
@@ -212,7 +212,7 @@ msgid "_Ok"
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:110
#, python-format
msgid "Getting Things Done"
msgstr ""
@@ -228,11 +228,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: project_gtd
-#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
-msgid "Contexts are defined in the \"Getting Things Done\" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc."
-msgstr ""
-
#. module: project_gtd
#: help:project.gtd.context,sequence:0
msgid "Gives the sequence order when displaying a list of contexts."
@@ -249,7 +244,7 @@ msgid "Tasks selection"
msgstr ""
#. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/project_gtd.py:111
#, python-format
msgid "Inbox"
msgstr ""
@@ -269,6 +264,11 @@ msgstr ""
msgid "Home"
msgstr ""
+#. module: project_gtd
+#: model:ir.actions.act_window,help:project_gtd.open_gtd_context_tree
+msgid "Contexts are defined in the \"Getting Things Done\" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc."
+msgstr ""
+
#. module: project_gtd
#: view:project.task:0
msgid "Previous"
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 93a06e9e31c..1dae8050454 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgid "Days to Open"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:360
#, python-format
msgid "You cannot escalate this issue.\n"
"The relevant Project has not configured the Escalation Project!"
@@ -154,7 +154,7 @@ msgid "Cancelled"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:360
#, python-format
msgid "Warning !"
msgstr ""
@@ -203,7 +203,7 @@ msgid "Partner"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:464
#, python-format
msgid " (copy)"
msgstr ""
@@ -213,11 +213,6 @@ msgstr ""
msgid "Previous"
msgstr ""
-#. module: project_issue
-#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
-msgid "Issues such as system bugs, client complains, material breakdowns are collected here. You can define the stages assigned to the resolution of the issue on the project. (analysis, development, done) Using the mailgateway module, the issues can be integrated to an email address (example: support@mycompany.com)"
-msgstr ""
-
#. module: project_issue
#: view:project.issue:0
msgid "Statistics"
@@ -404,7 +399,7 @@ msgid "You can use the issues tracker in OpenERP to handle bugs in the software
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:283
#, python-format
msgid "Tasks"
msgstr ""
@@ -447,7 +442,7 @@ msgid "project.issue.report"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:362
#: view:project.issue:0
#, python-format
msgid "Escalate"
@@ -738,6 +733,11 @@ msgstr ""
msgid "Current"
msgstr ""
+#. module: project_issue
+#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0
+msgid "Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)"
+msgstr ""
+
#. module: project_issue
#: view:project.issue:0
msgid "Details"
@@ -815,7 +815,7 @@ msgid "February"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:61
#, python-format
msgid "Issue '%s' has been opened."
msgstr ""
@@ -841,7 +841,7 @@ msgid "Month-1"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:76
#, python-format
msgid "Issue '%s' has been closed."
msgstr ""
@@ -867,7 +867,7 @@ msgid "ID"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:0
+#: code:addons/project_issue/project_issue.py:377
#, python-format
msgid "No Title"
msgstr ""
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 9b903251abe..657e79b7e2a 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:57+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:57+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:17+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:17+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index c6090f8fce5..cfacf155fc5 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,6 +57,11 @@ msgstr ""
msgid "Resources Allocation"
msgstr ""
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Displaying settings"
+msgstr ""
+
#. module: project_long_term
#: field:project.compute.phases,target_project:0
msgid "Schedule"
@@ -94,7 +99,7 @@ msgid "Error! You cannot assign escalation to the same project!"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:130
#, python-format
msgid "Day"
msgstr ""
@@ -120,6 +125,17 @@ msgstr ""
msgid "UoM (Unit of Measure) is the unit of measurement for Duration"
msgstr ""
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:489
+#, python-format
+msgid "Resources should be allocated to your phases and Members should be assigned to your Project!"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,date_end:0
+msgid " It's computed by the scheduler according to the start date and the duration."
+msgstr ""
+
#. module: project_long_term
#: model:ir.model,name:project_long_term.model_project_project
#: field:project.compute.phases,project_id:0
@@ -133,7 +149,7 @@ msgid "Project"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
#, python-format
msgid "Error!"
msgstr ""
@@ -144,7 +160,7 @@ msgid "Cancelled"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:426
#, python-format
msgid "No tasks to compute for Project '%s'."
msgstr ""
@@ -154,11 +170,6 @@ msgstr ""
msgid "Ending Date"
msgstr ""
-#. module: project_long_term
-#: help:project.phase,date_end:0
-msgid "It's computed by the scheduler according to the start date and the duration."
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
msgid "Planning"
@@ -182,12 +193,13 @@ msgid "Compute Phase Scheduling"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:192
#, python-format
msgid " (copy)"
msgstr ""
#. module: project_long_term
+#: view:project.phase:0
#: view:project.resource.allocation:0
#: field:project.resource.allocation,useability:0
msgid "Availability"
@@ -292,6 +304,11 @@ msgstr ""
msgid "_Ok"
msgstr ""
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Schedule and Display info"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
msgid "Month"
@@ -307,6 +324,11 @@ msgstr ""
msgid "project.schedule.tasks"
msgstr ""
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.act_project_phase
+msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on the project."
+msgstr ""
+
#. module: project_long_term
#: field:project.phase,date_start:0
#: field:project.resource.allocation,date_start:0
@@ -329,11 +351,6 @@ msgstr ""
msgid "Draft"
msgstr ""
-#. module: project_long_term
-#: model:ir.actions.act_window,help:project_long_term.act_project_phase
-msgid "A project can be split into the different phases. For each phase, you can define your resources allocation, describe different tasks and link your phase to previous and next ones, add date constraints for the automated scheduling. Use the long term planning in order to planify your available human resources, convert your phases into a series of tasks when you start working on it."
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
#: selection:project.phase,state:0
@@ -350,6 +367,11 @@ msgstr ""
msgid "User"
msgstr ""
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
msgid "Task Detail"
@@ -366,29 +388,23 @@ msgid "Project Compute Tasks"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:244
#, python-format
msgid "No responsible person assigned !"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:489
#, python-format
msgid "Error"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:244
#, python-format
msgid "You must assign a responsible person for phase '%s' !"
msgstr ""
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
-#, python-format
-msgid "Should have Resources Allocation or Project Members!"
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
msgid "Constraints"
@@ -431,11 +447,6 @@ msgstr ""
msgid "Remaining Hours"
msgstr ""
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Other Info"
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,responsible_id:0
@@ -458,7 +469,7 @@ msgid "Start Phase"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:0
+#: code:addons/project_long_term/wizard/project_compute_phases.py:50
#, python-format
msgid "Please Specify Project to be schedule"
msgstr ""
@@ -484,11 +495,6 @@ msgstr ""
msgid "Phase"
msgstr ""
-#. module: project_long_term
-#: help:project.phase,date_start:0
-msgid "It's computed according to the phases order : the start date of the 1st phase is set by you while the other start dates depend on the end date of their previous phases"
-msgstr ""
-
#. module: project_long_term
#: help:project.phase,state:0
msgid "If the phase is created the state 'Draft'.\n"
@@ -514,6 +520,11 @@ msgstr ""
msgid "Name"
msgstr ""
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr ""
+
#. module: project_long_term
#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
msgid "Working Period"
@@ -526,12 +537,11 @@ msgstr ""
#. module: project_long_term
#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-#: view:project.phase:0
msgid "Scheduling"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:0
+#: code:addons/project_long_term/project_long_term.py:329
#, python-format
msgid "No tasks to compute for Phase '%s'."
msgstr ""
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 7eaed6e120c..ff4cfd8575b 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -154,6 +154,8 @@
+
+
@@ -172,6 +174,7 @@
+
@@ -190,14 +193,14 @@
-
+
-
+
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
index 69d0149689a..b19f8349cd8 100644
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ b/addons/project_mailgate/i18n/project_mailgate.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:58+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:58+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:18+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:18+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgid "Messages"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:123
#, python-format
msgid "Draft"
msgstr ""
@@ -66,25 +66,25 @@ msgid "Details"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:149
#, python-format
msgid "Cancel"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:143
#, python-format
msgid "Done"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:129
#, python-format
msgid "Open"
msgstr ""
#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:0
+#: code:addons/project_mailgate/project_mailgate.py:135
#, python-format
msgid "Pending"
msgstr ""
diff --git a/addons/project_messages/i18n/project_messages.pot b/addons/project_messages/i18n/project_messages.pot
index ffdf87d8d0a..1b9f7e2dffb 100644
--- a/addons/project_messages/i18n/project_messages.pot
+++ b/addons/project_messages/i18n/project_messages.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgid "Communication Messages"
msgstr ""
#. module: project_messages
-#: help:project.messages,to_id:0
-msgid "Keep this empty to broadcast the message."
+#: view:project.messages:0
+msgid "Group By..."
msgstr ""
#. module: project_messages
@@ -52,8 +52,8 @@ msgid "Today"
msgstr ""
#. module: project_messages
-#: model:ir.actions.act_window,help:project_messages.messages_form
-msgid "An in-project messagery system permits an efficient and trackable communication between project members. The messages are kept in the system and can then be used for post-analysis."
+#: help:project.messages,to_id:0
+msgid "Keep this empty to broadcast the message."
msgstr ""
#. module: project_messages
@@ -73,8 +73,8 @@ msgid "Project"
msgstr ""
#. module: project_messages
-#: view:project.messages:0
-msgid "Group By..."
+#: model:ir.actions.act_window,help:project_messages.messages_form
+msgid "An in-project messaging system allows for an efficient and trackable communication between project members. The messages are stored in the system and can be used for post analysis."
msgstr ""
#. module: project_messages
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index bad17ead34f..0e2da82a283 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:59+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:59+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
index 22bd2ef0e20..0f9639b6939 100644
--- a/addons/project_planning/i18n/project_planning.pot
+++ b/addons/project_planning/i18n/project_planning.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:19+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:19+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: project_planning
+#: constraint:account.analytic.account:0
+msgid "Error! The currency has to be the same as the currency of the selected company"
+msgstr ""
+
#. module: project_planning
#: help:report_account_analytic.planning.account,tasks:0
#: help:report_account_analytic.planning.user,tasks:0
@@ -67,6 +72,16 @@ msgstr ""
msgid "Planning Management Module"
msgstr ""
+#. module: project_planning
+#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
+msgid "With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability."
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Total planned tasks"
+msgstr ""
+
#. module: project_planning
#: field:report_account_analytic.planning.stat,account_id:0
msgid "Account"
@@ -123,11 +138,6 @@ msgstr ""
msgid "Planning By Account"
msgstr ""
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Time without"
-msgstr ""
-
#. module: project_planning
#: view:report_account_analytic.planning:0
msgid "Current Plannings"
@@ -149,8 +159,8 @@ msgid "Extra Info"
msgstr ""
#. module: project_planning
-#: field:report_account_analytic.planning,total_planned:0
-msgid "Total Planned"
+#: report:report_account_analytic.planning.print:0
+msgid "To :"
msgstr ""
#. module: project_planning
@@ -171,8 +181,9 @@ msgid "Time Allocation without Tasks"
msgstr ""
#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "From"
+#: view:account.analytic.account:0
+#: view:report_account_analytic.planning:0
+msgid "Planning Lines"
msgstr ""
#. module: project_planning
@@ -226,6 +237,11 @@ msgstr ""
msgid "Planning"
msgstr ""
+#. module: project_planning
+#: field:report_account_analytic.planning,total_planned:0
+msgid "Total Planned"
+msgstr ""
+
#. module: project_planning
#: view:report_account_analytic.planning:0
msgid "Time Encoding"
@@ -236,12 +252,6 @@ msgstr ""
msgid "Unallocated Time"
msgstr ""
-#. module: project_planning
-#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
-#: view:report_account_analytic.planning:0
-msgid "Planning by Account"
-msgstr ""
-
#. module: project_planning
#: help:report_account_analytic.planning.user,plan_open:0
msgid "This value is given by the sum of time allocation without task(s) linked, expressed in days."
@@ -253,8 +263,8 @@ msgid "Delegate"
msgstr ""
#. module: project_planning
-#: field:report_account_analytic.planning,stat_ids:0
-msgid "Planning analysis"
+#: help:report_account_analytic.planning.user,free:0
+msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
msgstr ""
#. module: project_planning
@@ -262,6 +272,16 @@ msgstr ""
msgid "Set here the number of working days within this planning for one person full time"
msgstr ""
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "["
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "From :"
+msgstr ""
+
#. module: project_planning
#: field:report_account_analytic.planning,planning_user_ids:0
msgid "Planning By User"
@@ -280,13 +300,13 @@ msgid "Planning By Account (in Days)"
msgstr ""
#. module: project_planning
-#: field:report_account_analytic.planning,date_from:0
-msgid "Start Date"
+#: report:report_account_analytic.planning.print:0
+msgid "Time without tasks"
msgstr ""
#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "Total Planned Tasks"
+#: field:report_account_analytic.planning,date_from:0
+msgid "Start Date"
msgstr ""
#. module: project_planning
@@ -300,13 +320,8 @@ msgid "This value is given by the sum of time allocation with the checkbox 'Assi
msgstr ""
#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "tasks"
-msgstr ""
-
-#. module: project_planning
-#: help:report_account_analytic.planning.user,free:0
-msgid "Computed as Business Days - (Time Allocation of Tasks + Time Allocation without Tasks + Holiday Leaves)"
+#: field:report_account_analytic.planning,stat_ids:0
+msgid "Planning analysis"
msgstr ""
#. module: project_planning
@@ -326,9 +341,9 @@ msgid "Draft"
msgstr ""
#. module: project_planning
-#: view:account.analytic.account:0
+#: model:ir.model,name:project_planning.model_report_account_analytic_planning_account
#: view:report_account_analytic.planning:0
-msgid "Planning Lines"
+msgid "Planning by Account"
msgstr ""
#. module: project_planning
@@ -461,7 +476,6 @@ msgstr ""
#. module: project_planning
#: field:report_account_analytic.planning,user_id:0
-#: report:report_account_analytic.planning.print:0
msgid "Responsible"
msgstr ""
@@ -470,11 +484,6 @@ msgstr ""
msgid "Planning stat"
msgstr ""
-#. module: project_planning
-#: report:report_account_analytic.planning.print:0
-msgid "To"
-msgstr ""
-
#. module: project_planning
#: field:report_account_analytic.planning.account,plan_tasks:0
msgid "Time Allocation of Tasks"
@@ -485,11 +494,6 @@ msgstr ""
msgid "Summary by user"
msgstr ""
-#. module: project_planning
-#: model:ir.actions.act_window,help:project_planning.action_account_analytic_planning_form
-msgid "With its commun system for scheduling all resources of a company (people and materials), OpenERP allows you to encode then compute automatically tasks and phases scheduling, track resources allocation and availibility."
-msgstr ""
-
#. module: project_planning
#: view:report_account_analytic.planning:0
msgid "Total Time Allocation without Tasks"
@@ -520,6 +524,16 @@ msgstr ""
msgid "Summary by project"
msgstr ""
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "Responsible :"
+msgstr ""
+
+#. module: project_planning
+#: report:report_account_analytic.planning.print:0
+msgid "]"
+msgstr ""
+
#. module: project_planning
#: field:res.company,planning_time_mode_id:0
msgid "Planning Time Unit"
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
index 2cfcb9529b6..eb12e7c454d 100644
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ b/addons/project_retro_planning/i18n/project_retro_planning.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:00+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:00+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:20+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:20+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
index 4f08cbb9bbd..b29e9db8794 100644
--- a/addons/project_scrum/i18n/project_scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:01+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:01+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -73,6 +73,11 @@ msgstr ""
msgid "What did you do since the last meeting?"
msgstr ""
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
+msgid "The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner."
+msgstr ""
+
#. module: project_scrum
#: view:project.scrum.meeting:0
#: view:project.scrum.product.backlog:0
@@ -103,7 +108,7 @@ msgid "Scrum Master"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:83
#, python-format
msgid "The sprint '%s' has been opened."
msgstr ""
@@ -157,7 +162,7 @@ msgid "Merge Backlogs"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:53
#, python-format
msgid "Scrum Meeting : %s"
msgstr ""
@@ -203,19 +208,20 @@ msgid "The scrum agile methodology is used in software development projects. In
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:316
#, python-format
msgid "Please provide email address for product owner defined on sprint."
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:327
#, python-format
msgid "Scrum Meeting of %s"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
#: view:project.scrum.product.backlog:0
#: field:project.task,product_backlog_id:0
@@ -240,13 +246,15 @@ msgid "Start Task"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:90
+#: code:addons/project_scrum/wizard/project_scrum_email.py:93
+#: code:addons/project_scrum/wizard/project_scrum_email.py:96
#, python-format
msgid "None"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "*Blocks encountered:"
msgstr ""
@@ -278,7 +286,7 @@ msgid "Computed using the sum of the task work done."
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:91
#, python-format
msgid "Task for Today"
msgstr ""
@@ -299,7 +307,7 @@ msgid "Starting Date"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:94
#, python-format
msgid "Blocking points encountered:"
msgstr ""
@@ -344,7 +352,7 @@ msgid "Sprints"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:314
#, python-format
msgid "Email notification could not be sent to the product owner %s"
msgstr ""
@@ -383,7 +391,7 @@ msgid "Daily Scrum"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
#, python-format
msgid "for the Sprint"
msgstr ""
@@ -401,7 +409,10 @@ msgid "Product Backlogs"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:301
+#: code:addons/project_scrum/project_scrum.py:303
+#: code:addons/project_scrum/project_scrum.py:314
+#: code:addons/project_scrum/project_scrum.py:316
#, python-format
msgid "Error !"
msgstr ""
@@ -423,7 +434,7 @@ msgid "Scrum"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
#, python-format
msgid "Hello "
msgstr ""
@@ -434,14 +445,15 @@ msgid "Tasks for today"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:88
#: field:project.scrum.meeting,question_yesterday:0
#, python-format
msgid "Tasks since yesterday"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
#, python-format
msgid "Warning"
msgstr ""
@@ -483,7 +495,7 @@ msgid "View project's tasks"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:56
#, python-format
msgid "Hello , \n"
"I am sending you Scrum Meeting : %s for the Sprint '%s' of Project '%s'"
@@ -590,7 +602,7 @@ msgid "The person who is responsible for the product"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "*Tasks since yesterday:"
msgstr ""
@@ -692,7 +704,7 @@ msgid "Backlogs"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:326
#, python-format
msgid "Thank you"
msgstr ""
@@ -728,18 +740,13 @@ msgstr ""
msgid "Merge"
msgstr ""
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid "The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a sprint of developement and can be split into several tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
msgid "View sprint backlog"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "No Blocks"
msgstr ""
@@ -779,7 +786,7 @@ msgid "Backlog Progress"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:301
#, python-format
msgid "Email notification could not be sent to the scrum master %s"
msgstr ""
@@ -823,11 +830,6 @@ msgstr ""
msgid "Information"
msgstr ""
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid "The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (one month) on which the team implement a list of product backlogs. The sprint review is organized when the team presents his work to the customer and product owner."
-msgstr ""
-
#. module: project_scrum
#: view:project.scrum.product.backlog:0
msgid "Remaining Hours"
@@ -861,6 +863,11 @@ msgstr ""
msgid "Send Email for Scrum Meeting Details"
msgstr ""
+#. module: project_scrum
+#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
+msgid "The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project."
+msgstr ""
+
#. module: project_scrum
#: model:process.transition,name:project_scrum.process_transition_backlogtask0
msgid "Backlog Task"
@@ -913,7 +920,7 @@ msgid "Progress (0-100)"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:324
#, python-format
msgid "I am sending you Daily Meeting Details of date"
msgstr ""
@@ -964,13 +971,13 @@ msgid "This wizard merge backlogs and create one new backlog with draft state (O
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:325
#, python-format
msgid "*Task for Today:"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:303
#, python-format
msgid "Please provide email address for scrum master defined on sprint."
msgstr ""
@@ -1013,19 +1020,19 @@ msgid "Feature Description"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
#, python-format
msgid "Please select any Project."
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:0
+#: code:addons/project_scrum/wizard/project_scrum_email.py:97
#, python-format
msgid "Thank you,"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:0
+#: code:addons/project_scrum/project_scrum.py:90
#, python-format
msgid "The sprint '%s' has been closed."
msgstr ""
@@ -1058,7 +1065,7 @@ msgid "Sprint"
msgstr ""
#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:0
+#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
#, python-format
msgid "Please select at least two product Backlogs"
msgstr ""
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index 8bcf42dd13a..8006a8156f0 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:02+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:02+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:21+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:21+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:53
#, python-format
msgid "No employee defined for user \"%s\". You must create one."
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:61
#, python-format
msgid "No journal defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
@@ -34,8 +34,8 @@ msgid "Timesheet task"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Search Analytic Lines"
+#: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
+msgid "Sign in / Sign out by project"
msgstr ""
#. module: project_timesheet
@@ -49,19 +49,18 @@ msgid "Project Task Work"
msgstr ""
#. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "February"
+#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
+msgid "report.timesheet.task.user"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
msgid "Group By..."
msgstr ""
#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
+#: constraint:res.partner:0
+msgid "Error ! You can not create recursive associated members."
msgstr ""
#. module: project_timesheet
@@ -75,6 +74,11 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Analytic account/project"
+msgstr ""
+
#. module: project_timesheet
#: field:report.timesheet.task.user,task_hrs:0
msgid "Task Hours"
@@ -91,8 +95,14 @@ msgid " Year "
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Product"
+#: model:ir.model,name:project_timesheet.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: project_timesheet
+#: code:addons/project_timesheet/project_timesheet.py:229
+#, python-format
+msgid "Cannot delete Partner which is Assigned to project !"
msgstr ""
#. module: project_timesheet
@@ -126,8 +136,9 @@ msgid "Error ! You cannot create recursive tasks."
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Journal"
+#: code:addons/project_timesheet/project_timesheet.py:229
+#, python-format
+msgid "Invalid action !"
msgstr ""
#. module: project_timesheet
@@ -135,11 +146,6 @@ msgstr ""
msgid "June"
msgstr ""
-#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "My Entries"
-msgstr ""
-
#. module: project_timesheet
#: model:ir.model,name:project_timesheet.model_project_task
msgid "Task"
@@ -151,7 +157,6 @@ msgid "Invoice Tasks Work"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,user_id:0
msgid "User"
@@ -172,11 +177,6 @@ msgstr ""
msgid "July"
msgstr ""
-#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Extended Filters..."
-msgstr ""
-
#. module: project_timesheet
#: model:process.node,note:project_timesheet.process_node_timesheettask0
msgid "Complete Your Timesheet."
@@ -202,8 +202,8 @@ msgid "\n"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Account"
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
msgstr ""
#. module: project_timesheet
@@ -247,7 +247,7 @@ msgid "Tasks by User"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:57
#, python-format
msgid "No product defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
@@ -270,8 +270,8 @@ msgid "Invoicing Data"
msgstr ""
#. module: project_timesheet
-#: view:account.analytic.line:0
-msgid "Fin.Account"
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
msgstr ""
#. module: project_timesheet
@@ -285,7 +285,10 @@ msgid "Timesheet/Task hours Report Per Month"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:52
+#: code:addons/project_timesheet/project_timesheet.py:56
+#: code:addons/project_timesheet/project_timesheet.py:60
+#: code:addons/project_timesheet/project_timesheet.py:67
#, python-format
msgid "Bad Configuration !"
msgstr ""
@@ -321,8 +324,8 @@ msgid "After task is completed, Create its invoice."
msgstr ""
#. module: project_timesheet
-#: model:ir.model,name:project_timesheet.model_report_timesheet_task_user
-msgid "report.timesheet.task.user"
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sale order lines"
msgstr ""
#. module: project_timesheet
@@ -336,18 +339,13 @@ msgstr ""
msgid "Project Timesheet"
msgstr ""
-#. module: project_timesheet
-#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
-msgid "Encode how much time u spent on your task"
-msgstr ""
-
#. module: project_timesheet
#: view:project.project:0
msgid "Invoice Task Work"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:0
+#: code:addons/project_timesheet/project_timesheet.py:68
#, python-format
msgid "No product and product category property account defined on the related employee.\n"
"Fill in the timesheet tab of the employee form."
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 42b9c4733ba..b6ec7d069bd 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -111,7 +111,7 @@ class project_work(osv.osv):
# Compute based on pricetype
amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
- prod_id, amount, False, unit, context=context)
+ prod_id, amount, False, unit, vals_line['journal_id'], context=context)
if amount_unit and 'amount' in amount_unit.get('value',{}):
updv = { 'amount': amount_unit['value']['amount'] }
obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
@@ -158,7 +158,7 @@ class project_work(osv.osv):
# Compute based on pricetype
amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
prod_id=prod_id, company_id=False,
- unit_amount=vals_line['unit_amount'], unit=False, context=context)
+ unit_amount=vals_line['unit_amount'], unit=False, journal_id=vals_line['journal_id'], context=context)
if amount_unit and 'amount' in amount_unit.get('value',{}):
vals_line['amount'] = amount_unit['value']['amount']
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index b2c909df237..7d55ca419be 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -50,7 +50,7 @@
-
+
@@ -72,7 +72,7 @@
-
+
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index f2618d4263b..e73811f21d0 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:22+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:22+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "The buyer has to approve the RFQ before being sent to the supplier. The R
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:282
#, python-format
msgid "You can not confirm purchase order without Purchase Order Lines."
msgstr ""
@@ -39,7 +39,7 @@ msgid "Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:710
#, python-format
msgid "You have to select a product UOM in the same category than the purchase UOM of the product"
msgstr ""
@@ -49,11 +49,21 @@ msgstr ""
msgid "Date on which this document has been created"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_rfq
+msgid "You can create a request for quotation when you want to buy products to a supplier but the purchase is not confirmed yet. Use also this menu to review requests for quotation created automatically based on your logistic rules (minimum stock, MTO, etc). You can convert the request for quotation into a purchase order once the order is confirmed. If you use the extended interface (from user's preferences), you can select the way to control your supplier invoices: based on the order, based on the receptions or manual encoding."
+msgstr ""
+
#. module: purchase
#: selection:purchase.order,invoice_method:0
msgid "From Picking"
msgstr ""
+#. module: purchase
+#: view:purchase.order:0
+msgid "Not Invoiced"
+msgstr ""
+
#. module: purchase
#: field:purchase.order,dest_address_id:0
msgid "Destination Address"
@@ -80,20 +90,25 @@ msgid "Do you want to generate the supplier invoices ?"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: model:ir.actions.act_window,help:purchase.purchase_form_action
+msgid "Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices."
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:722
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/wizard/purchase_line_invoice.py:156
#, python-format
msgid "Supplier Invoices"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-msgid "Purchase Orders Statistics"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
msgstr ""
#. module: purchase
@@ -103,7 +118,7 @@ msgid "From a Pick list"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:649
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -128,11 +143,6 @@ msgstr ""
msgid "Company"
msgstr ""
-#. module: purchase
-#: help:res.company,po_lead:0
-msgid "This is the leads/security time for each purchase order."
-msgstr ""
-
#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -187,7 +197,7 @@ msgid "Partial Picking"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:286
#, python-format
msgid "Purchase order '%s' is confirmed."
msgstr ""
@@ -206,19 +216,23 @@ msgid "Approved"
msgstr ""
#. module: purchase
-#: model:process.process,name:purchase.process_process_purchaseprocess0
-msgid "Purchase"
+#: view:purchase.report:0
+msgid "Reference UOM"
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Stock Moves"
+#: view:purchase.order:0
+msgid "Origin"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
-#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
-msgid "Receptions Analysis"
+#: field:purchase.report,product_uom:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
+msgid "Purchases"
msgstr ""
#. module: purchase
@@ -230,7 +244,7 @@ msgid "Notes"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:649
#, python-format
msgid "You have to select a pricelist or a supplier in the purchase form !\n"
"Please set one before choosing a product."
@@ -301,7 +315,7 @@ msgid "Cancelled"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:305
#, python-format
msgid "Purchase amount over the limit"
msgstr ""
@@ -324,8 +338,8 @@ msgid "Shipping Exception"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Origin"
+#: field:purchase.order.line,invoice_lines:0
+msgid "Invoice Lines"
msgstr ""
#. module: purchase
@@ -355,7 +369,7 @@ msgid "Reference"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:237
#, python-format
msgid "Cannot delete Purchase Order(s) which are in %s State!"
msgstr ""
@@ -366,8 +380,8 @@ msgid "Dest. Address Contact Name"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
-msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you did not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
+#: model:ir.model,name:purchase.model_stock_move
+msgid "Stock Move"
msgstr ""
#. module: purchase
@@ -377,7 +391,7 @@ msgid "Day"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:334
#, python-format
msgid "Purchase order '%s' has been set in draft state."
msgstr ""
@@ -394,8 +408,9 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_order_group.py:0
+#: code:addons/purchase/purchase.py:685
+#: code:addons/purchase/purchase.py:722
+#: code:addons/purchase/wizard/purchase_order_group.py:47
#, python-format
msgid "Warning"
msgstr ""
@@ -431,7 +446,7 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:710
#, python-format
msgid "Wrong Product UOM !"
msgstr ""
@@ -475,6 +490,11 @@ msgstr ""
msgid "Supplier Reference"
msgstr ""
+#. module: purchase
+#: help:purchase.order,amount_tax:0
+msgid "The tax amount"
+msgstr ""
+
#. module: purchase
#: model:process.transition,note:purchase.process_transition_productrecept0
msgid "A Pick list generates a supplier invoice. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
@@ -521,7 +541,7 @@ msgid "Order Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:651
#, python-format
msgid "No Partner!"
msgstr ""
@@ -539,11 +559,12 @@ msgstr ""
#. module: purchase
#: view:purchase.order:0
-msgid "To be Invoiced"
+msgid "Untaxed amount"
msgstr ""
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
msgid "Pricelists"
msgstr ""
@@ -565,8 +586,10 @@ msgid "Invoices generated for a purchase order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/purchase.py:282
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/purchase.py:362
+#: code:addons/purchase/wizard/purchase_line_invoice.py:122
#, python-format
msgid "Error !"
msgstr ""
@@ -617,7 +640,7 @@ msgid "Reservation Destination"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:237
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -662,6 +685,11 @@ msgstr ""
msgid "Validated by"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.action_invoice_pending
+msgid "Use this menu to control the invoices to be received from your supplier. OpenERP pregenerates draft invoices from your purchase orders or receptions, according to your settings. Once you receive a supplier invoice, you can match it with the draft invoice and validate it."
+msgstr ""
+
#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -684,7 +712,7 @@ msgid " Month-1 "
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:363
#, python-format
msgid "There is no purchase journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -695,7 +723,7 @@ msgid "Manual"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:400
#, python-format
msgid "You must first cancel all picking attached to this purchase order."
msgstr ""
@@ -718,9 +746,13 @@ msgid "Approbation"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_res_partner
-#: field:purchase.order.line,partner_id:0
-msgid "Partner"
+#: view:purchase.report:0
+msgid "Purchase Orders Statistics"
+msgstr ""
+
+#. module: purchase
+#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
+msgid "If you set the invoicing control on a purchase order as \"Manual\", you can track here all the purchase order lines for which you have not received the supplier invoice yet. Once you are ready to receive a supplier invoice, you can generate a draft supplier invoice based on the lines from this menu."
msgstr ""
#. module: purchase
@@ -749,6 +781,11 @@ msgstr ""
msgid "Purchase Requisition"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
@@ -941,9 +978,8 @@ msgid "It indicates that an invoice has been paid"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_form_action
-msgid "From the Purchase Orders menu, you can track the status of your orders: products received, invoice received and controlled.\n"
-""
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
msgstr ""
#. module: purchase
@@ -988,7 +1024,7 @@ msgid "Manual Invoices"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:308
#, python-format
msgid "Somebody has just confirmed a purchase with an amount over the defined limit"
msgstr ""
@@ -1004,25 +1040,20 @@ msgid "Extended Filters..."
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
-#: code:addons/purchase/wizard/purchase_line_invoice.py:0
+#: code:addons/purchase/purchase.py:352
+#: code:addons/purchase/wizard/purchase_line_invoice.py:123
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:408
#, python-format
msgid "You must first cancel all invoices attached to this purchase order."
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,help:purchase.action_invoice_pending
-msgid "Use this menu to control the invoices to be received by your supplier. OpenERP pre-generates draft of invoices based on your purchase orders or your receptions. Once you receive a supplier invoice, you can control it according to the draft of invoice and validate it."
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/wizard/purchase_order_group.py:0
+#: code:addons/purchase/wizard/purchase_order_group.py:48
#, python-format
msgid "Please select multiple order to merge in the list view."
msgstr ""
@@ -1061,7 +1092,7 @@ msgid "\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:685
#, python-format
msgid "The selected supplier has a minimal quantity set to %s, you cannot purchase less."
msgstr ""
@@ -1103,8 +1134,8 @@ msgid "Products Value"
msgstr ""
#. module: purchase
-#: help:purchase.order,amount_tax:0
-msgid "The tax amount"
+#: model:ir.ui.menu,name:purchase.menu_purchase_product_pricelist_type
+msgid "Pricelists Types"
msgstr ""
#. module: purchase
@@ -1125,8 +1156,8 @@ msgid "History"
msgstr ""
#. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
-msgid "Purchases"
+#: model:ir.ui.menu,name:purchase.menu_product_by_category_purchase_form
+msgid "Products by Category"
msgstr ""
#. module: purchase
@@ -1312,7 +1343,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:407
#, python-format
msgid "Could not cancel this purchase order !"
msgstr ""
@@ -1328,17 +1359,13 @@ msgstr ""
msgid "Delivery & Invoicing"
msgstr ""
-#. module: purchase
-#: model:ir.actions.act_window,help:purchase.purchase_rfq
-msgid "With the Requests for quotation menu you can create new request for quotations, review existing one and confirm them to order once the supplier offer is approved. When you confirm a RfQ, OpenERP will convert it to a Purchase Order and generate the next steps: draft reception of the products, invoice to control."
-msgstr ""
-
#. module: purchase
#: field:purchase.order.line,date_planned:0
msgid "Scheduled Date"
msgstr ""
#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_in_config_purchase
#: field:purchase.order,product_id:0
#: view:purchase.order.line:0
#: field:purchase.order.line,product_id:0
@@ -1361,8 +1388,8 @@ msgid "Description"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: help:res.company,po_lead:0
+msgid "This is the leads/security time for each purchase order."
msgstr ""
#. module: purchase
@@ -1370,6 +1397,12 @@ msgstr ""
msgid "Expected Delivery address:"
msgstr ""
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
+#: model:ir.ui.menu,name:purchase.menu_action_stock_move_report_po
+msgid "Receptions Analysis"
+msgstr ""
+
#. module: purchase
#: help:purchase.order,amount_untaxed:0
msgid "The amount without tax"
@@ -1377,12 +1410,7 @@ msgstr ""
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_supplier_address_form
-msgid "Access your supplier records and maintain your relationship with them. You can track all your interactions with them through the history tab: emails, orders, meeting, etc."
-msgstr ""
-
-#. module: purchase
-#: field:purchase.order.line,invoice_lines:0
-msgid "Invoice Lines"
+msgid "Access your supplier records and maintain a good relationship with your suppliers. You can track all your interactions with them through the History tab: emails, orders, meetings, etc."
msgstr ""
#. module: purchase
@@ -1398,7 +1426,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order.line,product_uom:0
-#: view:purchase.report:0
msgid "Product UOM"
msgstr ""
@@ -1425,7 +1452,7 @@ msgid "Total Qty and Amount by month"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:399
#, python-format
msgid "Could not cancel purchase order !"
msgstr ""
@@ -1440,6 +1467,11 @@ msgstr ""
msgid "February"
msgstr ""
+#. module: purchase
+#: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
+msgid "Products Categories"
+msgstr ""
+
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all
#: model:ir.ui.menu,name:purchase.menu_action_purchase_order_report_all
@@ -1511,8 +1543,9 @@ msgid " Please note that: \n"
msgstr ""
#. module: purchase
-#: field:purchase.report,product_uom:0
-msgid "Product UoM"
+#: view:purchase.report:0
+#: field:purchase.report,name:0
+msgid "Year"
msgstr ""
#. module: purchase
@@ -1555,7 +1588,7 @@ msgid " * The 'Draft' state is set automatically when purchase order in draft st
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: code:addons/purchase/purchase.py:414
#, python-format
msgid "Purchase order '%s' is cancelled."
msgstr ""
@@ -1618,13 +1651,18 @@ msgid "The invoice is created automatically if the Invoice control of the purcha
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,name:0
-msgid "Year"
+#: model:process.process,name:purchase.process_process_purchaseprocess0
+msgid "Purchase"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:0
+#: model:ir.model,name:purchase.model_res_partner
+#: field:purchase.order.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: purchase
+#: code:addons/purchase/purchase.py:651
#, python-format
msgid "You have to select a partner in the purchase form !\n"
"Please set one partner before choosing a product."
@@ -1641,13 +1679,14 @@ msgid "Partial Move"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_stock_move
-msgid "Stock Move"
+#: view:purchase.order.line:0
+msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: view:purchase.order:0
-msgid "Untaxed amount"
+#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
+msgid "Units of Measure"
msgstr ""
#. module: purchase
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 1f66b471ddf..75b4a5b2e34 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:03+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:03+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:23+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:23+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,19 +15,29 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: purchase_analytic_plans
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr ""
+
+#. module: purchase_analytic_plans
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: purchase_analytic_plans
#: field:purchase.order.line,analytics_id:0
msgid "Analytic Distribution"
msgstr ""
#. module: purchase_analytic_plans
-#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
-msgid "Purchase Analytic Distribution Management"
+#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
+msgid "Purchase Order"
msgstr ""
#. module: purchase_analytic_plans
-#: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
-msgid "Purchase Order Line"
+#: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
+msgid "Purchase Analytic Distribution Management"
msgstr ""
#. module: purchase_analytic_plans
@@ -37,8 +47,3 @@ msgid "\n"
" "
msgstr ""
-#. module: purchase_analytic_plans
-#: model:ir.model,name:purchase_analytic_plans.model_purchase_order
-msgid "Purchase Order"
-msgstr ""
-
diff --git a/addons/purchase_double_validation/i18n/purchase_double_validation.pot b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
new file mode 100644
index 00000000000..bfd6d52a319
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
@@ -0,0 +1,80 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * purchase_double_validation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-03 16:58:23+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:23+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,shortdesc:purchase_double_validation.module_meta_information
+msgid "purchase_double_validation"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.module.module,description:purchase_double_validation.module_meta_information
+msgid "\n"
+" This module modifies the purchase workflow in order to validate purchases that exceeds minimum amount set by configuration wizard\n"
+" "
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr ""
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr ""
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr ""
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr ""
+
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index 5af7c176be8..56beeb7aca8 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "In Progress"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
#, python-format
msgid "No Product in Tender"
msgstr ""
@@ -38,11 +38,6 @@ msgstr ""
msgid "Responsible"
msgstr ""
-#. module: purchase_requisition
-#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
-msgid "A purchase requisition is a step before the request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to supplier. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others."
-msgstr ""
-
#. module: purchase_requisition
#: view:purchase.requisition:0
msgid "Group By..."
@@ -105,8 +100,8 @@ msgid "Product"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Quotations"
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique !"
msgstr ""
#. module: purchase_requisition
@@ -175,6 +170,11 @@ msgstr ""
msgid "Start Date"
msgstr ""
+#. module: purchase_requisition
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others."
+msgstr ""
+
#. module: purchase_requisition
#: field:purchase.requisition.line,product_qty:0
msgid "Quantity"
@@ -240,7 +240,7 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:0
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:44
#, python-format
msgid "Error!"
msgstr ""
@@ -323,6 +323,11 @@ msgstr ""
msgid "Latest Requisition"
msgstr ""
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+msgid "Quotations"
+msgstr ""
+
#. module: purchase_requisition
#: report:purchase.requisition:0
msgid "Qty"
diff --git a/addons/report_designer/i18n/report_designer.pot b/addons/report_designer/i18n/report_designer.pot
index ff9c07bbf99..73374ea0bae 100644
--- a/addons/report_designer/i18n/report_designer.pot
+++ b/addons/report_designer/i18n/report_designer.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:04+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:04+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:24+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index a246cf3d8cb..c6943c9b368 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:05+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:05+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot
index 350aa630ffa..89185b2018a 100644
--- a/addons/report_webkit/i18n/report_webkit.pot
+++ b/addons/report_webkit/i18n/report_webkit.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:06+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:06+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgid "Company"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:84
#, python-format
msgid "path to Wkhtmltopdf is not absolute"
msgstr ""
@@ -79,7 +79,10 @@ msgid "B7 21 88 x 125 mm"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:290
+#: code:addons/report_webkit/webkit_report.py:304
+#: code:addons/report_webkit/webkit_report.py:322
+#: code:addons/report_webkit/webkit_report.py:338
#, python-format
msgid "Webkit render"
msgstr ""
@@ -90,7 +93,7 @@ msgid "Folio 27 210 x 330 mm"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:67
#, python-format
msgid "Please install executable on your system'+\n"
" ' (sudo apt-get install wkhtmltopdf) or download it from here:'+\n"
@@ -104,14 +107,14 @@ msgid "Name of Image"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:78
#, python-format
msgid "Wrong Wkhtmltopdf path set in company'+\n"
" 'Given path is not executable or path is wrong"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:151
#, python-format
msgid "Webkit raise an error"
msgstr ""
@@ -173,7 +176,7 @@ msgid "Type"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/wizard/report_webkit_actions.py:0
+#: code:addons/report_webkit/wizard/report_webkit_actions.py:134
#, python-format
msgid "Client Actions Connections"
msgstr ""
@@ -204,7 +207,7 @@ msgid "The header linked to the report"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:66
#, python-format
msgid "Wkhtmltopdf library path is not set in company"
msgstr ""
@@ -290,7 +293,7 @@ msgid "Top Margin (mm)"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:246
#, python-format
msgid "Please set a header in company settings"
msgstr ""
@@ -436,7 +439,7 @@ msgid "A3 8 297 x 420 mm"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:240
#, python-format
msgid "'))\n"
" header = report_xml.webkit_header.html\n"
@@ -509,7 +512,7 @@ msgid "Comm10E 25 105 x 241 mm, U.S. Common 10 Envelope"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:0
+#: code:addons/report_webkit/webkit_report.py:240
#, python-format
msgid "Webkit Report template not found !"
msgstr ""
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
index 63e85ef71d4..bbf2c4dd3b1 100644
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:06+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:06+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:25+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:25+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,12 +21,12 @@ msgid "WebKit invoice"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
msgid "Supplier Invoice"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
msgid "Unit Price"
msgstr ""
@@ -48,92 +48,92 @@ msgid "Webkit Report Samples"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
msgid "Disc.(%)"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
msgid "Fax"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
msgid "Document"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
msgid "Description"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
msgid "Price"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
msgid "Invoice Date"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
msgid "QTY"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
msgid "Base"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
msgid "Partner Ref."
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
msgid "Taxes"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
msgid "Amount"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
msgid "VAT"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
msgid "Refund"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
msgid "Tel"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
msgid "E-mail"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
msgid "Invoice"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
msgid "Supplier Refund"
msgstr ""
#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
msgid "Total"
msgstr ""
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 43985994c8b..a539f6350bf 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:07+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:07+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:26+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:26+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,8 +45,6 @@ msgstr ""
#: view:resource.calendar:0
#: field:resource.calendar,attendance_ids:0
#: view:resource.calendar.attendance:0
-#: view:resource.calendar.leaves:0
-#: view:resource.resource:0
msgid "Working Time"
msgstr ""
@@ -121,6 +119,11 @@ msgstr ""
msgid "Day of week"
msgstr ""
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
#. module: resource
#: field:resource.calendar.attendance,date_from:0
msgid "Starting date"
@@ -152,11 +155,6 @@ msgstr ""
msgid "Search Working Period Leaves"
msgstr ""
-#. module: resource
-#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
-msgid "Resources allows you to create and manage resources that should be involved in a specific project phase. It also allows you to set their efficiency level and workload based on their weekly working hours"
-msgstr ""
-
#. module: resource
#: field:resource.calendar.leaves,date_to:0
msgid "End Date"
@@ -204,6 +202,9 @@ msgstr ""
#. module: resource
#: model:ir.actions.act_window,name:resource.action_resource_calendar_form
+#: view:resource.calendar.leaves:0
+#: view:resource.resource:0
+#: field:resource.resource,calendar_id:0
msgid "Working Period"
msgstr ""
@@ -269,7 +270,6 @@ msgstr ""
#. module: resource
#: field:resource.calendar.leaves,calendar_id:0
-#: field:resource.resource,calendar_id:0
msgid "Working time"
msgstr ""
@@ -285,8 +285,8 @@ msgid "General Information"
msgstr ""
#. module: resource
-#: help:resource.calendar.attendance,hour_to:0
-msgid "Working time will end at"
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid "Resources allow you to create and manage resources that should be involved in a specific project phase. You can also set their efficiency level and workload based on their weekly working hours."
msgstr ""
#. module: resource
@@ -295,7 +295,7 @@ msgid "Inactive"
msgstr ""
#. module: resource
-#: code:addons/resource/faces/resource.py:0
+#: code:addons/resource/faces/resource.py:340
#, python-format
msgid "(vacation)"
msgstr ""
@@ -321,7 +321,7 @@ msgid "Start Date"
msgstr ""
#. module: resource
-#: code:addons/resource/resource.py:0
+#: code:addons/resource/resource.py:246
#, python-format
msgid " (copy)"
msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index b1e1ba2aedc..4f06e174548 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
#. module: sale
#: help:sale.installer,delivery:0
msgid "Allows you to compute delivery costs on your quotations."
@@ -26,11 +32,8 @@ msgid "If you don't have enough stock available to deliver all at once, do you a
msgstr ""
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Quotations"
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
msgstr ""
#. module: sale
@@ -57,7 +60,7 @@ msgid "Configure Sales Order Logistics"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:603
#, python-format
msgid "The quotation '%s' has been converted to a sales order."
msgstr ""
@@ -68,7 +71,7 @@ msgid "Payment Before Delivery"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:0
+#: code:addons/sale/wizard/sale_make_invoice.py:42
#, python-format
msgid "Warning !"
msgstr ""
@@ -96,6 +99,11 @@ msgstr ""
msgid "Analytic Account"
msgstr ""
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid "Here is a list of each sales order line to be invoiced. You can invoice sales orders partially, by lines of sales order. You do not need this list if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
#. module: sale
#: model:process.node,name:sale.process_node_saleprocurement0
msgid "Procurement Order"
@@ -113,14 +121,13 @@ msgid "Order Line"
msgstr ""
#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid "Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer."
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_average:0
-msgid "Average Price"
+#: help:sale.order,invoice_quantity:0
+msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
msgstr ""
#. module: sale
@@ -162,8 +169,6 @@ msgid "Ordered Quantities"
msgstr ""
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
#: view:sale.report:0
msgid "Sales by Salesman"
msgstr ""
@@ -189,11 +194,6 @@ msgstr ""
msgid "Dates"
msgstr ""
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid "Here is a list of each sales order line to be invoiced. This view allows you to invoice sales orders partially, by lines of sales order. You don't need this list if you invoice based on the delivery orders or if you invoice sales totally."
-msgstr ""
-
#. module: sale
#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
msgid "The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'."
@@ -220,10 +220,8 @@ msgid "This is the days added to what you promise to customers for security purp
msgstr ""
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
msgstr ""
#. module: sale
@@ -242,7 +240,7 @@ msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1014
#, python-format
msgid "No Customer Defined !"
msgstr ""
@@ -272,7 +270,7 @@ msgid "The Shipping Policy is used to synchronise invoice and delivery operation
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:939
#, python-format
msgid "There is no income category account defined in default Properties for Product Category or Fiscal Position is not defined !"
msgstr ""
@@ -288,7 +286,7 @@ msgid "You try to assign a lot which is not from the same product"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:620
#, python-format
msgid "invalid mode for test_state"
msgstr ""
@@ -299,7 +297,7 @@ msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:584
#, python-format
msgid "Could not cancel this sales order !"
msgstr ""
@@ -320,8 +318,11 @@ msgid "October"
msgstr ""
#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
msgstr ""
#. module: sale
@@ -377,13 +378,13 @@ msgid "The salesman confirms the quotation. The state of the sales order becomes
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:971
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1042
#, python-format
msgid "(n/a)"
msgstr ""
@@ -399,7 +400,7 @@ msgid "Tel. :"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
#, python-format
msgid "You cannot make an advance on a sales order that is defined as 'Automatic Invoice after delivery'."
msgstr ""
@@ -443,6 +444,11 @@ msgstr ""
msgid "Allotment Partner"
msgstr ""
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: sale
#: selection:sale.report,month:0
msgid "March"
@@ -468,11 +474,6 @@ msgstr ""
msgid "For every sales order line, a procurement order is created to supply the sold product."
msgstr ""
-#. module: sale
-#: view:board.board:0
-msgid "Sales by Customer"
-msgstr ""
-
#. module: sale
#: help:sale.order,incoterm:0
msgid "Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."
@@ -567,7 +568,9 @@ msgid "My Sales"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -650,7 +653,7 @@ msgid "Sales By Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:970
#, python-format
msgid "Could not cancel sales order line!"
msgstr ""
@@ -738,8 +741,8 @@ msgid "Picking Default Policy"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid "Sales Orders helps you manage quotations and orders done with your customers. OpenERP suggests that you to start by creating a quotation. Once the order is confirmed, the quotation is converted into a Sale Order. OpenERP can handle several types of products so that a sales order can trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sale order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer."
+#: help:sale.order,invoice_ids:0
+msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
msgstr ""
#. module: sale
@@ -753,7 +756,7 @@ msgid "The name and address of the contact who requested the order or quotation.
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:966
#, python-format
msgid "You cannot cancel a sales order line that has already been invoiced !"
msgstr ""
@@ -791,9 +794,12 @@ msgid "Exception"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
msgstr ""
#. module: sale
@@ -812,7 +818,6 @@ msgid "Compute"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
#: view:sale.report:0
msgid "Sales by Partner"
msgstr ""
@@ -872,6 +877,12 @@ msgstr ""
msgid "Shipping address :"
msgstr ""
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
#. module: sale
#: model:process.node,note:sale.process_node_quotation0
msgid "Draft state of sales order"
@@ -989,11 +1000,6 @@ msgstr ""
msgid "Taxes"
msgstr ""
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
-msgstr ""
-
#. module: sale
#: field:sale.order,order_policy:0
msgid "Shipping Policy"
@@ -1030,12 +1036,6 @@ msgstr ""
msgid "Advance Amount"
msgstr ""
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category"
-msgstr ""
-
#. module: sale
#: selection:sale.order,invoice_quantity:0
msgid "Shipped Quantities"
@@ -1052,13 +1052,15 @@ msgid "Picking List"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
#, python-format
msgid "Error !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:570
#, python-format
msgid "Could not cancel sales order !"
msgstr ""
@@ -1090,7 +1092,7 @@ msgid "Shipping & Manual Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1051
#, python-format
msgid "Picking Information !"
msgstr ""
@@ -1117,9 +1119,9 @@ msgid "To be reviewed by the accountant."
msgstr ""
#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
msgstr ""
#. module: sale
@@ -1180,12 +1182,9 @@ msgid "Sales"
msgstr ""
#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
msgstr ""
#. module: sale
@@ -1208,7 +1207,7 @@ msgid "Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1014
#, python-format
msgid "You have to select a customer in the sales form !\n"
"Please set one customer before choosing a product."
@@ -1245,7 +1244,7 @@ msgid "The amount without tax."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:571
#, python-format
msgid "You must first cancel all picking attached to this sales order."
msgstr ""
@@ -1327,7 +1326,7 @@ msgid "Order"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:921
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
@@ -1343,7 +1342,7 @@ msgid "Depending on the Invoicing control of the sales order, the invoice can be
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1116
#, python-format
msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
"The real stock is %.2f %s. (without reservations)"
@@ -1371,7 +1370,7 @@ msgid "Total"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:388
#, python-format
msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
msgstr ""
@@ -1382,7 +1381,14 @@ msgid "Depending on the configuration of the location Output, the move between t
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
#, python-format
msgid "Cannot delete a sales order line which is %s !"
msgstr ""
@@ -1440,6 +1446,12 @@ msgstr ""
msgid "Gives the margin of profitability by calculating the difference between Unit Price and Cost Price."
msgstr ""
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
#. module: sale
#: report:sale.order:0
msgid "Net Total :"
@@ -1466,19 +1478,13 @@ msgstr ""
msgid " Month "
msgstr ""
-#. module: sale
-#: view:sale.report:0
-#: field:sale.report,uom_name:0
-msgid "Default UoM"
-msgstr ""
-
#. module: sale
#: field:sale.report,date_confirm:0
msgid "Date Confirm"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:0
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid "Warning"
msgstr ""
@@ -1490,7 +1496,7 @@ msgid "Sales by Month"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1045
#, python-format
msgid "You selected a quantity of %d Units.\n"
"But it's not compatible with the selected packaging.\n"
@@ -1534,6 +1540,12 @@ msgstr ""
msgid "Error! You can not create recursive companies."
msgstr ""
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
#. module: sale
#: view:sale.order:0
#: field:sale.order.line,invoice_lines:0
@@ -1577,7 +1589,7 @@ msgid "August"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:0
+#: code:addons/sale/wizard/sale_line_invoice.py:111
#, python-format
msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n"
"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
@@ -1639,7 +1651,7 @@ msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
#: view:sale.advance.payment.inv:0
#: view:sale.order:0
@@ -1648,7 +1660,7 @@ msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:591
#, python-format
msgid "The sales order '%s' has been cancelled."
msgstr ""
@@ -1711,7 +1723,6 @@ msgid "Invoicing journals"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
#: field:sale.advance.payment.inv,product_id:0
msgid "Advance Product"
msgstr ""
@@ -1728,7 +1739,7 @@ msgid "You invoice has been successfully created!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:585
#, python-format
msgid "You must first cancel all invoices attached to this sales order."
msgstr ""
@@ -1754,7 +1765,7 @@ msgid "Sales Order Layout Improvement"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:0
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
#, python-format
msgid "Error"
msgstr ""
@@ -1786,13 +1797,13 @@ msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:290
#, python-format
msgid "Cannot delete Sales Order(s) which are already confirmed !"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:316
#, python-format
msgid "The sales order '%s' has been set in draft state."
msgstr ""
@@ -1802,11 +1813,6 @@ msgstr ""
msgid "from stock"
msgstr ""
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Shipping Default Policy"
-msgstr ""
-
#. module: sale
#: view:sale.open.invoice:0
msgid "Close"
@@ -1818,7 +1824,7 @@ msgid "Delivered"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:0
+#: code:addons/sale/sale.py:1115
#, python-format
msgid "Not enough stock !"
msgstr ""
@@ -1834,13 +1840,13 @@ msgid "Layout Sequence"
msgstr ""
#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid "If you have more than one shop reselling your company products, you can create and manage that from here. Whenever you will record a new quotation or sales order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sales."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid "If you have more than one shops reselling your company products, you can create and manage them from here. Whenever you will record a new quotation or sale order, it has to be linked to a shop. The shop also defines the warehouse from which the products will be delivered for each particular sale."
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
msgstr ""
#. module: sale
@@ -1866,6 +1872,11 @@ msgstr ""
msgid "Customer"
msgstr ""
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
#. module: sale
#: selection:sale.report,month:0
msgid "February"
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index 4212b772b9f..a92e1a2a47e 100644
--- a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
+++ b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:08+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:08+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:27+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:27+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 2078a202072..ded053c0655 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:09+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:28+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,19 +26,19 @@ msgid "Convert to Quotation"
msgstr ""
#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
#, python-format
msgid "is converted to Quotation."
msgstr ""
#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
#, python-format
msgid "Data Insufficient!"
msgstr ""
#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:89
#, python-format
msgid "Customer has no addresses defined!"
msgstr ""
@@ -67,6 +67,11 @@ msgstr ""
msgid "_Create"
msgstr ""
+#. module: sale_crm
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: sale_crm
#: help:crm.make.sale,close:0
msgid "Check this to close the opportunity after having created the sale order."
@@ -84,19 +89,19 @@ msgid "Monthly Turnover"
msgstr ""
#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
#, python-format
msgid "Converted to Sales Quotation(id: %s)."
msgstr ""
#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:108
#, python-format
msgid "Opportunity "
msgstr ""
#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:0
+#: code:addons/sale_crm/wizard/crm_make_sale.py:92
#, python-format
msgid "Opportunity: %s"
msgstr ""
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index 9b245d8d645..82d022bcb03 100644
--- a/addons/sale_journal/i18n/sale_journal.pot
+++ b/addons/sale_journal/i18n/sale_journal.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:09+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:09+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:28+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:28+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "The type of journal used for sales and picking."
msgstr ""
#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_sale_order
-msgid "Sales Order"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
msgstr ""
#. module: sale_journal
@@ -35,11 +35,6 @@ msgstr ""
msgid "Invoicing"
msgstr ""
-#. module: sale_journal
-#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
-msgid "Invoice types are used on partners, sales order and delivery orders. You can create journal to group your invoicing according to customer's needs: daily, each wednesday, monthly, etc."
-msgstr ""
-
#. module: sale_journal
#: view:res.partner:0
msgid "Sales & Purchases"
@@ -102,11 +97,21 @@ msgstr ""
msgid "Error ! You can not create recursive associated members."
msgstr ""
+#. module: sale_journal
+#: model:ir.actions.act_window,help:sale_journal.action_definition_journal_invoice_type
+msgid "Invoice types are used for partners, sales orders and delivery orders. You can create a specific invoicing journal to group your invoicing according to your customer's needs: daily, each Wednesday, monthly, etc."
+msgstr ""
+
#. module: sale_journal
#: field:sale_journal.invoice.type,invoicing_method:0
msgid "Invoicing method"
msgstr ""
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
#. module: sale_journal
#: field:sale.order,invoice_type_id:0
#: view:sale_journal.invoice.type:0
diff --git a/addons/sale_layout/i18n/sale_layout.pot b/addons/sale_layout/i18n/sale_layout.pot
index 476b762947a..a6347a41f48 100644
--- a/addons/sale_layout/i18n/sale_layout.pot
+++ b/addons/sale_layout/i18n/sale_layout.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -88,6 +88,11 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: sale_layout
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: sale_layout
#: report:sale.order.layout:0
msgid "Description"
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index c4b4e526bc9..3f2099b7af4 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -96,6 +96,11 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: sale_margin
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: sale_margin
#: view:report.account.invoice.product:0
msgid "Invoice by Partner"
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 3c48f2cfc18..b3a853d16a9 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:10+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:10+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:29+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:29+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 4018dd512e1..cad64f55dd1 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:30+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: sale_order_dates
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: sale_order_dates
#: help:sale.order,requested_date:0
msgid "Date on which customer has requested for sales."
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index b350a333cac..fc0fc2e6404 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:11+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:11+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:30+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:30+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: share
-#: code:addons/share/web/editors.py:0
+#: code:addons/share/web/editors.py:15
#, python-format
msgid "Sharing"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:434
#, python-format
msgid "This additional data has been automatically added to your current access.\n"
""
@@ -49,7 +49,7 @@ msgid "You can not have two users with the same login !"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:76
#, python-format
msgid "Sharing Wizard - Step 1"
msgstr ""
@@ -61,7 +61,7 @@ msgid "Share Access Rules"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:425
#, python-format
msgid "Dear,\n"
"\n"
@@ -89,7 +89,7 @@ msgid "The action that opens the screen containing the data you wish to share."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:68
#, python-format
msgid "Please specify \"share_root_url\" in context"
msgstr ""
@@ -100,7 +100,7 @@ msgid "Congratulations, you have successfully setup a new shared access!"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:247
#, python-format
msgid "(Copy for sharing)"
msgstr ""
@@ -116,7 +116,7 @@ msgid "Generic Share Access URL"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:429
#, python-format
msgid "You may use the following login and password to get access to this protected area:"
msgstr ""
@@ -147,7 +147,7 @@ msgid "Share wizard: step 1"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:430
#: field:share.wizard.result.line,login:0
#, python-format
msgid "Username"
@@ -159,7 +159,7 @@ msgid "Share User"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:424
#, python-format
msgid "%s has shared OpenERP %s information with you"
msgstr ""
@@ -176,7 +176,7 @@ msgid "Users"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:103
#, python-format
msgid "This username (%s) already exists, perhaps data has already been shared with this person.\n"
"You may want to try selecting existing shared users instead."
@@ -193,7 +193,7 @@ msgid "res.groups"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:121
#, python-format
msgid "%s (Shared)"
msgstr ""
@@ -209,7 +209,7 @@ msgid "New users (emails required)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:390
#, python-format
msgid "Sharing filter created by user %s (%s) for group %s"
msgstr ""
@@ -230,7 +230,7 @@ msgid "Share Group"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:431
#: field:share.wizard.result.line,password:0
#, python-format
msgid "Password"
@@ -252,7 +252,7 @@ msgid "The goal is to implement a generic sharing mechanism, where user of OpenE
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:102
#, python-format
msgid "User already exists"
msgstr ""
@@ -263,14 +263,14 @@ msgid "Send Email Notification(s)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:435
#, python-format
msgid "You may use your existing login and password to view it. As a reminder, your login is %s.\n"
""
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:432
#, python-format
msgid "Database"
msgstr ""
@@ -302,19 +302,19 @@ msgid "Users to share with"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:276
#, python-format
msgid "Indirect sharing filter created by user %s (%s) for group %s"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:420
#, python-format
msgid "Email required"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:212
#, python-format
msgid "Copied access for sharing"
msgstr ""
@@ -330,7 +330,7 @@ msgid "New Users (please provide one e-mail address per line below)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:420
#, python-format
msgid "The current user must have an email address configured in User Preferences to be able to send outgoing emails."
msgstr ""
@@ -351,7 +351,7 @@ msgid "Domain"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:286
#, python-format
msgid "Sorry, the current screen and filter you are trying to share are not supported at the moment.\n"
"You may want to try a simpler filter."
@@ -368,7 +368,7 @@ msgid "Access info"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:426
#, python-format
msgid "To access it, you can go to the following URL:\n"
" %s"
@@ -380,13 +380,13 @@ msgid "Action to share"
msgstr ""
#. module: share
-#: code:addons/share/web/editors.py:0
+#: code:addons/share/web/editors.py:18
#, python-format
msgid "Share"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:406
#, python-format
msgid "Sharing Wizard - Step 2"
msgstr ""
@@ -402,7 +402,7 @@ msgid "share.wizard.result.line"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:285
#, python-format
msgid "Sharing access could not be setup"
msgstr ""
@@ -446,7 +446,7 @@ msgid "Read-only"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:0
+#: code:addons/share/wizard/share_wizard.py:295
#, python-format
msgid "*usual password*"
msgstr ""
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 32bb0611101..b01326fdaa7 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "Stock ups upload"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:76
#, python-format
msgid "Variation Account is not specified for Product Category: %s"
msgstr ""
@@ -70,15 +70,11 @@ msgid "Revision Number"
msgstr ""
#. module: stock
-#: view:stock.move.memory:0
+#: view:stock.move.memory.in:0
+#: view:stock.move.memory.out:0
msgid "Product Moves"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree
-msgid "This is the list of all delivery orders that must be prepared, according to your different sales orders and your logistics rules."
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_move_report
#: model:ir.ui.menu,name:stock.menu_action_stock_move_report
@@ -91,13 +87,17 @@ msgstr ""
msgid "Internal reference number in case it differs from the manufacturer's serial number"
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_inventory_form
+msgid "Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product."
+msgstr ""
+
#. module: stock
#: view:stock.picking:0
msgid "Picking list"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
#: report:lot.stock.overview:0
#: report:lot.stock.overview_all:0
#: field:report.stock.inventory,product_qty:0
@@ -108,7 +108,8 @@ msgstr ""
#: report:stock.inventory.move:0
#: field:stock.move,product_qty:0
#: field:stock.move.consume,product_qty:0
-#: field:stock.move.memory,quantity:0
+#: field:stock.move.memory.in,quantity:0
+#: field:stock.move.memory.out,quantity:0
#: field:stock.move.scrap,product_qty:0
#: field:stock.move.split,qty:0
#: field:stock.move.split.lines,quantity:0
@@ -117,10 +118,14 @@ msgstr ""
#: field:stock.report.prodlots,qty:0
#: field:stock.report.tracklots,name:0
#: field:stock.split.into,quantity:0
-#, python-format
msgid "Quantity"
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree
+msgid "This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules."
+msgstr ""
+
#. module: stock
#: view:report.stock.move:0
#: field:report.stock.move,day:0
@@ -138,8 +143,10 @@ msgid "UoM"
msgstr ""
#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:93
#: model:ir.actions.act_window,name:stock.action_inventory_form
#: model:ir.ui.menu,name:stock.menu_action_inventory_form
+#, python-format
msgid "Physical Inventories"
msgstr ""
@@ -161,7 +168,8 @@ msgid "When doing real-time inventory valuation, counterpart Journal Items for a
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1176
+#: code:addons/stock/stock.py:2378
#, python-format
msgid "Missing partial picking data for move #%s"
msgstr ""
@@ -172,13 +180,14 @@ msgid "Deliver/Receive Products"
msgstr ""
#. module: stock
-#: code:addons/stock/report/report_stock.py:0
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
#, python-format
msgid "You cannot delete any record!"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:49
#, python-format
msgid "The current move line is already assigned to a pack, please remove it first if you really want to change it ' # 'for this product: \"%s\" (id: %d)"
msgstr ""
@@ -219,16 +228,11 @@ msgid "Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:661
#, python-format
msgid "Products to Process"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_location_form
-msgid "Define your locations in order to reflect to your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partners location (customers, suppliers) and virtual locations which are the counter-part of the stock operations like the manufacturing orders consummations, the inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location into the Stock location. Each report can be performed on physicals, partners or virtual locations."
-msgstr ""
-
#. module: stock
#: constraint:product.category:0
msgid "Error ! You can not create recursive categories."
@@ -239,24 +243,21 @@ msgstr ""
msgid "If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_inventory_form
-msgid "The Periodical Inventories are used when you count your number of products available per location. You can use it, once a year, when you do the general inventory or, once you need it, to correct the current stock level of a product."
-msgstr ""
-
#. module: stock
#: model:ir.model,name:stock.model_stock_move_split_lines
msgid "Split lines"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1127
#, python-format
msgid "You cannot cancel picking because stock move is in done state !"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2198
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
#, python-format
msgid "Warning!"
msgstr ""
@@ -266,15 +267,6 @@ msgstr ""
msgid "Group by partner"
msgstr ""
-#. module: stock
-#: help:stock.move,state:0
-msgid "When the stock move is created it is in the 'Draft' state.\n"
-" After that it is set to 'Confirmed' state.\n"
-" If stock is available state is set to 'Available'.\n"
-" When the picking is done the state is 'Done'. \n"
-"The state is 'Waiting' if the move is waiting for another one."
-msgstr ""
-
#. module: stock
#: model:ir.model,name:stock.model_res_partner
#: view:report.stock.inventory:0
@@ -289,12 +281,13 @@ msgid "Partner"
msgstr ""
#. module: stock
-#: help:stock.move.memory,currency:0
+#: help:stock.move.memory.in,currency:0
+#: help:stock.move.memory.out,currency:0
msgid "Currency in which Unit cost is expressed"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:135
#, python-format
msgid "No invoicing"
msgstr ""
@@ -306,6 +299,11 @@ msgstr ""
msgid "Production lot"
msgstr ""
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "Units of Measure Categories"
+msgstr ""
+
#. module: stock
#: help:stock.incoterms,code:0
msgid "Code for Incoterms"
@@ -371,6 +369,7 @@ msgstr ""
#. module: stock
#: selection:report.stock.inventory,state:0
#: selection:report.stock.move,state:0
+#: view:stock.move:0
#: selection:stock.move,state:0
#: view:stock.picking:0
#: selection:stock.picking,state:0
@@ -402,7 +401,7 @@ msgid "In Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
#, python-format
msgid "No product in this location."
msgstr ""
@@ -473,6 +472,12 @@ msgstr ""
msgid "Move History (child moves)"
msgstr ""
+#. module: stock
+#: code:addons/stock/stock.py:1984
+#, python-format
+msgid "There is no stock output account defined for this product or its category: \"%s\" (id: %d)"
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree6
#: model:ir.ui.menu,name:stock.menu_action_picking_tree6
@@ -486,12 +491,13 @@ msgid "Destination Location"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:751
#, python-format
msgid "You can not process picking without stock moves"
msgstr ""
#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
#: field:stock.move,product_packaging:0
msgid "Packaging"
msgstr ""
@@ -507,6 +513,11 @@ msgstr ""
msgid "Grand Total:"
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_out_picking_move
+msgid "You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field)."
+msgstr ""
+
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_inventory_control
msgid "Inventory Control"
@@ -525,7 +536,7 @@ msgid "Location / Product"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1306
#, python-format
msgid "Reception"
msgstr ""
@@ -545,6 +556,11 @@ msgstr ""
msgid "Forces to specify a Production Lot for all moves containing this product and going to a Customer Location"
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_stock_journal_form
+msgid "The stock journal system allows you to assign each stock operation to a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
+msgstr ""
+
#. module: stock
#: field:stock.location,complete_name:0
#: field:stock.location,name:0
@@ -595,11 +611,6 @@ msgstr ""
msgid "June"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_out_picking_move
-msgid "The 'Deliver Products' menu lists all products you have to deliver to your customers. You can process the deliveries directly from this list, line by or line or through the Delivery Orders menu."
-msgstr ""
-
#. module: stock
#: field:product.template,property_stock_procurement:0
msgid "Procurement Location"
@@ -647,7 +658,7 @@ msgid "Process Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:355
#, python-format
msgid "Future Receptions"
msgstr ""
@@ -675,7 +686,7 @@ msgid "Location Address"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2348
#, python-format
msgid "is consumed with"
msgstr ""
@@ -734,7 +745,7 @@ msgid "Merge Inventory"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:371
#, python-format
msgid "Future P&L"
msgstr ""
@@ -858,13 +869,13 @@ msgid "Left Parent"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:132
#, python-format
msgid "Delivery Information"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
#, python-format
msgid "Stock Inventory is done"
msgstr ""
@@ -875,7 +886,7 @@ msgid "Error: Invalid ean code"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:148
#, python-format
msgid "There is no stock output account defined for this product: \"%s\" (id: %d)"
msgstr ""
@@ -933,11 +944,16 @@ msgid "Author"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1305
#, python-format
msgid "Delivery Order"
msgstr ""
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_memory_in
+msgid "stock.move.memory.in"
+msgstr ""
+
#. module: stock
#: selection:stock.location,chained_auto_packing:0
msgid "Manual Operation"
@@ -959,6 +975,11 @@ msgstr ""
msgid "Expected Shipping Date"
msgstr ""
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Not Available"
+msgstr ""
+
#. module: stock
#: selection:report.stock.move,month:0
msgid "March"
@@ -993,11 +1014,9 @@ msgid "Lot number"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
#: field:stock.inventory.line,product_uom:0
#: field:stock.move.consume,product_uom:0
#: field:stock.move.scrap,product_uom:0
-#, python-format
msgid "Product UOM"
msgstr ""
@@ -1044,28 +1063,28 @@ msgstr ""
msgid "Downstream Traceability"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_stock_journal_form
-msgid "The stock journals system allows you assign each stock operation into a specific journal according to the type of operation to perform or the worker/team that should perform the operation. Examples of stock journals may be: quality control, pick lists, packing, etc."
-msgstr ""
-
#. module: stock
#: help:product.template,property_stock_production:0
msgid "For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1975
#, python-format
msgid "Can not create Journal Entry, Output Account defined on this product and Variant account on category of this product are same."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1322
#, python-format
msgid "is in draft state."
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_tracking_form
+msgid "This is the list of all your packs. When you select a Pack, you can get the upstream or downstream traceability of the products contained in the pack."
+msgstr ""
+
#. module: stock
#: model:ir.model,name:stock.model_stock_ups_final
msgid "Stock ups final"
@@ -1077,7 +1096,7 @@ msgid "Chaining Type"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:135
#, python-format
msgid "To be refunded/invoiced"
msgstr ""
@@ -1117,7 +1136,7 @@ msgid "Additional Info"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1602
#, python-format
msgid "Operation forbidden"
msgstr ""
@@ -1128,7 +1147,7 @@ msgid "From"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:79
#, python-format
msgid "You may only return pickings that are Confirmed, Available or Done!"
msgstr ""
@@ -1170,7 +1189,7 @@ msgid "Search Stock Picking"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:93
#, python-format
msgid "Company is not specified in Location"
msgstr ""
@@ -1223,13 +1242,13 @@ msgid "Customer Location"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:85
#, python-format
msgid "Invalid action !"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:139
#, python-format
msgid "Receive Information"
msgstr ""
@@ -1261,7 +1280,7 @@ msgid "Downstream traceability"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
#, python-format
msgid "No Invoices were created"
msgstr ""
@@ -1272,7 +1291,7 @@ msgid "OpenERP S.A."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:140
#, python-format
msgid "Receive"
msgstr ""
@@ -1310,7 +1329,7 @@ msgid "Let this field empty if this location is shared between all companies"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2198
#, python-format
msgid "Please provide a positive quantity to scrap!"
msgstr ""
@@ -1321,7 +1340,7 @@ msgid "Chaining Lead Time"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:85
#, python-format
msgid "Cannot deliver products which are already delivered !"
msgstr ""
@@ -1331,6 +1350,15 @@ msgstr ""
msgid "Stock Invoice Onshipping"
msgstr ""
+#. module: stock
+#: help:stock.move,state:0
+msgid "When the stock move is created it is in the 'Draft' state.\n"
+" After that, it is set to 'Not Available' state if the scheduler did not find the products.\n"
+" When products are reserved it is set to 'Available'.\n"
+" When the picking is done the state is 'Done'. \n"
+"The state is 'Waiting' if the move is waiting for another one."
+msgstr ""
+
#. module: stock
#: selection:report.stock.inventory,location_type:0
#: field:res.partner,property_stock_supplier:0
@@ -1339,7 +1367,7 @@ msgid "Supplier Location"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2217
#, python-format
msgid "were scrapped"
msgstr ""
@@ -1366,9 +1394,8 @@ msgid "Stock Statistics"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.move.memory,currency:0
-#, python-format
+#: field:stock.move.memory.in,currency:0
+#: field:stock.move.memory.out,currency:0
msgid "Currency"
msgstr ""
@@ -1378,7 +1405,7 @@ msgid "Track Manufacturing Lots"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
#, python-format
msgid "Please select multiple physical inventories to merge in the list view."
msgstr ""
@@ -1428,10 +1455,8 @@ msgid "Tracking lot"
msgstr ""
#. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
-#: help:stock.location,posz:0
-msgid "Optional localization details, for information purpose only"
+#: view:stock.picking:0
+msgid "Back Orders"
msgstr ""
#. module: stock
@@ -1451,7 +1476,7 @@ msgid "Stock report by tracking lots"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:367
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1496,7 +1521,7 @@ msgid "Location Stock"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
#, python-format
msgid "Merging is only allowed on draft inventories."
msgstr ""
@@ -1528,7 +1553,7 @@ msgid "Warehouse Dashboard"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:510
#, python-format
msgid "You can not remove a lot line !"
msgstr ""
@@ -1542,7 +1567,7 @@ msgid "Scrap Products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1135
#, python-format
msgid "You cannot remove the picking which is in %s state !"
msgstr ""
@@ -1599,13 +1624,13 @@ msgid "Shipping Address :"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:120
#, python-format
msgid "Provide the quantities of the returned products."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1978
#, python-format
msgid "Can not create Journal Entry, Input Account defined on this product and Variant account on category of this product are same."
msgstr ""
@@ -1673,13 +1698,13 @@ msgid "Quantity per lot"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1981
#, python-format
msgid "There is no stock input account defined for this product or its category: \"%s\" (id: %d)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:357
#, python-format
msgid "Received Qty"
msgstr ""
@@ -1708,12 +1733,6 @@ msgstr ""
msgid "Name"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "is done."
-msgstr ""
-
#. module: stock
#: view:product.product:0
msgid "Stocks"
@@ -1784,11 +1803,6 @@ msgstr ""
msgid "Total value"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_move_form2
-msgid "This menu gives you the full traceability of inventory operations made on a specific product. You can filter on the product to see all the past or future movements made on the product."
-msgstr ""
-
#. module: stock
#: help:stock.location,chained_journal_id:0
msgid "Inventory Journal in which the chained move will be written, if the Chaining Type is not Transparent (no journal is used if left empty)"
@@ -1806,9 +1820,8 @@ msgid "Creation"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: field:stock.move.memory,cost:0
-#, python-format
+#: field:stock.move.memory.in,cost:0
+#: field:stock.move.memory.out,cost:0
msgid "Cost"
msgstr ""
@@ -1836,7 +1849,7 @@ msgid "Automatic No Step Added"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2348
#, python-format
msgid "Product "
msgstr ""
@@ -1877,7 +1890,7 @@ msgid "Inventory loss"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1314
#, python-format
msgid "Document"
msgstr ""
@@ -1889,12 +1902,13 @@ msgstr ""
#. module: stock
#: field:stock.move,product_uom:0
-#: field:stock.move.memory,product_uom:0
+#: field:stock.move.memory.in,product_uom:0
+#: field:stock.move.memory.out,product_uom:0
msgid "Unit of Measure"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:176
#, python-format
msgid "Products: "
msgstr ""
@@ -1910,11 +1924,6 @@ msgstr ""
msgid "Tracking a move"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree6
-msgid "The Internal Moves lists all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has it's own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your pre-configured logistics rules but you can also record manual stock operations."
-msgstr ""
-
#. module: stock
#: view:product.product:0
msgid "Update"
@@ -1937,7 +1946,7 @@ msgid "Others"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:90
#, python-format
msgid "Could not find any difference between standard price and new price!"
msgstr ""
@@ -1969,7 +1978,7 @@ msgid "Warehouse board"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:377
#, python-format
msgid "Future Qty"
msgstr ""
@@ -2000,13 +2009,13 @@ msgid "Shipping Type"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2175
#, python-format
msgid "You can only delete draft moves."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:74
#: model:ir.actions.act_window,name:stock.act_product_location_open
#: model:ir.ui.menu,name:stock.menu_stock_products_menu
#: view:stock.inventory:0
@@ -2038,9 +2047,8 @@ msgid "When real-time inventory valuation is enabled on a product, this account
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#, python-format
-msgid "There is no stock output account defined for this product or its category: \"%s\" (id: %d)"
+#: model:ir.actions.act_window,help:stock.action_reception_picking_move
+msgid "Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line."
msgstr ""
#. module: stock
@@ -2054,7 +2062,8 @@ msgid "Delay(Days)"
msgstr ""
#. module: stock
-#: field:stock.move.memory,move_id:0
+#: field:stock.move.memory.in,move_id:0
+#: field:stock.move.memory.out,move_id:0
msgid "Move"
msgstr ""
@@ -2064,7 +2073,7 @@ msgid "Expected date for the picking to be processed"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:373
#, python-format
msgid "P&L Qty"
msgstr ""
@@ -2096,6 +2105,11 @@ msgstr ""
msgid "Sets a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_location_form
+msgid "Define your locations to reflect your warehouse structure and organization. OpenERP is able to manage physical locations (warehouses, shelves, bin, etc), partner locations (customers, suppliers) and virtual locations which are the counterpart of the stock operations like the manufacturing orders consumptions, inventories, etc. Every stock operation in OpenERP moves the products from one location to another one. For instance, if you receive products from a supplier, OpenERP will move products from the Supplier location to the Stock location. Each report can be performed on physical, partner or virtual locations."
+msgstr ""
+
#. module: stock
#: view:stock.invoice.onshipping:0
msgid "Create"
@@ -2118,7 +2132,7 @@ msgid "Source"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2557
#: model:ir.model,name:stock.model_stock_inventory
#: selection:report.stock.inventory,location_type:0
#: field:stock.inventory.line,inventory_id:0
@@ -2138,12 +2152,6 @@ msgstr ""
msgid "The combination of serial number and internal reference must be unique !"
msgstr ""
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#, python-format
-msgid "Currency in which Unit Cost is expressed"
-msgstr ""
-
#. module: stock
#: model:ir.model,name:stock.model_stock_ups
msgid "Stock ups"
@@ -2161,8 +2169,9 @@ msgid "Tracking serial"
msgstr ""
#. module: stock
-#: code:addons/stock/report/report_stock.py:0
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/report/report_stock.py:78
+#: code:addons/stock/report/report_stock.py:135
+#: code:addons/stock/stock.py:751
#, python-format
msgid "Error !"
msgstr ""
@@ -2173,13 +2182,14 @@ msgid "Stock Replacement result"
msgstr ""
#. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "Fixed Location"
+#: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
+msgid "Units of Measure"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,help:stock.action_production_lot_form
-msgid "This is the list of all the production lots (serial numbers) you recorded. After having selected a lot, you can get the up-stream or down-stream traceability of the products contained in lot."
+#: selection:stock.location,chained_location_type:0
+msgid "Fixed Location"
msgstr ""
#. module: stock
@@ -2223,8 +2233,8 @@ msgid "Maxtor Suppliers"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:0
-#: code:addons/stock/wizard/stock_change_standard_price.py:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:69
+#: code:addons/stock/wizard/stock_change_standard_price.py:106
#, python-format
msgid "Active ID is not set in Context"
msgstr ""
@@ -2241,7 +2251,7 @@ msgid "Scrap Move"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:138
#: model:ir.actions.act_window,name:stock.action_reception_picking_move
#: model:ir.ui.menu,name:stock.menu_action_pdct_in
#: view:stock.move:0
@@ -2250,7 +2260,7 @@ msgid "Receive Products"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:131
#: model:ir.actions.act_window,name:stock.action_out_picking_move
#: model:ir.ui.menu,name:stock.menu_action_pdct_out
#, python-format
@@ -2278,6 +2288,11 @@ msgstr ""
msgid "Date of Completion"
msgstr ""
+#. module: stock
+#: help:stock.production.lot,name:0
+msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+msgstr ""
+
#. module: stock
#: help:stock.tracking,active:0
msgid "By unchecking the active field, you may hide a pack without deleting it."
@@ -2315,18 +2330,19 @@ msgid "Company"
msgstr ""
#. module: stock
+#: view:stock.move:0
#: view:stock.picking:0
-msgid "Back Orders"
+msgid "Unit Of Measure"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:122
#, python-format
msgid "There is no stock input account defined for this product: \"%s\" (id: %d)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2302
#, python-format
msgid "Can not consume a move with negative or zero quantity !"
msgstr ""
@@ -2377,7 +2393,7 @@ msgid "Quantity (UOS)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1647
#, python-format
msgid "You are moving %.2f %s products but only %.2f %s available in this lot."
msgstr ""
@@ -2415,7 +2431,7 @@ msgid "Properties"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:982
#, python-format
msgid "Error, no partner !"
msgstr ""
@@ -2455,7 +2471,7 @@ msgid "Inventory Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1307
#, python-format
msgid "Internal picking"
msgstr ""
@@ -2538,7 +2554,7 @@ msgid "Date done"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:983
#, python-format
msgid "Please put a partner on the picking list if you want to generate invoice."
msgstr ""
@@ -2564,6 +2580,11 @@ msgstr ""
msgid "Responsible"
msgstr ""
+#. module: stock
+#: field:stock.move,returned_price:0
+msgid "Returned product price"
+msgstr ""
+
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_inventory_report
#: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
@@ -2583,39 +2604,41 @@ msgid "Stock"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
#: model:ir.model,name:stock.model_product_product
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
#: model:ir.ui.menu,name:stock.menu_stock_product
#: view:report.stock.inventory:0
#: field:report.stock.inventory,product_id:0
#: field:report.stock.lines.date,product_id:0
#: view:report.stock.move:0
#: field:report.stock.move,product_id:0
+#: field:stock.change.product.qty,product_id:0
#: field:stock.inventory.line,product_id:0
#: field:stock.inventory.line.split,product_id:0
#: report:stock.inventory.move:0
#: view:stock.move:0
#: field:stock.move,product_id:0
#: field:stock.move.consume,product_id:0
-#: field:stock.move.memory,product_id:0
+#: field:stock.move.memory.in,product_id:0
+#: field:stock.move.memory.out,product_id:0
#: field:stock.move.scrap,product_id:0
#: field:stock.move.split,product_id:0
#: view:stock.production.lot:0
#: field:stock.production.lot,product_id:0
#: field:stock.report.prodlots,product_id:0
#: field:stock.report.tracklots,product_id:0
-#, python-format
msgid "Product"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:135
#, python-format
msgid "Invoicing"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2237
+#: code:addons/stock/stock.py:2297
#, python-format
msgid "Please provide Proper Quantity !"
msgstr ""
@@ -2642,7 +2665,7 @@ msgid "Consume Products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1646
#, python-format
msgid "Insufficient Stock in Lot !"
msgstr ""
@@ -2680,7 +2703,18 @@ msgid "Total Value"
msgstr ""
#. module: stock
-#: field:stock.move.memory,wizard_id:0
+#: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
+msgid "Products by Category"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Products Categories"
+msgstr ""
+
+#. module: stock
+#: field:stock.move.memory.in,wizard_id:0
+#: field:stock.move.memory.out,wizard_id:0
msgid "Wizard"
msgstr ""
@@ -2700,6 +2734,11 @@ msgstr ""
msgid "Shelf 1"
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_picking_tree6
+msgid "Internal Moves display all inventory operations you have to perform in your warehouse. All operations can be categorized into stock journals, so that each worker has his own list of operations to perform in his own journal. Most operations are prepared automatically by OpenERP according to your preconfigured logistics rules, but you can also record manual stock operations."
+msgstr ""
+
#. module: stock
#: view:stock.move:0
msgid "Order"
@@ -2722,12 +2761,6 @@ msgstr ""
msgid "Accounting Entries"
msgstr ""
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Unit Of Measure"
-msgstr ""
-
#. module: stock
#: report:stock.picking.list:0
msgid "Total"
@@ -2772,13 +2805,13 @@ msgid "All at once"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1603
#, python-format
msgid "Quantities, UoMs, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:383
#, python-format
msgid "Future Productions"
msgstr ""
@@ -2789,7 +2822,7 @@ msgid "To Invoice"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:120
#, python-format
msgid "Return lines"
msgstr ""
@@ -2816,7 +2849,12 @@ msgid "Moves for this production lot"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
+#: model:ir.model,name:stock.model_stock_move_memory_out
+msgid "stock.move.memory.out"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:115
#, python-format
msgid "Message !"
msgstr ""
@@ -2842,13 +2880,18 @@ msgstr ""
msgid "Delivery Order:"
msgstr ""
+#. module: stock
+#: model:ir.actions.act_window,help:stock.action_production_lot_form
+msgid "This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers."
+msgstr ""
+
#. module: stock
#: field:stock.location,icon:0
msgid "Icon"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2174
#, python-format
msgid "UserError"
msgstr ""
@@ -2869,16 +2912,28 @@ msgid "Non European Customers"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_fill_inventory.py:0
-#: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/product.py:76
+#: code:addons/stock/product.py:90
+#: code:addons/stock/product.py:93
+#: code:addons/stock/product.py:100
+#: code:addons/stock/product.py:121
+#: code:addons/stock/product.py:147
+#: code:addons/stock/stock.py:1975
+#: code:addons/stock/stock.py:1978
+#: code:addons/stock/stock.py:1981
+#: code:addons/stock/stock.py:1984
+#: code:addons/stock/stock.py:1987
+#: code:addons/stock/stock.py:1990
+#: code:addons/stock/stock.py:2302
+#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/wizard/stock_splitinto.py:49
+#: code:addons/stock/wizard/stock_splitinto.py:53
#, python-format
msgid "Error!"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1990
#, python-format
msgid "There is no inventory variation account defined on the product category: \"%s\" (id: %d)"
msgstr ""
@@ -2898,8 +2953,8 @@ msgid "Cancelled"
msgstr ""
#. module: stock
-#: field:stock.location,chained_location_type:0
-msgid "Chained Location Type"
+#: view:stock.move:0
+msgid "Picking"
msgstr ""
#. module: stock
@@ -2908,7 +2963,7 @@ msgid "It specifies goods to be delivered all at once or by direct delivery"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
#, python-format
msgid "This picking list does not require invoicing."
msgstr ""
@@ -2930,14 +2985,24 @@ msgid "Determines whether this location is chained to another location, i.e. any
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:0
+#: code:addons/stock/wizard/stock_inventory_merge.py:43
+#: code:addons/stock/wizard/stock_inventory_merge.py:63
#, python-format
msgid "Warning"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,help:stock.action_location_tree
-msgid "This is the structure of your company's warehouses and locations. You can click on a location in order to get the list of the products and their stock level in this particular location and all its children."
+#: code:addons/stock/stock.py:1321
+#: code:addons/stock/stock.py:2557
+#, python-format
+msgid "is done."
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.act_window,name:stock.action_picking_tree
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree
+#: view:stock.picking:0
+msgid "Delivery Orders"
msgstr ""
#. module: stock
@@ -2949,7 +3014,6 @@ msgstr ""
#: selection:report.stock.inventory,state:0
#: selection:report.stock.move,state:0
#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
#: view:stock.picking:0
#: selection:stock.picking,state:0
msgid "Confirmed"
@@ -3002,9 +3066,8 @@ msgid "Back Order of"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
-#: help:stock.move.memory,cost:0
-#, python-format
+#: help:stock.move.memory.in,cost:0
+#: help:stock.move.memory.out,cost:0
msgid "Unit Cost for this product line"
msgstr ""
@@ -3018,7 +3081,7 @@ msgid "Product Category"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:77
#, python-format
msgid "INV: "
msgstr ""
@@ -3029,7 +3092,7 @@ msgid "Reporting"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1316
#, python-format
msgid " for the "
msgstr ""
@@ -3045,11 +3108,6 @@ msgstr ""
msgid "Create invoice"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_tracking_form
-msgid "This is the list of all your packs. After having selected a Pack, you can get the up-stream or down-stream traceability of the products contained in the pack."
-msgstr ""
-
#. module: stock
#: model:ir.ui.menu,name:stock.menu_stock_configuration
msgid "Configuration"
@@ -3079,7 +3137,7 @@ msgid "Chaining Journal"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:729
#, python-format
msgid "Not enough stock, unable to reserve the products."
msgstr ""
@@ -3090,29 +3148,24 @@ msgid "Customers"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1320
#, python-format
msgid "is cancelled."
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_reception_picking_move
-msgid "You will find here the list of all products you are waiting for, according to your preceding purchase orders. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line."
-msgstr ""
-
#. module: stock
#: view:stock.inventory.line:0
msgid "Stock Inventory Lines"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: code:addons/stock/wizard/stock_partial_picking.py:74
#, python-format
msgid "Process Document"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:365
#, python-format
msgid "Future Deliveries"
msgstr ""
@@ -3165,8 +3218,8 @@ msgid "Automatic Move"
msgstr ""
#. module: stock
-#: help:stock.production.lot,name:0
-msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
+#: model:ir.actions.act_window,help:stock.action_move_form2
+msgid "This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product."
msgstr ""
#. module: stock
@@ -3264,7 +3317,7 @@ msgid "Existing Lot"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:204
#, python-format
msgid "Please specify at least one non-zero quantity!"
msgstr ""
@@ -3275,7 +3328,7 @@ msgid "For the current product, this stock location will be used, instead of the
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1319
#, python-format
msgid "is ready to process."
msgstr ""
@@ -3291,7 +3344,7 @@ msgid "Set to zero"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
#, python-format
msgid "None of these picking lists require invoicing."
msgstr ""
@@ -3302,20 +3355,20 @@ msgid "November"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/product.py:101
+#: code:addons/stock/stock.py:1987
#, python-format
msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:379
#, python-format
msgid "Unplanned Qty"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:1318
#, python-format
msgid "is scheduled"
msgstr ""
@@ -3351,14 +3404,16 @@ msgid "Move History (parent moves)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:361
#, python-format
msgid "Future Stock"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
+#: code:addons/stock/stock.py:510
+#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1135
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:113
#, python-format
msgid "Error"
msgstr ""
@@ -3374,16 +3429,21 @@ msgid "Select Quantity"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:0
+#: model:ir.actions.act_window,help:stock.action_location_tree
+msgid "This is the structure of your company's warehouses and locations. You can click on a location to get the list of the products and their stock level in this particular location and all its children."
+msgstr ""
+
+#. module: stock
#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
#: field:stock.inventory.line,prod_lot_id:0
#: report:stock.inventory.move:0
#: field:stock.move,prodlot_id:0
-#: field:stock.move.memory,prodlot_id:0
+#: field:stock.move.memory.in,prodlot_id:0
+#: field:stock.move.memory.out,prodlot_id:0
#: field:stock.move.split.lines.exist,prodlot_id:0
#: view:stock.production.lot:0
#: field:stock.production.lot,name:0
-#, python-format
msgid "Production Lot"
msgstr ""
@@ -3419,14 +3479,17 @@ msgid "Prefix"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_splitinto.py:0
+#: code:addons/stock/wizard/stock_splitinto.py:53
#, python-format
msgid "Total quantity after split exceeds the quantity to split for this product: \"%s\" (id: %d)"
msgstr ""
#. module: stock
#: view:stock.move:0
-#: field:stock.partial.move,product_moves:0
+#: field:stock.partial.move,product_moves_in:0
+#: field:stock.partial.move,product_moves_out:0
+#: field:stock.partial.picking,product_moves_in:0
+#: field:stock.partial.picking,product_moves_out:0
msgid "Moves"
msgstr ""
@@ -3443,16 +3506,11 @@ msgid "It specifies attributes of packaging like type, quantity of packaging,etc
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:0
+#: code:addons/stock/stock.py:2348
#, python-format
msgid "quantity."
msgstr ""
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory
-msgid "stock.move.memory"
-msgstr ""
-
#. module: stock
#: constraint:stock.move:0
msgid "You must assign a production lot for this product"
@@ -3476,7 +3534,7 @@ msgid "Split Move"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/wizard/stock_return_picking.py:97
#, python-format
msgid "There are no products to return (only lines in Done state and not fully returned yet can be returned)!"
msgstr ""
@@ -3504,7 +3562,7 @@ msgid "May"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:0
+#: code:addons/stock/wizard/stock_partial_move.py:133
#, python-format
msgid "Deliver"
msgstr ""
@@ -3526,7 +3584,7 @@ msgid "Location Content"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:0
+#: code:addons/stock/product.py:385
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -3539,8 +3597,8 @@ msgid "Stock Output Account"
msgstr ""
#. module: stock
-#: view:stock.move:0
-msgid "Picking"
+#: field:stock.location,chained_location_type:0
+msgid "Chained Location Type"
msgstr ""
#. module: stock
@@ -3588,16 +3646,12 @@ msgid "Invoiced date"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-#: view:stock.picking:0
-msgid "Outgoing Deliveries"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:0
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:0
-#: code:addons/stock/wizard/stock_return_picking.py:0
+#: code:addons/stock/stock.py:729
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:83
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_return_picking.py:79
+#: code:addons/stock/wizard/stock_return_picking.py:97
+#: code:addons/stock/wizard/stock_return_picking.py:204
#, python-format
msgid "Warning !"
msgstr ""
@@ -3638,3 +3692,10 @@ msgstr ""
msgid "Partial Move"
msgstr ""
+#. module: stock
+#: help:stock.location,posx:0
+#: help:stock.location,posy:0
+#: help:stock.location,posz:0
+msgid "Optional localization details, for information purpose only"
+msgstr ""
+
diff --git a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
index b94b4d1b699..26f6a2a4fd1 100644
--- a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
+++ b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:14+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:33+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:33+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index 43969cff36e..069fc087a46 100644
--- a/addons/stock_location/i18n/stock_location.pot
+++ b/addons/stock_location/i18n/stock_location.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:34+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgid "Internal"
msgstr ""
#. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:98
#, python-format
msgid "Pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
msgstr ""
@@ -326,7 +326,7 @@ msgid "Products"
msgstr ""
#. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:118
#, python-format
msgid "Pulled from another location via procurement %d"
msgstr ""
@@ -348,7 +348,7 @@ msgid "Delay (days)"
msgstr ""
#. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:67
#, python-format
msgid "Picking for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
msgstr ""
@@ -359,7 +359,7 @@ msgid "Pushed Flow"
msgstr ""
#. module: stock_location
-#: code:addons/stock_location/procurement_pull.py:0
+#: code:addons/stock_location/procurement_pull.py:89
#, python-format
msgid "Move for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
msgstr ""
diff --git a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
index b802c2d2b0a..b858e5f92a1 100644
--- a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
+++ b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:15+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:15+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:34+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:34+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot
index 6cb82017e9b..38c606aa18f 100644
--- a/addons/stock_planning/i18n/stock_planning.pot
+++ b/addons/stock_planning/i18n/stock_planning.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
#, python-format
msgid "No forecasts for selected period or no products in selected category !"
msgstr ""
@@ -48,7 +48,8 @@ msgid "Forecast value which will be converted to Product Quantity according to p
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
#, python-format
msgid "Incoming Left must be greater than 0 !"
msgstr ""
@@ -59,7 +60,7 @@ msgid "Planned Out in periods before calculated. Between start date of current p
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
#, python-format
msgid "No products in selected category !"
msgstr ""
@@ -115,7 +116,8 @@ msgid "Company"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:640
+#: code:addons/stock_planning/stock_planning.py:682
#, python-format
msgid "\n"
" Initial Stock: "
@@ -197,7 +199,8 @@ msgid "Quantity which is already picked up to this warehouse in current period."
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
#, python-format
msgid " Confirmed In Before: "
msgstr ""
@@ -284,13 +287,14 @@ msgid "Procure Incoming Left"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
#, python-format
msgid " Incoming Left: "
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:715
#, python-format
msgid "Pick List "
msgstr ""
@@ -310,7 +314,8 @@ msgid "Master Procurement Schedule"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:636
+#: code:addons/stock_planning/stock_planning.py:678
#, python-format
msgid " Creation Date: "
msgstr ""
@@ -390,15 +395,18 @@ msgid "Product Category"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#: code:addons/stock_planning/stock_planning.py:621
+#: code:addons/stock_planning/stock_planning.py:663
+#: code:addons/stock_planning/stock_planning.py:665
+#: code:addons/stock_planning/stock_planning.py:667
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:59
#, python-format
msgid "Error !"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:626
#, python-format
msgid "Manual planning for "
msgstr ""
@@ -409,7 +417,8 @@ msgid "This User"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
#, python-format
msgid "\n"
" Confirmed Out: "
@@ -431,13 +440,13 @@ msgid "Calculate Planning"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:636
#, python-format
msgid "Procurement created in MPS by user: "
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:140
#, python-format
msgid "Invalid action !"
msgstr ""
@@ -458,7 +467,7 @@ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:665
#, python-format
msgid "You must specify a Source Warehouse !"
msgstr ""
@@ -550,7 +559,8 @@ msgid "Start Date"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
#, python-format
msgid "\n"
" Already Out: "
@@ -600,7 +610,8 @@ msgid "Warehouse "
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:646
+#: code:addons/stock_planning/stock_planning.py:688
#, python-format
msgid "\n"
" Expected Out: "
@@ -734,20 +745,21 @@ msgid "\n"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:140
#, python-format
msgid "Cannot delete Validated Sale Forecasts !"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
#, python-format
msgid "\n"
" Planned Out: "
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:667
#, python-format
msgid "You must specify a Source Warehouse different than calculated (destination) Warehouse !"
msgstr ""
@@ -764,7 +776,7 @@ msgid "Creates forecast lines for selected warehouse and period."
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:655
#, python-format
msgid "Requisition ("
msgstr ""
@@ -780,7 +792,8 @@ msgid "Period4"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:642
+#: code:addons/stock_planning/stock_planning.py:684
#, python-format
msgid " Already In: "
msgstr ""
@@ -801,7 +814,8 @@ msgid "Period1"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
#, python-format
msgid " Minimum stock: "
msgstr ""
@@ -845,7 +859,8 @@ msgid "Warehouse Forecast"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:643
+#: code:addons/stock_planning/stock_planning.py:685
#, python-format
msgid " Confirmed In: "
msgstr ""
@@ -943,7 +958,8 @@ msgid "Periods"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
#, python-format
msgid " according to state:"
msgstr ""
@@ -1059,7 +1075,8 @@ msgid "Warehouse which planning will concern."
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:647
+#: code:addons/stock_planning/stock_planning.py:689
#, python-format
msgid "\n"
" Stock Simulation: "
@@ -1091,7 +1108,8 @@ msgid "Per Warehouse :"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:639
+#: code:addons/stock_planning/stock_planning.py:681
#, python-format
msgid "\n"
" Warehouse Forecast: "
@@ -1108,7 +1126,8 @@ msgid "Starting date for planning period."
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:641
+#: code:addons/stock_planning/stock_planning.py:683
#, python-format
msgid " Planned In: "
msgstr ""
@@ -1173,7 +1192,8 @@ msgid "Product"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:638
+#: code:addons/stock_planning/stock_planning.py:680
#, python-format
msgid "\n"
"For period: "
@@ -1185,13 +1205,15 @@ msgid "Product UoM"
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:627
+#: code:addons/stock_planning/stock_planning.py:671
+#: code:addons/stock_planning/stock_planning.py:693
#, python-format
msgid "MPS("
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:678
#, python-format
msgid "Pick created from MPS by user: "
msgstr ""
@@ -1256,7 +1278,8 @@ msgid "Shows who created this forecast, or who validated."
msgstr ""
#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/stock_planning.py:644
+#: code:addons/stock_planning/stock_planning.py:686
#, python-format
msgid "\n"
" Planned Out Before: "
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index dac501f8714..e40336a6d5c 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:16+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:16+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:35+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:35+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -78,7 +78,7 @@ msgid "Today"
msgstr ""
#. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:44
#, python-format
msgid "Error !"
msgstr ""
@@ -159,7 +159,7 @@ msgid "Name"
msgstr ""
#. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:44
#, python-format
msgid "You cannot modify the Object linked to the Document Type!\n"
"Create another Document instead !"
@@ -280,7 +280,7 @@ msgid "Document Types"
msgstr ""
#. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:115
#, python-format
msgid "Wrong Source Document !"
msgstr ""
@@ -303,7 +303,7 @@ msgid "Invoice"
msgstr ""
#. module: subscription
-#: code:addons/subscription/subscription.py:0
+#: code:addons/subscription/subscription.py:115
#, python-format
msgid "Please provide another source document.\n"
"This one does not exist !"
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index d46876b2803..341fbfea242 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Print Option"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:422
#, python-format
msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -39,7 +39,7 @@ msgid "Text Validation"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:434
#, python-format
msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -113,7 +113,7 @@ msgid "History Lines"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:448
#, python-format
msgid "You must enter one or more menu choices in column heading (white spaces not allowed)"
msgstr ""
@@ -176,7 +176,7 @@ msgid "Add Comment Field"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:401
#, python-format
msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -207,7 +207,7 @@ msgid "Matrix of Choices (Only One Answers Per Row)"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:475
#, python-format
msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -283,7 +283,7 @@ msgid "Answer a Survey"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:92
#, python-format
msgid "Error!"
msgstr ""
@@ -321,10 +321,49 @@ msgid "Comment Field Type"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
-#: code:addons/survey/wizard/survey_answer.py:0
-#: code:addons/survey/wizard/survey_selection.py:0
-#: code:addons/survey/wizard/survey_send_invitation.py:0
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:387
+#: code:addons/survey/survey.py:401
+#: code:addons/survey/survey.py:406
+#: code:addons/survey/survey.py:416
+#: code:addons/survey/survey.py:422
+#: code:addons/survey/survey.py:428
+#: code:addons/survey/survey.py:434
+#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:444
+#: code:addons/survey/survey.py:448
+#: code:addons/survey/survey.py:458
+#: code:addons/survey/survey.py:462
+#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:475
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:482
+#: code:addons/survey/survey.py:484
+#: code:addons/survey/survey.py:642
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:131
+#: code:addons/survey/wizard/survey_answer.py:699
+#: code:addons/survey/wizard/survey_answer.py:738
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:787
+#: code:addons/survey/wizard/survey_answer.py:792
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:811
+#: code:addons/survey/wizard/survey_answer.py:820
+#: code:addons/survey/wizard/survey_answer.py:825
+#: code:addons/survey/wizard/survey_answer.py:899
+#: code:addons/survey/wizard/survey_answer.py:935
+#: code:addons/survey/wizard/survey_answer.py:953
+#: code:addons/survey/wizard/survey_answer.py:981
+#: code:addons/survey/wizard/survey_answer.py:984
+#: code:addons/survey/wizard/survey_answer.py:987
+#: code:addons/survey/wizard/survey_answer.py:999
+#: code:addons/survey/wizard/survey_answer.py:1006
+#: code:addons/survey/wizard/survey_answer.py:1009
+#: code:addons/survey/wizard/survey_selection.py:134
+#: code:addons/survey/wizard/survey_selection.py:138
+#: code:addons/survey/wizard/survey_send_invitation.py:74
#, python-format
msgid "Warning !"
msgstr ""
@@ -466,11 +505,16 @@ msgid "Number"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:444
#, python-format
msgid "You must enter one or more menu choices in column heading"
msgstr ""
+#. module: survey
+#: model:ir.actions.act_window,help:survey.action_survey_form1
+msgid "You can create survey for different purposes: recruitment interviews, employee's periodical evaluations, marketing campaigns, etc. A survey is made of pages containing questions of several types: text, multiple choices, etc. You can edit survey manually or click on the 'Edit Survey' for a WYSIWYG interface."
+msgstr ""
+
#. module: survey
#: view:survey:0
#: view:survey.request:0
@@ -539,7 +583,7 @@ msgid "Question Type"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:131
#, python-format
msgid "You can not answer this survey more than %s times"
msgstr ""
@@ -560,7 +604,7 @@ msgid "\n"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:124
#, python-format
msgid "You can not answer because the survey is not open"
msgstr ""
@@ -597,7 +641,7 @@ msgid "Minimum Required Answer"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:484
#, python-format
msgid "You must enter one or more menu choices in column heading (white spaces not allowed)"
msgstr ""
@@ -608,7 +652,7 @@ msgid "Error Message"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:482
#, python-format
msgid "You must enter one or more menu choices in column heading"
msgstr ""
@@ -647,13 +691,15 @@ msgid "Survey Requests"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:375
+#: code:addons/survey/survey.py:462
#, python-format
msgid "You must enter one or more column heading."
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:758
+#: code:addons/survey/wizard/survey_answer.py:953
#, python-format
msgid "Please enter an integer value"
msgstr ""
@@ -669,7 +715,7 @@ msgid "Paragraph of Text"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:428
#, python-format
msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -766,7 +812,7 @@ msgid "When the comment is an invalid format, display this error message"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
+#: code:addons/survey/wizard/survey_selection.py:138
#, python-format
msgid "You can not give more response. Please contact the author of this survey for further assistance."
msgstr ""
@@ -809,7 +855,7 @@ msgid "Page Number"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:92
#, python-format
msgid "Cannot locate survey for the question wizard!"
msgstr ""
@@ -861,7 +907,7 @@ msgid "Start"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:477
#, python-format
msgid "Maximum Required Answer is greater than Minimum Required Answer"
msgstr ""
@@ -1087,7 +1133,7 @@ msgid "Survey Response Line"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_selection.py:0
+#: code:addons/survey/wizard/survey_selection.py:134
#, python-format
msgid "You can not give response for this survey more than %s times"
msgstr ""
@@ -1244,7 +1290,7 @@ msgid "Total Started Survey"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:467
#, python-format
msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -1295,7 +1341,7 @@ msgid "Answered"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:432
#, python-format
msgid "Complete Survey Answer"
msgstr ""
@@ -1322,7 +1368,7 @@ msgid "Send Invitation"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:792
#, python-format
msgid "You cannot select the same answer more than one time"
msgstr ""
@@ -1394,13 +1440,13 @@ msgid "Required Answer"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:473
#, python-format
msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:458
#, python-format
msgid "You must enter one or more answer."
msgstr ""
@@ -1427,13 +1473,13 @@ msgid "Pages"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:406
#, python-format
msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_answer.py:984
#, python-format
msgid "You cannot select same answer more than one time'"
msgstr ""
@@ -1479,13 +1525,13 @@ msgid "Send mail for new user"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:387
#, python-format
msgid "You must enter one or more Answer."
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:416
#, python-format
msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -1503,7 +1549,7 @@ msgid "Page"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:438
#, python-format
msgid "Maximum Required Answer is greater than Minimum Required Answer"
msgstr ""
@@ -1555,7 +1601,7 @@ msgid "Single Textboxes"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:0
+#: code:addons/survey/wizard/survey_send_invitation.py:74
#, python-format
msgid "%sSurvey is not in open state"
msgstr ""
@@ -1601,7 +1647,7 @@ msgid "Table"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:0
+#: code:addons/survey/survey.py:642
#, python-format
msgid "You cannot duplicate the resource!"
msgstr ""
diff --git a/addons/thunderbird/i18n/thunderbird.pot b/addons/thunderbird/i18n/thunderbird.pot
index 591e65a1627..22b89b86da7 100644
--- a/addons/thunderbird/i18n/thunderbird.pot
+++ b/addons/thunderbird/i18n/thunderbird.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:18+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:18+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:37+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:37+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,13 +22,13 @@ msgid "Thunderbird Plug-in"
msgstr ""
#. module: thunderbird
-#: help:thunderbird.installer,thunderbird:0
-msgid "Allows you to select an object that you’d like to add to your email and its attachments."
+#: help:thunderbird.installer,plugin_file:0
+msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
msgstr ""
#. module: thunderbird
-#: help:thunderbird.installer,plugin_file:0
-msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
+#: help:thunderbird.installer,thunderbird:0
+msgid "Allows you to select an object that you would like to add to your email and its attachments."
msgstr ""
#. module: thunderbird
@@ -52,8 +52,8 @@ msgid "Installation Manual"
msgstr ""
#. module: thunderbird
-#: view:thunderbird.installer:0
-msgid "Configure"
+#: field:thunderbird.installer,description:0
+msgid "Description"
msgstr ""
#. module: thunderbird
@@ -61,20 +61,6 @@ msgstr ""
msgid "title"
msgstr ""
-#. module: thunderbird
-#: model:ir.module.module,description:thunderbird.module_meta_information
-msgid "\n"
-" This module is required for the thuderbird plug-in to work\n"
-" properly.\n"
-" The Plugin allows you archive email and its attachments to the selected \n"
-" OpenERP objects. You can select a partner, a task, a project, an analytical\n"
-" account,or any other object and attach selected mail as .eml file in \n"
-" attachment of selected record. You can create Documents for crm Lead,\n"
-" HR Applicant and project issue from selected mails.\n"
-"\n"
-" "
-msgstr ""
-
#. module: thunderbird
#: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
#: view:thunderbird.installer:0
@@ -102,19 +88,14 @@ msgstr ""
msgid "File name"
msgstr ""
-#. module: thunderbird
-#: field:thunderbird.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
#. module: thunderbird
#: view:thunderbird.installer:0
msgid "Installation and Configuration Steps"
msgstr ""
#. module: thunderbird
-#: field:thunderbird.installer,description:0
-msgid "Description"
+#: field:thunderbird.installer,progress:0
+msgid "Configuration Progress"
msgstr ""
#. module: thunderbird
@@ -129,6 +110,11 @@ msgstr ""
msgid "Thunderbid Plugin Tools"
msgstr ""
+#. module: thunderbird
+#: view:thunderbird.installer:0
+msgid "Configure"
+msgstr ""
+
#. module: thunderbird
#: view:thunderbird.installer:0
msgid "Skip"
@@ -139,3 +125,17 @@ msgstr ""
msgid "Image"
msgstr ""
+#. module: thunderbird
+#: model:ir.module.module,description:thunderbird.module_meta_information
+msgid "\n"
+" This module is required for the thuderbird plug-in to work\n"
+" properly.\n"
+" The Plugin allows you archive email and its attachments to the selected \n"
+" OpenERP objects. You can select a partner, a task, a project, an analytical\n"
+" account,or any other object and attach selected mail as eml file in \n"
+" attachment of selected record. You can create Documents for crm Lead,\n"
+" HR Applicant and project issue from selected mails.\n"
+"\n"
+" "
+msgstr ""
+
diff --git a/addons/users_ldap/i18n/users_ldap.pot b/addons/users_ldap/i18n/users_ldap.pot
index 39d5d66bc20..feedf6ace4e 100644
--- a/addons/users_ldap/i18n/users_ldap.pot
+++ b/addons/users_ldap/i18n/users_ldap.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:38+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/warning/i18n/warning.pot b/addons/warning/i18n/warning.pot
index 3c9348b735a..3766847a6b8 100644
--- a/addons/warning/i18n/warning.pot
+++ b/addons/warning/i18n/warning.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:38+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -56,6 +56,12 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: warning
+#: sql_constraint:purchase.order:0
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr ""
+
#. module: warning
#: view:product.product:0
#: view:res.partner:0
@@ -140,7 +146,7 @@ msgid "Message for Purchase Order"
msgstr ""
#. module: warning
-#: code:addons/warning/warning.py:0
+#: code:addons/warning/warning.py:32
#: help:product.product,purchase_line_warn:0
#: help:product.product,sale_line_warn:0
#: help:res.partner,invoice_warn:0
@@ -152,7 +158,12 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
msgstr ""
#. module: warning
-#: code:addons/warning/warning.py:0
+#: code:addons/warning/warning.py:67
+#: code:addons/warning/warning.py:96
+#: code:addons/warning/warning.py:132
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:213
+#: code:addons/warning/warning.py:246
#, python-format
msgid "Alert for %s !"
msgstr ""
@@ -178,7 +189,12 @@ msgid "Warning on the Purchase Order"
msgstr ""
#. module: warning
-#: code:addons/warning/warning.py:0
+#: code:addons/warning/warning.py:68
+#: code:addons/warning/warning.py:97
+#: code:addons/warning/warning.py:134
+#: code:addons/warning/warning.py:164
+#: code:addons/warning/warning.py:214
+#: code:addons/warning/warning.py:247
#, python-format
msgid "Warning for %s"
msgstr ""
diff --git a/addons/web_livechat/i18n/web_livechat.pot b/addons/web_livechat/i18n/web_livechat.pot
index c8631e2f76a..246a948527f 100644
--- a/addons/web_livechat/i18n/web_livechat.pot
+++ b/addons/web_livechat/i18n/web_livechat.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:19+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:19+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:38+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:38+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/web_uservoice/i18n/web_uservoice.pot b/addons/web_uservoice/i18n/web_uservoice.pot
index 3fe8cd89045..72c2d93ab12 100644
--- a/addons/web_uservoice/i18n/web_uservoice.pot
+++ b/addons/web_uservoice/i18n/web_uservoice.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/wiki/i18n/wiki.pot b/addons/wiki/i18n/wiki.pot
index 01fc3cd4ac5..b591fc4c91a 100644
--- a/addons/wiki/i18n/wiki.pot
+++ b/addons/wiki/i18n/wiki.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:20+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:20+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:39+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:39+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -129,13 +129,13 @@ msgid "Page Content"
msgstr ""
#. module: wiki
-#: code:addons/wiki/wiki.py:0
+#: code:addons/wiki/wiki.py:236
#, python-format
msgid "Warning !"
msgstr ""
#. module: wiki
-#: code:addons/wiki/wiki.py:0
+#: code:addons/wiki/wiki.py:236
#, python-format
msgid "There are no changes in revisions"
msgstr ""
@@ -192,7 +192,12 @@ msgid "Keywords"
msgstr ""
#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:0
+#: model:ir.actions.act_window,help:wiki.action_wiki
+msgid "With Wiki Pages you can share ideas and questions with your coworkers. You can create a new document that can be linked to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format."
+msgstr ""
+
+#. module: wiki
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
#, python-format
msgid "Warning"
msgstr ""
@@ -361,7 +366,7 @@ msgid "Create Index"
msgstr ""
#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:0
+#: code:addons/wiki/wizard/wiki_show_diff.py:54
#, python-format
msgid "You need to select minimum 1 or maximum 2 history revision!"
msgstr ""
@@ -371,11 +376,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: wiki
-#: model:ir.actions.act_window,help:wiki.action_wiki
-msgid "Wiki Pages allows you to share ideas and questions with your coworkers. You can create a new document that can be link to one or several applications (CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. There is a basic wiki editing for text format."
-msgstr ""
-
#. module: wiki
#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
#: view:wiki.create.menu:0
@@ -409,7 +409,7 @@ msgid "Modify By"
msgstr ""
#. module: wiki
-#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:0
+#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
#: field:wiki.wiki,toc:0
#, python-format
msgid "Table of Contents"
diff --git a/addons/wiki_faq/i18n/wiki_faq.pot b/addons/wiki_faq/i18n/wiki_faq.pot
index 7f87e960dcd..2b547b04347 100644
--- a/addons/wiki_faq/i18n/wiki_faq.pot
+++ b/addons/wiki_faq/i18n/wiki_faq.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
index b57e24749c6..1bbc43b81cd 100644
--- a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
+++ b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:40+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
index 400e5fe1ca0..bb7dd731fae 100644
--- a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
+++ b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:45:21+0000\n"
-"PO-Revision-Date: 2010-12-21 19:45:21+0000\n"
+"POT-Creation-Date: 2011-01-03 16:58:40+0000\n"
+"PO-Revision-Date: 2011-01-03 16:58:40+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: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
-msgid "Wiki pages allow you to share ideas and questions with co-workers. You can create a new document that can be linked to one or several applications (specifications of a project, a FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface."
-msgstr ""
-
#. module: wiki_sale_faq
#: model:ir.actions.act_window,name:wiki_sale_faq.action_document_form
#: model:ir.ui.menu,name:wiki_sale_faq.menu_document_files
@@ -44,8 +39,8 @@ msgid "This module provides a wiki FAQ Template\n"
msgstr ""
#. module: wiki_sale_faq
-#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
-msgid "Documents gives you an access to all attached files to any record. It is a repository of all documents such as emails, project related attachments or any other documents. From this view, you can search on the content of the documents. OpenERP automatically assign meta-data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents."
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_wiki_test
+msgid "Wiki pages allow you to share ideas and questions with coworkers. You can create a new document that can be linked to one or several applications (specifications of a project, FAQ for sales teams, etc.). Keywords can be used to easily tag wiki pages. You should use this application with the OpenERP web client interface."
msgstr ""
#. module: wiki_sale_faq
@@ -53,3 +48,8 @@ msgstr ""
msgid "Wiki -Sale - FAQ"
msgstr ""
+#. module: wiki_sale_faq
+#: model:ir.actions.act_window,help:wiki_sale_faq.action_document_form
+msgid "Documents give you access to all files attached to any record. It is a repository of all documents such as emails, project-related attachments or any other documents. From this view, you can search through the content of the documents. OpenERP automatically assign meta data based on the record like the related partner and indexes the content of .DOC, .ODT, .TXT, .SXW and .PDF documents."
+msgstr ""
+