diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 11e59f8adac..ffeb66fbc86 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -74,15 +74,16 @@ msgid "Import from invoice or payment" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1153 -#: code:addons/account/account_move_line.py:1236 -#: code:addons/account/account_move_line.py:1303 +#: code:addons/account/account_move_line.py:1048 +#: code:addons/account/account_move_line.py:1131 +#: code:addons/account/account_move_line.py:1198 #, python-format msgid "Bad Account!" msgstr "" #. module: account #: view:account.move:0 +#: view:account.move.line:0 msgid "Total Debit" msgstr "" @@ -100,6 +101,7 @@ msgstr "" #. module: account #. openerp-web #: view:account.automatic.reconcile:0 +#: field:account.move.line,reconcile:0 #: field:account.move.line,reconcile_id:0 #: view:account.move.line.reconcile:0 #: view:account.move.line.reconcile.writeoff:0 @@ -115,25 +117,11 @@ msgstr "" #: field:account.move,ref:0 #: field:account.move.line,ref:0 #: field:account.subscription,ref:0 +#: xsl:account.transfer:0 #: field:cash.box.in,ref:0 msgid "Reference" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_account_journal_view -msgid "
\n" -" Click to specify lists of columns to display for a type of journal.\n" -"
\n" -" Journal views determine the way you can record entries in\n" -" your journal. Select the fields you want to appear in a journal\n" -" and determine the sequence in which they will appear.\n" -"
\n" -" On the journal definition form, you can select the view you\n" -" want to use to display journal items related to this journal.\n" -"
\n" -" " -msgstr "" - #. module: account #: help:account.payment.term,active:0 msgid "If the active field is set to False, it will allow you to hide the payment term without removing it." @@ -141,20 +129,18 @@ msgstr "" #. module: account #: code:addons/account/account.py:640 -#: code:addons/account/account.py:653 -#: code:addons/account/account.py:656 -#: code:addons/account/account.py:675 -#: code:addons/account/account.py:807 -#: code:addons/account/account.py:1101 +#: code:addons/account/account.py:685 +#: code:addons/account/account.py:780 +#: code:addons/account/account.py:1043 #: code:addons/account/account_invoice.py:776 #: code:addons/account/account_invoice.py:779 #: code:addons/account/account_invoice.py:782 -#: code:addons/account/account_invoice.py:1510 +#: code:addons/account/account_invoice.py:1519 #: code:addons/account/account_move_line.py:98 -#: code:addons/account/account_move_line.py:753 -#: code:addons/account/account_move_line.py:762 -#: code:addons/account/account_move_line.py:806 -#: code:addons/account/account_move_line.py:841 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:820 +#: code:addons/account/account_move_line.py:855 #: code:addons/account/wizard/account_fiscalyear_close.py:62 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 @@ -166,7 +152,7 @@ msgid "Warning!" msgstr "" #. module: account -#: code:addons/account/account.py:3179 +#: code:addons/account/account.py:3139 #, python-format msgid "Miscellaneous Journal" msgstr "" @@ -184,7 +170,7 @@ msgid "Account Source" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_period_form +#: model:ir.actions.act_window,help:account.action_account_period msgid "\n" " Click to add a fiscal period.\n" "
\n" @@ -204,12 +190,6 @@ msgstr "" msgid "Column Label" msgstr "" -#. module: account -#: code:addons/account/wizard/account_move_journal.py:96 -#, python-format -msgid "Journal: %s" -msgstr "" - #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" @@ -231,11 +211,6 @@ msgstr "" msgid "Tax Templates" msgstr "" -#. module: account -#: help:account.move.line,move_id:0 -msgid "The move of this entry line." -msgstr "" - #. module: account #: model:ir.model,name:account.model_account_tax msgid "account.tax" @@ -279,8 +254,6 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry -#: model:ir.actions.act_window,name:account.action_view_account_use_model -#: model:ir.ui.menu,name:account.menu_action_manual_recurring msgid "Manual Recurring" msgstr "" @@ -294,11 +267,6 @@ msgstr "" msgid "Select the Period for Analysis" msgstr "" -#. module: account -#: view:account.move.line:0 -msgid "St." -msgstr "" - #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree3 msgid "
\n" @@ -313,11 +281,6 @@ msgid "
\n" " " msgstr "" -#. module: account -#: field:account.journal.column,field:0 -msgid "Field Name" -msgstr "" - #. module: account #: help:account.installer,charts:0 msgid "Installs localized accounting charts to match as closely as possible the accounting needs of your company based on your country." @@ -374,11 +337,6 @@ msgstr "" msgid "Allows you to use the analytic accounting." msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_account_moves_bank -msgid "This view is used by accountants in order to record entries massively in OpenERP. Journal items are created by OpenERP if you use Bank Statements, Cash Registers, or Customer/Supplier payments." -msgstr "" - #. module: account #: view:account.invoice:0 #: field:account.invoice,user_id:0 @@ -431,6 +389,7 @@ msgstr "" #. module: account #: view:account.move:0 +#: view:account.move.line:0 msgid "Total Credit" msgstr "" @@ -442,6 +401,13 @@ msgid "This allows you to manage the assets owned by a company or a person.\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +#. module: account +#. openerp-web +#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 +#, python-format +msgid "Period :" +msgstr "" + #. module: account #: field:account.account.template,chart_template_id:0 #: field:account.fiscal.position.template,chart_template_id:0 @@ -500,13 +466,11 @@ msgstr "" #: field:account.move.bank.reconcile,journal_id:0 #: view:account.move.line:0 #: field:account.move.line,journal_id:0 -#: code:addons/account/wizard/account_move_journal.py:118 #: 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 "" @@ -548,11 +512,6 @@ msgstr "" msgid "Select Charts of Accounts" msgstr "" -#. module: account -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - #. module: account #: model:ir.model,name:account.model_account_invoice_refund msgid "Invoice Refund" @@ -661,31 +620,24 @@ msgid "Profit Account" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1249 +#: code:addons/account/account_move_line.py:1144 #, python-format msgid "No period found or more than one period found for the given date." msgstr "" -#. module: account -#: model:account.journal.view,name:account.account_journal_bank_view_multi -msgid "Bank/Cash Journal (Multi-Currency) View" -msgstr "" - #. module: account #: model:ir.model,name:account.model_report_account_type_sales msgid "Report of the Sales by Account Type" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_manual_reconcile -msgid "
\n" -" No journal items found.\n" -"
\n" -" " +#: code:addons/account/account.py:3143 +#, python-format +msgid "SAJ" msgstr "" #. module: account -#: code:addons/account/account.py:1606 +#: code:addons/account/account.py:1546 #, python-format msgid "Cannot create move with currency different from .." msgstr "" @@ -816,6 +768,7 @@ msgstr "" #: view:account.journal:0 #: field:account.journal,type:0 #: field:account.move.reconcile,type:0 +#: xsl:account.transfer:0 #: field:report.invoice.created,type:0 msgid "Type" msgstr "" @@ -843,7 +796,7 @@ msgid "Supplier Invoices And Refunds" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:833 +#: code:addons/account/account_move_line.py:847 #, python-format msgid "Entry is already reconciled." msgstr "" @@ -913,6 +866,20 @@ msgstr "" msgid "If checked, the new chart of accounts will not contain this by default." msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_manual_reconcile +msgid "\n" +" No journal items found.\n" +"
\n" +" " +msgstr "" + +#. module: account +#: code:addons/account/account.py:1632 +#, python-format +msgid "You cannot unreconcile journal items if they has been generated by the opening/closing fiscal year process." +msgstr "" + #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new msgid "New Subscription" @@ -928,12 +895,6 @@ msgstr "" msgid "Values" msgstr "" -#. module: account -#: view:account.invoice.report:0 -#: field:account.invoice.report,delay_to_pay:0 -msgid "Avg. Delay To Pay" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_chart #: model:ir.actions.act_window,name:account.action_tax_code_tree @@ -957,7 +918,7 @@ msgid "Purchase journal" msgstr "" #. module: account -#: code:addons/account/account.py:1374 +#: code:addons/account/account.py:1316 #, python-format msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"." msgstr "" @@ -1063,11 +1024,11 @@ msgid "Features" msgstr "" #. module: account -#: code:addons/account/account.py:2323 +#: code:addons/account/account.py:2293 #: code:addons/account/account_bank_statement.py:423 #: code:addons/account/account_invoice.py:73 #: code:addons/account/account_invoice.py:732 -#: code:addons/account/account_move_line.py:174 +#: code:addons/account/account_move_line.py:195 #, python-format msgid "No Analytic Journal !" msgstr "" @@ -1105,8 +1066,8 @@ msgid "Opening With Last Closing Balance" msgstr "" #. module: account -#: view:account.state.open:0 -msgid "Are you sure you want to open this invoice ?" +#: help:account.tax.code,notprintable:0 +msgid "Check this box if you don't want any tax related to this tax code to appear on invoices" msgstr "" #. module: account @@ -1119,12 +1080,6 @@ msgstr "" msgid "Landscape Mode" msgstr "" -#. module: account -#: code:addons/account/account.py:656 -#, python-format -msgid "You cannot change the type of account from '%s' to '%s' type as it contains journal items!" -msgstr "" - #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" @@ -1184,7 +1139,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_bank #: selection:account.bank.accounts.wizard,account_type:0 -#: code:addons/account/account.py:3064 +#: code:addons/account/account.py:3034 #, python-format msgid "Bank" msgstr "" @@ -1231,6 +1186,11 @@ msgstr "" msgid "Tax Code Templates" msgstr "" +#. module: account +#: constraint:account.move.line:0 +msgid "The amount expressed in the secondary currency must be positif when journal item are debit and negatif when journal item are credit." +msgstr "" + #. module: account #: view:account.invoice.cancel:0 msgid "Cancel Invoices" @@ -1271,8 +1231,8 @@ msgid "Situation" msgstr "" #. module: account -#: help:account.tax,account_paid_id:0 -msgid "Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account." +#: help:account.move.line,move_id:0 +msgid "The move of this entry line." msgstr "" #. module: account @@ -1305,11 +1265,6 @@ msgstr "" msgid "Draft Subscription" msgstr "" -#. module: account -#: view:res.partner:0 -msgid "History" -msgstr "" - #. module: account #: view:account.account:0 #: report:account.account.balance:0 @@ -1460,9 +1415,12 @@ msgid "Invoice Status" msgstr "" #. module: account -#: view:account.invoice.report:0 -#: field:account.invoice.report,product_qty:0 -msgid "Qty" +#: view:account.bank.statement:0 +#: model:ir.model,name:account.model_account_bank_statement +#: model:process.node,name:account.process_node_accountingstatemententries0 +#: model:process.node,name:account.process_node_bankstatement0 +#: model:process.node,name:account.process_node_supplierbankstatement0 +msgid "Bank Statement" msgstr "" #. module: account @@ -1471,8 +1429,11 @@ msgid "Account Receivable" msgstr "" #. module: account -#: model:ir.actions.report.xml,name:account.account_central_journal -msgid "Central Journal" +#: code:addons/account/account.py:611 +#: code:addons/account/account.py:766 +#: code:addons/account/account.py:767 +#, python-format +msgid "%s (copy)" msgstr "" #. module: account @@ -1484,7 +1445,7 @@ msgid "With balance is not equal to 0" msgstr "" #. module: account -#: code:addons/account/account.py:1500 +#: code:addons/account/account.py:1440 #, python-format msgid "There is no default debit account defined \n" "on journal \"%s\"." @@ -1609,11 +1570,6 @@ msgstr "" msgid "Recurring" msgstr "" -#. module: account -#: field:account.journal.view,columns_id:0 -msgid "Columns" -msgstr "" - #. module: account #: field:account.journal,groups_id:0 msgid "Groups" @@ -1759,7 +1715,7 @@ msgid "The journal must have centralized counterpart without the Skipping draft msgstr "" #. module: account -#: code:addons/account/account_move_line.py:836 +#: code:addons/account/account_move_line.py:850 #, python-format msgid "Some entries are already reconciled." msgstr "" @@ -1870,11 +1826,6 @@ msgstr "" msgid "Cancel Fiscal Year Opening Entries" msgstr "" -#. module: account -#: model:account.journal.view,name:account.account_journal_bank_view -msgid "Bank/Cash Journal View" -msgstr "" - #. module: account #: report:account.journal.period.print.sale.purchase:0 #: view:account.tax.template:0 @@ -1927,12 +1878,6 @@ msgstr "" msgid "Analytic Account Charts" msgstr "" -#. module: account -#: view:account.analytic.line:0 -#: view:analytic.entries.report:0 -msgid "My Entries" -msgstr "" - #. module: account #: report:account.overdue:0 msgid "Customer Ref:" @@ -1987,20 +1932,21 @@ msgstr "" #: code:addons/account/account.py:430 #: code:addons/account/account.py:633 #: code:addons/account/account.py:635 -#: code:addons/account/account.py:987 -#: code:addons/account/account.py:1076 -#: code:addons/account/account.py:1114 -#: code:addons/account/account.py:1116 -#: code:addons/account/account.py:1155 -#: code:addons/account/account.py:1336 -#: code:addons/account/account.py:1350 -#: code:addons/account/account.py:1373 -#: code:addons/account/account.py:1380 -#: code:addons/account/account.py:1602 -#: code:addons/account/account.py:1606 -#: code:addons/account/account.py:2335 -#: code:addons/account/account.py:2650 -#: code:addons/account/account.py:3437 +#: code:addons/account/account.py:929 +#: code:addons/account/account.py:1018 +#: code:addons/account/account.py:1056 +#: code:addons/account/account.py:1058 +#: code:addons/account/account.py:1097 +#: code:addons/account/account.py:1278 +#: code:addons/account/account.py:1292 +#: code:addons/account/account.py:1315 +#: code:addons/account/account.py:1322 +#: code:addons/account/account.py:1542 +#: code:addons/account/account.py:1546 +#: code:addons/account/account.py:1632 +#: code:addons/account/account.py:2305 +#: code:addons/account/account.py:2620 +#: code:addons/account/account.py:3392 #: code:addons/account/account_analytic_line.py:89 #: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:367 @@ -2010,14 +1956,14 @@ msgstr "" #: code:addons/account/account_cash_statement.py:300 #: code:addons/account/account_invoice.py:855 #: code:addons/account/account_invoice.py:889 -#: code:addons/account/account_invoice.py:1084 -#: code:addons/account/account_move_line.py:592 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:833 -#: code:addons/account/account_move_line.py:836 -#: code:addons/account/account_move_line.py:1214 -#: code:addons/account/account_move_line.py:1216 -#: code:addons/account/account_move_line.py:1249 +#: code:addons/account/account_invoice.py:1090 +#: code:addons/account/account_move_line.py:578 +#: code:addons/account/account_move_line.py:824 +#: code:addons/account/account_move_line.py:847 +#: code:addons/account/account_move_line.py:850 +#: code:addons/account/account_move_line.py:1109 +#: code:addons/account/account_move_line.py:1111 +#: code:addons/account/account_move_line.py:1144 #: code:addons/account/report/common_report_header.py:92 #: code:addons/account/wizard/account_change_currency.py:38 #: code:addons/account/wizard/account_change_currency.py:59 @@ -2072,7 +2018,7 @@ msgid "period close" msgstr "" #. module: account -#: code:addons/account/account.py:1101 +#: code:addons/account/account.py:1043 #, python-format msgid "This journal already contains items for this period, therefore you cannot modify its company field." msgstr "" @@ -2127,11 +2073,6 @@ msgstr "" msgid "Treasury Analysis" msgstr "" -#. module: account -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - #. module: account #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase msgid "Sale/Purchase Journal" @@ -2171,6 +2112,12 @@ msgstr "" msgid "Product Category" msgstr "" +#. module: account +#: code:addons/account/account.py:655 +#, python-format +msgid "You cannot change the type of account to '%s' type as it contains journal items!" +msgstr "" + #. module: account #: model:ir.model,name:account.model_account_aged_trial_balance msgid "Account Aged Trial balance Report" @@ -2182,9 +2129,10 @@ msgid "Close Fiscal Year" msgstr "" #. module: account -#: model:process.node,note:account.process_node_reconciliation0 -#: model:process.node,note:account.process_node_supplierreconciliation0 -msgid "Comparison between accounting and payment entries" +#. openerp-web +#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14 +#, python-format +msgid "Journal :" msgstr "" #. module: account @@ -2293,6 +2241,12 @@ msgstr "" msgid "Fiscalyear" msgstr "" +#. module: account +#: code:addons/account/wizard/account_move_bank_reconcile.py:53 +#, python-format +msgid "Standard Encoding" +msgstr "" + #. module: account #: view:account.journal.select:0 #: view:project.account.analytic.line:0 @@ -2338,6 +2292,12 @@ msgstr "" msgid "Account tax charts" msgstr "" +#. module: account +#: model:account.payment.term,name:account.account_payment_term_net +#: model:account.payment.term,note:account.account_payment_term_net +msgid "30 Net Days" +msgstr "" + #. module: account #: code:addons/account/account_cash_statement.py:256 #, python-format @@ -2391,9 +2351,9 @@ msgid "Description" msgstr "" #. module: account -#: code:addons/account/account.py:3186 -#, python-format -msgid "ECNJ" +#: field:account.tax,price_include:0 +#: field:account.tax.template,price_include:0 +msgid "Tax Included in Price" msgstr "" #. module: account @@ -2409,11 +2369,6 @@ msgstr "" msgid "Income Account" msgstr "" -#. module: account -#: constraint:res.partner.bank:0 -msgid "The RIB and/or IBAN is not valid" -msgstr "" - #. module: account #: help:account.config.settings,default_sale_tax:0 msgid "This sale tax will be assigned by default on new products." @@ -2500,6 +2455,12 @@ msgstr "" msgid "Keep empty for all open fiscal year" msgstr "" +#. module: account +#: code:addons/account/account.py:652 +#, python-format +msgid "You cannot change the type of account from 'Closed' to any other type as it contains journal items!" +msgstr "" + #. module: account #: field:account.invoice.report,account_line_id:0 msgid "Account Line" @@ -2511,14 +2472,16 @@ msgid "Create an Account Based on this Template" msgstr "" #. module: account -#: view:account.move:0 -#: model:ir.model,name:account.model_account_move -msgid "Account Entry" +#: code:addons/account/account_invoice.py:889 +#, python-format +msgid "Cannot create the invoice.\n" +"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." msgstr "" #. module: account -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: view:account.move:0 +#: model:ir.model,name:account.model_account_move +msgid "Account Entry" msgstr "" #. module: account @@ -2551,7 +2514,7 @@ msgid "Fiscal Positions" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:592 +#: code:addons/account/account_move_line.py:578 #, python-format msgid "You cannot create journal items on a closed account %s %s." msgstr "" @@ -2574,9 +2537,7 @@ msgstr "" #: selection:account.invoice,state:0 #: selection:account.invoice.report,state:0 #: selection:account.period,state:0 -#: code:addons/account/wizard/account_move_journal.py:105 #: selection:report.invoice.created,state:0 -#, python-format msgid "Open" msgstr "" @@ -2668,7 +2629,7 @@ msgid "Account Model Entries" msgstr "" #. module: account -#: code:addons/account/account.py:3184 +#: code:addons/account/account.py:3144 #, python-format msgid "EXJ" msgstr "" @@ -2778,7 +2739,7 @@ msgid "Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:3515 +#: code:addons/account/account.py:3468 #: code:addons/account/account_bank_statement.py:404 #: code:addons/account/account_invoice.py:367 #: code:addons/account/account_invoice.py:473 @@ -2786,7 +2747,7 @@ msgstr "" #: code:addons/account/account_invoice.py:585 #: code:addons/account/account_invoice.py:593 #: code:addons/account/account_invoice.py:615 -#: code:addons/account/wizard/account_move_journal.py:63 +#: code:addons/account/account_move_line.py:535 #, python-format msgid "Configuration Error!" msgstr "" @@ -2860,6 +2821,12 @@ msgstr "" msgid "Wrong credit or debit value in model, they must be positive!" msgstr "" +#. module: account +#: model:process.node,note:account.process_node_reconciliation0 +#: model:process.node,note:account.process_node_supplierreconciliation0 +msgid "Comparison between accounting and payment entries" +msgstr "" + #. module: account #: model:ir.ui.menu,name:account.menu_automatic_reconcile msgid "Automatic Reconciliation" @@ -2877,7 +2844,7 @@ msgid "Refund Base Code" msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form +#: model:ir.actions.act_window,help:account.action_account_fiscalyear msgid "\n" " Click to start a new fiscal year.\n" "
\n" @@ -2934,11 +2901,6 @@ msgstr "" msgid "Account and Period must belong to the same company." msgstr "" -#. module: account -#: constraint:res.currency:0 -msgid "Error! You cannot define a rounding factor for the company's main currency that is smaller than the decimal precision of 'Account'." -msgstr "" - #. module: account #: field:account.invoice.line,discount:0 msgid "Discount (%)" @@ -2968,7 +2930,7 @@ msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pr msgstr "" #. module: account -#: code:addons/account/account.py:1114 +#: code:addons/account/account.py:1056 #, python-format msgid "You should choose the periods that belong to the same company." msgstr "" @@ -2981,7 +2943,7 @@ msgid "Sales by Account" msgstr "" #. module: account -#: code:addons/account/account.py:1471 +#: code:addons/account/account.py:1406 #, python-format msgid "You cannot delete a posted journal entry \"%s\"." msgstr "" @@ -2997,15 +2959,15 @@ msgid "Sale journal" msgstr "" #. module: account -#: code:addons/account/account.py:2323 +#: code:addons/account/account.py:2293 #: code:addons/account/account_invoice.py:732 -#: code:addons/account/account_move_line.py:174 +#: code:addons/account/account_move_line.py:195 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" #. module: account -#: code:addons/account/account.py:807 +#: code:addons/account/account.py:780 #, python-format msgid "This journal already contains items, therefore you cannot modify its company field." msgstr "" @@ -3073,11 +3035,6 @@ msgstr "" msgid "Line 2:" msgstr "" -#. module: account -#: field:account.journal.column,required:0 -msgid "Required" -msgstr "" - #. module: account #: field:wizard.multi.charts.accounts,only_one_chart_template:0 msgid "Only One Chart Template Available" @@ -3122,7 +3079,7 @@ msgid "Default Sale Tax" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1067 +#: code:addons/account/account_invoice.py:1072 #, python-format msgid "Invoice '%s' is validated." msgstr "" @@ -3244,7 +3201,7 @@ msgid "This will select how the current currency rate for outgoing transactions msgstr "" #. module: account -#: code:addons/account/account.py:2650 +#: code:addons/account/account.py:2620 #, python-format msgid "There is no parent code for the template account." msgstr "" @@ -3306,8 +3263,8 @@ msgid "View" msgstr "" #. module: account -#: code:addons/account/account.py:3432 -#: code:addons/account/account_bank.py:100 +#: code:addons/account/account.py:3387 +#: code:addons/account/account_bank.py:95 #, python-format msgid "BNK" msgstr "" @@ -3327,11 +3284,6 @@ msgstr "" msgid "Electronic File" msgstr "" -#. module: account -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" -msgstr "" - #. module: account #: field:account.config.settings,has_chart_of_accounts:0 msgid "Company has a chart of accounts" @@ -3348,16 +3300,11 @@ msgid "Account Partner Ledger" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1321 +#: code:addons/account/account_invoice.py:1330 #, python-format msgid "%s created." msgstr "" -#. module: account -#: help:account.journal.column,sequence:0 -msgid "Gives the sequence order to journal column." -msgstr "" - #. module: account #: view:account.period:0 msgid "Account Period" @@ -3480,7 +3427,7 @@ msgid " Value amount: 0.02" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:971 +#: code:addons/account/account_invoice.py:976 #, python-format msgid "You cannot create an invoice on a centralized journal. Uncheck the centralized counterpart box in the related journal from the configuration menu." msgstr "" @@ -3492,7 +3439,7 @@ msgid "Starting Balance" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1424 +#: code:addons/account/account_invoice.py:1433 #, python-format msgid "No Partner Defined !" msgstr "" @@ -3510,6 +3457,11 @@ msgstr "" msgid "Opening Subtotal" msgstr "" +#. module: account +#: constraint:account.move.line:0 +msgid "You cannot create journal items with a secondary currency without recording both 'currency' and 'amount currency' field." +msgstr "" + #. module: account #: field:account.financial.report,display_detail:0 msgid "Display details" @@ -3520,11 +3472,6 @@ msgstr "" msgid "VAT:" msgstr "" -#. module: account -#: constraint:account.invoice:0 -msgid "Invalid BBA Structured Communication !" -msgstr "" - #. module: account #: help:account.analytic.line,amount_currency:0 msgid "The amount expressed in the related account currency if not equal to the company one." @@ -3536,7 +3483,7 @@ msgid "Paypal account (email) for receiving online payments (credit card, etc.) msgstr "" #. module: account -#: code:addons/account/wizard/account_move_journal.py:63 +#: code:addons/account/account_move_line.py:535 #, python-format msgid "Cannot find any account journal of %s type for this company.\n" "\n" @@ -3674,7 +3621,7 @@ msgid "Period Length (days)" msgstr "" #. module: account -#: code:addons/account/account.py:1380 +#: code:addons/account/account.py:1322 #, python-format msgid "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." @@ -3697,7 +3644,7 @@ msgid "Category of Product" msgstr "" #. module: account -#: code:addons/account/account.py:987 +#: code:addons/account/account.py:929 #, python-format msgid "There is no fiscal year defined for this date.\n" "Please create one from the configuration of the accounting menu." @@ -3725,11 +3672,6 @@ msgstr "" msgid "Unreconciled Journal Items" msgstr "" -#. module: account -#: sql_constraint:res.currency:0 -msgid "The currency code must be unique per company!" -msgstr "" - #. module: account #: selection:account.account.type,close_method:0 msgid "Detail" @@ -3812,6 +3754,7 @@ msgstr "" #: field:account.subscription.line,date:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 +#: xsl:account.transfer:0 #: selection:account.vat.declaration,filter:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 @@ -3836,7 +3779,7 @@ msgid "Chart of Accounts Template" msgstr "" #. module: account -#: code:addons/account/account.py:2335 +#: code:addons/account/account.py:2305 #, 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!" @@ -3882,8 +3825,8 @@ msgid "Pro-forma Invoices" msgstr "" #. module: account -#: constraint:account.bank.statement.line:0 -msgid "The amount of the voucher must be the same amount as the one on the statement line." +#: view:res.partner:0 +msgid "History" msgstr "" #. module: account @@ -3909,12 +3852,9 @@ msgid "When monthly periods are created. The status is 'Draft'. At the end of mo msgstr "" #. module: account -#: view:account.bank.statement:0 -#: model:ir.model,name:account.model_account_bank_statement -#: model:process.node,name:account.process_node_accountingstatemententries0 -#: model:process.node,name:account.process_node_bankstatement0 -#: model:process.node,name:account.process_node_supplierbankstatement0 -msgid "Bank Statement" +#: view:account.invoice.report:0 +#: field:account.invoice.report,product_qty:0 +msgid "Qty" msgstr "" #. module: account @@ -4030,9 +3970,8 @@ msgid "Modify: create credit note, reconcile and create a new draft invoice" msgstr "" #. module: account -#: code:addons/account/wizard/account_move_bank_reconcile.py:53 -#, python-format -msgid "Standard Encoding" +#: xsl:account.transfer:0 +msgid "Partner ID" msgstr "" #. module: account @@ -4070,8 +4009,8 @@ msgid "Check this box if you don't want any tax related to this tax Code to appe msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1153 -#: code:addons/account/account_move_line.py:1236 +#: code:addons/account/account_move_line.py:1048 +#: code:addons/account/account_move_line.py:1131 #, python-format msgid "You cannot use an inactive account." msgstr "" @@ -4215,11 +4154,6 @@ msgstr "" msgid "30 Days End of Month" msgstr "" -#. module: account -#: model:account.journal.view,name:account.account_sp_refund_journal_view -msgid "Sale/Purchase Refund Journal View" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_balance #: model:ir.actions.report.xml,name:account.account_analytic_account_balance @@ -4323,12 +4257,6 @@ msgstr "" msgid "Close CashBox" msgstr "" -#. module: account -#: view:account.invoice.report:0 -#: field:account.invoice.report,due_delay:0 -msgid "Avg. Due Delay" -msgstr "" - #. module: account #: constraint:account.tax.code.template:0 msgid "Error!\n" @@ -4352,6 +4280,12 @@ msgstr "" msgid "Month" msgstr "" +#. module: account +#: code:addons/account/account.py:667 +#, python-format +msgid "You cannot change the code of account which contains journal items!" +msgstr "" + #. module: account #: field:account.config.settings,purchase_sequence_prefix:0 msgid "Supplier invoice sequence" @@ -4377,10 +4311,8 @@ msgid "Paypal Account" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:889 -#, python-format -msgid "Cannot create the invoice.\n" -"The related payment term is probably misconfigured as it gives a computed amount greater than the total invoiced amount. In order to avoid rounding issues, the latest line of your payment term must be of type 'balance'." +#: view:account.entries.report:0 +msgid "Acc.Type" msgstr "" #. module: account @@ -4417,7 +4349,7 @@ msgid "Account Base Code" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:841 +#: code:addons/account/account_move_line.py:855 #, python-format msgid "You have to provide an account for the write off/exchange difference entry." msgstr "" @@ -4437,7 +4369,6 @@ msgstr "" #: selection:account.common.partner.report,target_move:0 #: selection:account.common.report,target_move:0 #: selection:account.general.journal,target_move:0 -#: selection:account.move.journal,target_move:0 #: selection:account.partner.balance,target_move:0 #: selection:account.partner.ledger,target_move:0 #: selection:account.print.journal,target_move:0 @@ -4460,6 +4391,11 @@ msgstr "" msgid "Check if you want to display Accounts with 0 balance too." msgstr "" +#. module: account +#: field:account.move.reconcile,opening_reconciliation:0 +msgid "Opening Entries Reconciliation" +msgstr "" + #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 @@ -4472,11 +4408,6 @@ msgstr "" msgid "Periodical Processing" msgstr "" -#. module: account -#: field:account.journal,view_id:0 -msgid "Display Mode" -msgstr "" - #. module: account #: selection:account.move.line,state:0 msgid "Balanced" @@ -4504,7 +4435,7 @@ msgid "Account chart" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1313 +#: code:addons/account/account_invoice.py:1322 #, python-format msgid "Supplier invoice" msgstr "" @@ -4636,9 +4567,9 @@ msgid "Based On" msgstr "" #. module: account -#: field:account.tax,price_include:0 -#: field:account.tax.template,price_include:0 -msgid "Tax Included in Price" +#: code:addons/account/account.py:3146 +#, python-format +msgid "ECNJ" msgstr "" #. module: account @@ -4648,7 +4579,6 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_model_form -#: model:ir.ui.menu,name:account.menu_action_model_form msgid "Recurring Models" msgstr "" @@ -4657,6 +4587,11 @@ msgstr "" msgid "Children/Sub Taxes" msgstr "" +#. module: account +#: xsl:account.transfer:0 +msgid "Change" +msgstr "" + #. module: account #: selection:account.journal,type:0 msgid "Bank and Cheques" @@ -4711,7 +4646,7 @@ msgid "It adds the currency column on report if the currency differs from the co msgstr "" #. module: account -#: code:addons/account/account.py:3377 +#: code:addons/account/account.py:3336 #, python-format msgid "Purchase Tax %.2f%%" msgstr "" @@ -4782,7 +4717,7 @@ msgid "When journal period is created. The status is 'Draft'. If a report is pri msgstr "" #. module: account -#: code:addons/account/account.py:3187 +#: code:addons/account/account.py:3147 #, python-format msgid "MISC" msgstr "" @@ -4821,17 +4756,6 @@ msgstr "" msgid "Check" msgstr "" -#. module: account -#: code:addons/account/account.py:3183 -#, python-format -msgid "SAJ" -msgstr "" - -#. module: account -#: constraint:account.analytic.line:0 -msgid "You cannot create analytic line on view account." -msgstr "" - #. module: account #: view:account.aged.trial.balance:0 #: view:account.analytic.balance:0 @@ -4934,7 +4858,7 @@ msgid "Set the account that will be set by default on invoice tax lines for invo msgstr "" #. module: account -#: code:addons/account/account.py:947 +#: code:addons/account/account.py:889 #, python-format msgid "Opening Period" msgstr "" @@ -5016,8 +4940,9 @@ msgid "Balance by Type of Account" msgstr "" #. module: account -#: view:account.fiscalyear.close:0 -msgid "Generate Fiscal Year Opening Entries" +#: code:addons/account/account_cash_statement.py:301 +#, python-format +msgid "There is no %s Account on the journal %s." msgstr "" #. module: account @@ -5040,6 +4965,11 @@ msgstr "" msgid "Group Invoice Lines" msgstr "" +#. module: account +#: view:account.automatic.reconcile:0 +msgid "Close" +msgstr "" + #. module: account #: field:account.bank.statement.line,move_ids:0 msgid "Moves" @@ -5087,7 +5017,7 @@ msgid "Child Tax Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:1076 +#: code:addons/account/account.py:1018 #, python-format msgid "There is no period defined for this date: %s.\n" "Please create one." @@ -5121,7 +5051,6 @@ msgstr "" #: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.journal.period.print.sale.purchase:0 -#: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 #: field:account.partner.balance,target_move:0 #: field:account.partner.ledger,target_move:0 @@ -5136,9 +5065,9 @@ msgid "Target Moves" msgstr "" #. module: account -#: model:account.payment.term,name:account.account_payment_term_net -#: model:account.payment.term,note:account.account_payment_term_net -msgid "30 Net Days" +#: code:addons/account/account.py:1411 +#, python-format +msgid "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)" msgstr "" #. module: account @@ -5182,7 +5111,7 @@ msgid "This boolean helps you to choose if you want to propose to the user to en msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1326 +#: code:addons/account/account_invoice.py:1335 #, python-format msgid "%s paid." msgstr "" @@ -5194,11 +5123,6 @@ msgstr "" msgid "Account Report" msgstr "" -#. module: account -#: field:account.journal.column,name:0 -msgid "Column Name" -msgstr "" - #. module: account #: field:account.entries.report,year:0 #: view:account.invoice.report:0 @@ -5228,7 +5152,7 @@ msgid "Internal Name" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1278 +#: code:addons/account/account_move_line.py:1173 #, python-format msgid "Cannot create an automatic sequence for this piece.\n" "Put a sequence in the journal definition for automatic numbering or create a sequence manually for this piece." @@ -5244,26 +5168,6 @@ msgstr "" msgid "month" msgstr "" -#. module: account -#: code:addons/account/wizard/account_change_currency.py:59 -#, python-format -msgid "New currency is not configured properly." -msgstr "" - -#. module: account -#: model:ir.actions.act_window,help:account.action_account_moves_all_a -msgid "
\n" -" Click to register a new journal item.\n" -"
\n" -" This view can be used by accountants in order to quickly record\n" -" entries in OpenERP. If you want to record a supplier invoice,\n" -" start by recording the line of the expense account. OpenERP\n" -" will propose to you automatically the Tax related to this\n" -" account and the counterpart \"Account Payable\".\n" -"
\n" -" " -msgstr "" - #. module: account #: view:account.move.line:0 #: field:account.partner.reconcile.process,next_partner_id:0 @@ -5303,7 +5207,6 @@ msgstr "" #. module: account #: field:account.move,line_id:0 #: view:analytic.entries.report:0 -#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open #: model:ir.actions.act_window,name:account.action_move_line_form msgid "Entries" msgstr "" @@ -5351,6 +5254,7 @@ msgstr "" #: view:account.move.line:0 #: field:account.tax,amount:0 #: field:account.tax.template,amount:0 +#: xsl:account.transfer:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,amount:0 #: field:cash.box.in,amount:0 @@ -5434,7 +5338,7 @@ msgid "Recompute taxes and total" msgstr "" #. module: account -#: code:addons/account/account.py:1155 +#: code:addons/account/account.py:1097 #, python-format msgid "You cannot modify/delete a journal with entries for this period." msgstr "" @@ -5460,7 +5364,7 @@ msgid "Amount Computation" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1200 +#: code:addons/account/account_move_line.py:1095 #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" @@ -5526,7 +5430,7 @@ msgstr "" #. module: account #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/account_invoice.py:1314 +#: code:addons/account/account_invoice.py:1323 #: selection:report.invoice.created,type:0 #, python-format msgid "Customer Refund" @@ -5630,12 +5534,6 @@ msgstr "" msgid "Customer Invoices And Refunds" msgstr "" -#. module: account -#: code:addons/account/wizard/account_move_journal.py:161 -#, python-format -msgid "This period is already closed." -msgstr "" - #. module: account #: field:account.analytic.line,amount_currency:0 #: field:account.entries.report,amount_currency:0 @@ -5649,11 +5547,6 @@ msgstr "" msgid "Round per Line" msgstr "" -#. module: account -#: model:ir.actions.act_window,name:account.action_view_move_line -msgid "Lines to reconcile" -msgstr "" - #. module: account #: report:account.analytic.account.balance:0 #: report:account.analytic.account.inverted.balance:0 @@ -5758,7 +5651,7 @@ msgid "Fixed Amount" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1151 +#: code:addons/account/account_move_line.py:1046 #, python-format msgid "You cannot change the tax, you should remove and recreate lines." msgstr "" @@ -5774,11 +5667,6 @@ msgstr "" msgid "Journal Item" msgstr "" -#. module: account -#: model:ir.model,name:account.model_account_move_journal -msgid "Move journal" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close @@ -5815,19 +5703,14 @@ msgid "Child Accounts" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1212 +#: code:addons/account/account_move_line.py:1107 #, python-format msgid "Move name (id): %s (%s)" msgstr "" -#. module: account -#: view:account.move.journal:0 -msgid "Standard Entries" -msgstr "" - #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:856 +#: code:addons/account/account_move_line.py:870 #, python-format msgid "Write-Off" msgstr "" @@ -5980,7 +5863,7 @@ msgid "Filter by" msgstr "" #. module: account -#: code:addons/account/account.py:2311 +#: code:addons/account/account.py:2281 #, python-format msgid "You have a wrong expression \"%(...)s\" in your model !" msgstr "" @@ -6027,12 +5910,6 @@ msgstr "" msgid "Report" msgstr "" -#. module: account -#: code:addons/account/wizard/account_move_journal.py:103 -#, python-format -msgid "Period: %s" -msgstr "" - #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template msgid "Template Tax Fiscal Position" @@ -6158,7 +6035,12 @@ msgid "Analytic Line" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1084 +#: model:ir.ui.menu,name:account.menu_action_model_form +msgid "Models" +msgstr "" + +#. module: account +#: code:addons/account/account_invoice.py:1090 #, python-format msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first." msgstr "" @@ -6356,7 +6238,7 @@ msgid "Current" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1296 +#: code:addons/account/account_invoice.py:1305 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)." msgstr "" @@ -6405,7 +6287,7 @@ msgid "Power" msgstr "" #. module: account -#: code:addons/account/account.py:3437 +#: code:addons/account/account.py:3392 #, python-format msgid "Cannot generate an unused journal code." msgstr "" @@ -6464,16 +6346,16 @@ msgid "The sequence field is used to order the taxes lines from lower sequences msgstr "" #. module: account -#: code:addons/account/account.py:1470 -#: code:addons/account/account.py:1499 -#: code:addons/account/account.py:1506 -#: code:addons/account/account_invoice.py:970 -#: code:addons/account/account_move_line.py:1102 +#: code:addons/account/account.py:1405 +#: code:addons/account/account.py:1410 +#: code:addons/account/account.py:1439 +#: code:addons/account/account.py:1446 +#: code:addons/account/account_invoice.py:975 +#: code:addons/account/account_move_line.py:995 #: code:addons/account/wizard/account_automatic_reconcile.py:148 #: code:addons/account/wizard/account_fiscalyear_close.py:88 #: code:addons/account/wizard/account_fiscalyear_close.py:99 #: code:addons/account/wizard/account_fiscalyear_close.py:102 -#: code:addons/account/wizard/account_move_journal.py:161 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format @@ -6529,7 +6411,7 @@ msgid "Optional create" msgstr "" #. module: account -#: code:addons/account/account.py:675 +#: code:addons/account/account.py:685 #, python-format msgid "You cannot change the owner company of an account that already contains journal items." msgstr "" @@ -6538,7 +6420,7 @@ msgstr "" #: report:account.invoice:0 #: selection:account.invoice,type:0 #: selection:account.invoice.report,type:0 -#: code:addons/account/account_invoice.py:1315 +#: code:addons/account/account_invoice.py:1324 #: selection:report.invoice.created,type:0 #, python-format msgid "Supplier Refund" @@ -6577,11 +6459,6 @@ msgstr "" msgid "Group By..." msgstr "" -#. module: account -#: field:account.journal.column,readonly:0 -msgid "Readonly" -msgstr "" - #. module: account #: view:account.payment.term.line:0 msgid " Valuation: Balance" @@ -6674,7 +6551,7 @@ msgstr "" #. module: account #: code:addons/account/account_analytic_line.py:142 -#: code:addons/account/account_move_line.py:932 +#: code:addons/account/account_move_line.py:946 #, python-format msgid "Entries: " msgstr "" @@ -6685,7 +6562,12 @@ msgid "Currency of the related account journal." msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1312 +#: constraint:account.move.line:0 +msgid "You cannot provide a secondary currency if it is the same than the company one." +msgstr "" + +#. module: account +#: code:addons/account/account_invoice.py:1321 #, python-format msgid "Customer invoice" msgstr "" @@ -6704,13 +6586,11 @@ msgstr "" #. module: account #: view:account.move.line:0 -#: code:addons/account/account_move_line.py:1041 -#, python-format msgid "Total debit" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:811 +#: code:addons/account/account_move_line.py:825 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "" @@ -6775,7 +6655,7 @@ msgid "You cannot remove an account that contains journal items." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1200 +#: code:addons/account/account_move_line.py:1095 #, python-format msgid "Error !" msgstr "" @@ -6878,7 +6758,6 @@ msgstr "" #: selection:account.common.partner.report,target_move:0 #: selection:account.common.report,target_move:0 #: selection:account.general.journal,target_move:0 -#: selection:account.move.journal,target_move:0 #: selection:account.partner.balance,target_move:0 #: selection:account.partner.ledger,target_move:0 #: selection:account.print.journal,target_move:0 @@ -6891,6 +6770,11 @@ msgstr "" msgid "All Entries" msgstr "" +#. module: account +#: constraint:account.move.reconcile:0 +msgid "You can only reconcile journal items with the same partner." +msgstr "" + #. module: account #: view:account.journal.select:0 msgid "Journal Select" @@ -6956,12 +6840,6 @@ msgstr "" msgid "Account tax chart" msgstr "" -#. module: account -#: constraint:res.partner.bank:0 -msgid "\n" -"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments" -msgstr "" - #. module: account #: report:account.analytic.account.cost_ledger:0 #: report:account.analytic.account.quantity_cost_ledger:0 @@ -6981,7 +6859,7 @@ msgid "Configuration error!\n" msgstr "" #. module: account -#: code:addons/account/account.py:2281 +#: code:addons/account/account.py:2251 #, python-format msgid "You can specify year, month and date in the name of the model using the following labels:\n" "\n" @@ -7035,12 +6913,6 @@ msgstr "" msgid "Sales" msgstr "" -#. module: account -#: view:account.journal.column:0 -#: model:ir.model,name:account.model_account_journal_column -msgid "Journal Column" -msgstr "" - #. module: account #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 @@ -7050,7 +6922,7 @@ msgid "Done" msgstr "" #. module: account -#: code:addons/account/account.py:1336 +#: code:addons/account/account.py:1278 #, python-format msgid "You cannot validate a non-balanced entry.\n" "Make sure you have configured payment terms properly.\n" @@ -7145,8 +7017,8 @@ msgid "Are you sure you want to open Journal Entries?" msgstr "" #. module: account -#: help:account.tax.code,notprintable:0 -msgid "Check this box if you don't want any tax related to this tax code to appear on invoices" +#: view:account.state.open:0 +msgid "Are you sure you want to open this invoice ?" msgstr "" #. module: account @@ -7154,12 +7026,6 @@ msgstr "" msgid "Opening Entries Expense Account" msgstr "" -#. module: account -#: code:addons/account/account_move_line.py:999 -#, python-format -msgid "Accounting Entries" -msgstr "" - #. module: account #: view:account.invoice:0 msgid "Customer Reference" @@ -7320,7 +7186,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_move_reconciliation.js:89 +#: code:addons/account/static/src/js/account_move_reconciliation.js:90 #, python-format msgid "Warning" msgstr "" @@ -7376,12 +7242,7 @@ msgid "Use model" msgstr "" #. module: account -#: 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 "" - -#. module: account -#: code:addons/account/account.py:1507 +#: code:addons/account/account.py:1447 #, python-format msgid "There is no default credit account defined \n" "on journal \"%s\"." @@ -7428,7 +7289,7 @@ msgid "Root/View" msgstr "" #. module: account -#: code:addons/account/account.py:3188 +#: code:addons/account/account.py:3148 #, python-format msgid "OPEJ" msgstr "" @@ -7493,7 +7354,7 @@ msgid "Maturity Date" msgstr "" #. module: account -#: code:addons/account/account.py:3175 +#: code:addons/account/account.py:3135 #, python-format msgid "Sales Journal" msgstr "" @@ -7504,7 +7365,7 @@ msgid "Invoice Tax" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1278 +#: code:addons/account/account_move_line.py:1173 #, python-format msgid "No piece number !" msgstr "" @@ -7536,7 +7397,7 @@ msgid "Sales Properties" msgstr "" #. module: account -#: code:addons/account/account.py:3515 +#: code:addons/account/account.py:3468 #, python-format msgid "You have to set a code for the bank account defined on the selected chart of accounts." msgstr "" @@ -7559,7 +7420,7 @@ msgstr "" #. module: account #: selection:account.move.line,centralisation:0 -#: code:addons/account/account.py:1557 +#: code:addons/account/account.py:1497 #, python-format msgid "Currency Adjustment" msgstr "" @@ -7651,7 +7512,7 @@ msgstr "" #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.entries.report,type:0 #: selection:account.journal,type:0 -#: code:addons/account/account.py:3064 +#: code:addons/account/account.py:3034 #, python-format msgid "Cash" msgstr "" @@ -7672,7 +7533,6 @@ msgstr "" #: field:account.financial.report,sequence:0 #: field:account.invoice.line,sequence:0 #: field:account.invoice.tax,sequence:0 -#: field:account.journal.column,sequence:0 #: field:account.model.line,sequence:0 #: field:account.payment.term.line,sequence:0 #: field:account.sequence.fiscalyear,sequence_id:0 @@ -7688,13 +7548,8 @@ msgid "Paypal account" msgstr "" #. module: account -#: constraint:product.category:0 -msgid "Error ! You cannot create recursive categories." -msgstr "" - -#. module: account -#: help:account.model.line,quantity:0 -msgid "The optional quantity on entries." +#: selection:account.print.journal,sort_selection:0 +msgid "Journal Entry Number" msgstr "" #. module: account @@ -7742,7 +7597,7 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_move_reconciliation.js:88 +#: code:addons/account/static/src/js/account_move_reconciliation.js:89 #, python-format msgid "You must choose at least one record." msgstr "" @@ -7804,11 +7659,19 @@ msgid "Partner Ledger" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1331 +#: code:addons/account/account_invoice.py:1340 #, python-format msgid "%s cancelled." msgstr "" +#. module: account +#: code:addons/account/account.py:652 +#: code:addons/account/account.py:655 +#: code:addons/account/account.py:667 +#, python-format +msgid "Warning !" +msgstr "" + #. module: account #: help:account.bank.statement,message_unread:0 #: help:account.invoice,message_unread:0 @@ -7925,6 +7788,11 @@ msgstr "" msgid "Inverted Analytic Balance -" msgstr "" +#. module: account +#: help:account.move.reconcile,opening_reconciliation:0 +msgid "Is this reconciliation produced by the opening of a new fiscal year ?." +msgstr "" + #. module: account #: view:account.analytic.line:0 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form @@ -7937,7 +7805,7 @@ msgid "Associated Partner" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1424 +#: code:addons/account/account_invoice.py:1433 #, python-format msgid "You must first select a partner !" msgstr "" @@ -8015,13 +7883,13 @@ msgid "Set if the amount of tax must be included in the base amount before compu msgstr "" #. module: account -#: code:addons/account/account.py:3178 +#: code:addons/account/account.py:3138 #, python-format msgid "Purchase Refund Journal" msgstr "" #. module: account -#: code:addons/account/account.py:1350 +#: code:addons/account/account.py:1292 #, python-format msgid "Please define a sequence on the journal." msgstr "" @@ -8073,9 +7941,7 @@ msgstr "" #: field:account.subscription,period_nbr:0 #: field:account.tax.chart,period_id:0 #: field:account.treasury.report,period_id:0 -#: code:addons/account/wizard/account_move_journal.py:118 #: field:validate.account.move,period_id:0 -#, python-format msgid "Period" msgstr "" @@ -8151,11 +8017,6 @@ msgstr "" msgid "This wizard will remove the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year." msgstr "" -#. module: account -#: constraint:product.template:0 -msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category." -msgstr "" - #. module: account #: report:account.invoice:0 msgid "Tel. :" @@ -8232,14 +8093,8 @@ msgid "Use this option if you want to cancel an invoice and create a new\n" msgstr "" #. module: account -#: help:account.move.line,currency_id:0 -msgid "The optional other currency if it is a multi-currency entry." -msgstr "" - -#. module: account -#: model:ir.actions.act_window,name:account.action_account_journal_view -#: model:ir.ui.menu,name:account.menu_action_account_journal_view -msgid "Journal Views" +#: model:process.transition,name:account.process_transition_filestatement0 +msgid "Automatic import of the bank sta" msgstr "" #. module: account @@ -8266,7 +8121,7 @@ msgid "Account Types" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1303 +#: code:addons/account/account_move_line.py:1198 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" @@ -8355,7 +8210,7 @@ msgid "The partner account used for this invoice." msgstr "" #. module: account -#: code:addons/account/account.py:3374 +#: code:addons/account/account.py:3333 #, python-format msgid "Tax %.2f%%" msgstr "" @@ -8373,7 +8228,7 @@ msgid "Payment Term Line" msgstr "" #. module: account -#: code:addons/account/account.py:3176 +#: code:addons/account/account.py:3136 #, python-format msgid "Purchase Journal" msgstr "" @@ -8474,6 +8329,7 @@ msgstr "" #: view:account.analytic.inverted.balance:0 #: view:account.analytic.journal.report:0 #: view:account.common.report:0 +#: view:account.invoice:0 msgid "Print" msgstr "" @@ -8493,8 +8349,10 @@ msgid "Sales tax (%)" msgstr "" #. module: account -#: model:ir.model,name:account.model_account_fiscal_position_account_template -msgid "Template Account Fiscal Mapping" +#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 +#: model:ir.actions.act_window,name:account.action_account_analytic_chart +#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2 +msgid "Chart of Analytic Accounts" msgstr "" #. module: account @@ -8577,7 +8435,7 @@ msgid "The amount expressed in an optional other currency if it is a multi-curre msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1103 +#: code:addons/account/account_move_line.py:996 #, python-format msgid "The account move (%s) for centralisation has been confirmed." msgstr "" @@ -8634,7 +8492,7 @@ msgid "Reconciled entries" msgstr "" #. module: account -#: code:addons/account/account.py:2311 +#: code:addons/account/account.py:2281 #, python-format msgid "Wrong model !" msgstr "" @@ -8656,7 +8514,7 @@ msgid "Print Account Partner Balance" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1216 +#: code:addons/account/account_move_line.py:1111 #, python-format msgid "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n" "%s." @@ -8683,7 +8541,7 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,journal_id:0 -#: code:addons/account/account.py:3180 +#: code:addons/account/account.py:3140 #, python-format msgid "Opening Entries Journal" msgstr "" @@ -8780,7 +8638,7 @@ msgid "Unit of Currency" msgstr "" #. module: account -#: code:addons/account/account.py:3177 +#: code:addons/account/account.py:3137 #, python-format msgid "Sales Refund Journal" msgstr "" @@ -8861,7 +8719,7 @@ msgid "Display Detail" msgstr "" #. module: account -#: code:addons/account/account.py:3185 +#: code:addons/account/account.py:3145 #, python-format msgid "SCNJ" msgstr "" @@ -8872,8 +8730,9 @@ msgid "Analytic costs (timesheets, some purchased products, ...) come from analy msgstr "" #. module: account -#: help:account.journal,view_id:0 -msgid "Gives the view used when writing or browsing entries in this journal. The view tells OpenERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal." +#: view:account.analytic.line:0 +#: view:analytic.entries.report:0 +msgid "My Entries" msgstr "" #. module: account @@ -8934,11 +8793,8 @@ msgid "Start Period" msgstr "" #. module: account -#: code:addons/account/account.py:611 -#: code:addons/account/account.py:793 -#: code:addons/account/account.py:794 -#, python-format -msgid "%s (copy)" +#: model:ir.actions.report.xml,name:account.account_central_journal +msgid "Central Journal" msgstr "" #. module: account @@ -8956,19 +8812,8 @@ msgstr "" msgid "Ask Refund" msgstr "" -#. module: account -#: field:account.journal.column,view_id:0 -#: view:account.journal.view:0 -#: field:account.journal.view,name:0 -#: model:account.journal.view,name:account.account_journal_view -#: model:ir.model,name:account.model_account_journal_view -msgid "Journal View" -msgstr "" - #. module: account #: view:account.move.line:0 -#: code:addons/account/account_move_line.py:1044 -#, python-format msgid "Total credit" msgstr "" @@ -9020,6 +8865,11 @@ msgid "This allows you to create and manage your payment orders, with purposes t " This installs the module account_payment." msgstr "" +#. module: account +#: xsl:account.transfer:0 +msgid "Document" +msgstr "" + #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_tree #: model:ir.ui.menu,name:account.menu_bank_statement_tree @@ -9027,8 +8877,8 @@ msgid "Bank Statements" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:753 -#: code:addons/account/account_move_line.py:806 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/account_move_line.py:820 #, python-format msgid "To reconcile the entries company should be the same for all entries." msgstr "" @@ -9089,20 +8939,14 @@ msgstr "" msgid "Legend" msgstr "" -#. module: account -#: model:ir.actions.act_window,help:account.action_account_moves_sale -msgid "This view is used by accountants in order to record entries massively in OpenERP. If you want to record a customer invoice, select the journal and the period in the search toolbar. Then, start by recording the entry line of the income account. OpenERP will propose to you automatically the Tax related to this account and the counter-part \"Account receivable\"." -msgstr "" - #. module: account #: model:process.transition,note:account.process_transition_entriesreconcile0 msgid "Accounting entries are the first input of the reconciliation." msgstr "" #. module: account -#: code:addons/account/account_cash_statement.py:301 -#, python-format -msgid "There is no %s Account on the journal %s." +#: view:account.fiscalyear.close:0 +msgid "Generate Fiscal Year Opening Entries" msgstr "" #. module: account @@ -9129,6 +8973,7 @@ msgstr "" #: report:account.journal.period.print:0 #: report:account.journal.period.print.sale.purchase:0 #: view:account.move:0 +#: view:account.move.line:0 #: field:analytic.entries.report,move_id:0 msgid "Move" msgstr "" @@ -9167,6 +9012,11 @@ msgstr "" msgid "There is nothing due with this customer." msgstr "" +#. module: account +#: help:account.tax,account_paid_id:0 +msgid "Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account." +msgstr "" + #. module: account #: help:account.addtmpl.wizard,cparent_id:0 msgid "Creates an account with the selected template under this existing parent." @@ -9221,7 +9071,7 @@ msgid "Balance :" msgstr "" #. module: account -#: code:addons/account/account.py:1602 +#: code:addons/account/account.py:1542 #, python-format msgid "Cannot create moves for different companies." msgstr "" @@ -9306,7 +9156,7 @@ msgid "Due date" msgstr "" #. module: account -#: code:addons/account/account.py:1519 +#: code:addons/account/account.py:1459 #, python-format msgid " Centralisation" msgstr "" @@ -9445,24 +9295,14 @@ msgstr "" #: view:account.bank.statement:0 #: view:account.move:0 #: view:account.move.line:0 -#: code:addons/account/wizard/account_move_journal.py:149 #: 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 #: model:ir.actions.act_window,name:account.action_account_moves_all_a -#: model:ir.actions.act_window,name:account.action_account_moves_bank -#: model:ir.actions.act_window,name:account.action_account_moves_purchase -#: model:ir.actions.act_window,name:account.action_account_moves_sale -#: model:ir.actions.act_window,name:account.action_move_line_search #: model:ir.actions.act_window,name:account.action_move_line_select -#: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.actions.act_window,name:account.action_tax_code_line_open #: model:ir.model,name:account.model_account_move_line #: model:ir.ui.menu,name:account.menu_action_account_moves_all -#: model:ir.ui.menu,name:account.menu_action_account_moves_bank -#: model:ir.ui.menu,name:account.menu_eaction_account_moves_purchase -#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale -#, python-format msgid "Journal Items" msgstr "" @@ -9472,7 +9312,7 @@ msgid "Comparison" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1109 #, python-format msgid "You cannot do this modification on a confirmed entry. You can just change some non legal fields or you must unconfirm the journal entry first.\n" "%s." @@ -9553,7 +9393,7 @@ msgid "Journal Entry Model" msgstr "" #. module: account -#: code:addons/account/account.py:1116 +#: code:addons/account/account.py:1058 #, python-format msgid "Start period should precede then end period." msgstr "" @@ -9604,8 +9444,8 @@ msgstr "" #: view:accounting.report:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 -#: model:ir.actions.act_window,name:account.action_account_period_form -#: model:ir.ui.menu,name:account.menu_action_account_period_form +#: model:ir.actions.act_window,name:account.action_account_period +#: model:ir.ui.menu,name:account.menu_action_account_period #: model:ir.ui.menu,name:account.next_id_23 msgid "Periods" msgstr "" @@ -9658,11 +9498,6 @@ msgstr "" msgid "Title 2 (bold)" msgstr "" -#. module: account -#: view:account.entries.report:0 -msgid "Acc.Type" -msgstr "" - #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2 @@ -9837,12 +9672,6 @@ msgstr "" msgid "Total" msgstr "" -#. module: account -#: code:addons/account/wizard/account_move_journal.py:98 -#, python-format -msgid "Journal: All" -msgstr "" - #. module: account #: code:addons/account/wizard/account_invoice_refund.py:109 #, python-format @@ -9965,7 +9794,7 @@ msgid "Empty Accounts ? " msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1151 +#: code:addons/account/account_move_line.py:1046 #, python-format msgid "Unable to change tax!" msgstr "" @@ -9991,13 +9820,13 @@ msgid "The code of the journal must be unique per company !" msgstr "" #. module: account -#: view:account.partner.reconcile.process:0 -msgid "Go to Next Partner" +#: model:ir.actions.act_window,help:account.action_account_invoice_report_all +msgid "From this report, you can have an overview of the amount invoiced to your customer. The tool search can also be used to personalise your Invoices reports and so, match this analysis to your needs." msgstr "" #. module: account -#: model:ir.actions.act_window,help:account.action_account_invoice_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." +#: view:account.partner.reconcile.process:0 +msgid "Go to Next Partner" msgstr "" #. module: account @@ -10072,8 +9901,8 @@ msgid "Invoice Lines" msgstr "" #. module: account -#: selection:account.print.journal,sort_selection:0 -msgid "Journal Entry Number" +#: help:account.model.line,quantity:0 +msgid "The optional quantity on entries." msgstr "" #. module: account @@ -10081,19 +9910,13 @@ msgstr "" msgid "Reconciled transactions" msgstr "" -#. module: account -#: code:addons/account/account.py:653 -#, python-format -msgid "You cannot change the type of account from 'Closed' to any other type which contains journal items!" -msgstr "" - #. module: account #: model:ir.model,name:account.model_report_account_receivable msgid "Receivable accounts" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:762 +#: code:addons/account/account_move_line.py:776 #, python-format msgid "Already reconciled." msgstr "" @@ -10172,8 +9995,8 @@ msgid "Applicability" msgstr "" #. module: account -#: model:process.transition,name:account.process_transition_filestatement0 -msgid "Automatic import of the bank sta" +#: help:account.move.line,currency_id:0 +msgid "The optional other currency if it is a multi-currency entry." msgstr "" #. module: account @@ -10213,7 +10036,7 @@ msgid "Entries Sorted by" msgstr "" #. module: account -#: code:addons/account/account_invoice.py:1511 +#: code:addons/account/account_invoice.py:1520 #, python-format msgid "The selected unit of measure is not compatible with the unit of measure of the product." msgstr "" @@ -10246,6 +10069,20 @@ msgstr "" msgid "November" msgstr "" +#. module: account +#: model:ir.actions.act_window,help:account.action_account_moves_all_a +msgid "\n" +" Select the period and the journal you want to fill.\n" +"
\n" +" This view can be used by accountants in order to quickly record\n" +" entries in OpenERP. If you want to record a supplier invoice,\n" +" start by recording the line of the expense account. OpenERP\n" +" will propose to you automatically the Tax related to this\n" +" account and the counterpart \"Account Payable\".\n" +"
\n" +" " +msgstr "" + #. module: account #: help:account.invoice.line,account_id:0 msgid "The income or expense account related to the selected product." @@ -10285,7 +10122,6 @@ msgid "Total Receivable" msgstr "" #. module: account -#: view:account.account.template:0 #: view:account.move.line:0 msgid "General Information" msgstr "" @@ -10323,8 +10159,9 @@ msgid "As soon as the reconciliation is done, the invoice can be paid." msgstr "" #. module: account -#: model:account.journal.view,name:account.account_sp_journal_view -msgid "Sale/Purchase Journal View" +#: code:addons/account/wizard/account_change_currency.py:59 +#, python-format +msgid "New currency is not configured properly." msgstr "" #. module: account @@ -10350,8 +10187,8 @@ msgstr "" #. module: account #. openerp-web -#: code:addons/account/static/src/js/account_move_reconciliation.js:73 -#: code:addons/account/static/src/js/account_move_reconciliation.js:79 +#: code:addons/account/static/src/js/account_move_reconciliation.js:74 +#: code:addons/account/static/src/js/account_move_reconciliation.js:80 #, python-format msgid "Never" msgstr "" @@ -10378,9 +10215,9 @@ msgid "Internal Notes" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form +#: model:ir.actions.act_window,name:account.action_account_fiscalyear #: view:ir.sequence:0 -#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form +#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear msgid "Fiscal Years" msgstr "" @@ -10469,10 +10306,8 @@ msgid "Usually 1 or -1." msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 -#: model:ir.actions.act_window,name:account.action_account_analytic_chart -#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2 -msgid "Chart of Analytic Accounts" +#: model:ir.model,name:account.model_account_fiscal_position_account_template +msgid "Template Account Fiscal Mapping" msgstr "" #. module: account diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot index 084481cea11..d9d5af287a7 100644 --- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot +++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -168,8 +168,16 @@ msgid "Invoiced Time" msgstr "" #. module: account_analytic_analysis -#: constraint:account.analytic.account:0 -msgid "Error! You cannot create recursive analytic accounts." +#: field:account.analytic.account,fix_price_to_invoice:0 +#: field:account.analytic.account,remaining_hours:0 +#: field:account.analytic.account,remaining_hours_to_invoice:0 +#: field:account.analytic.account,timesheet_ca_invoiced:0 +msgid "Remaining Time" +msgstr "" + +#. module: account_analytic_analysis +#: view:account.analytic.account:0 +msgid "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', 'normal','template'])]}" msgstr "" #. module: account_analytic_analysis @@ -198,6 +206,11 @@ msgstr "" msgid "Template of Contract" msgstr "" +#. module: account_analytic_analysis +#: model:res.groups,name:account_analytic_analysis.group_template_required +msgid "Mandatory use of templates in contracts" +msgstr "" + #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Total Worked Time" @@ -252,8 +265,8 @@ msgid "Start Date" msgstr "" #. module: account_analytic_analysis -#: help:account.analytic.account,total_cost:0 -msgid "Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets." +#: view:account.analytic.account:0 +msgid "Invoiced" msgstr "" #. module: account_analytic_analysis @@ -272,7 +285,7 @@ msgid "Timesheets" msgstr "" #. module: account_analytic_analysis -#: code:addons/account_analytic_analysis/account_analytic_analysis.py:452 +#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461 #, python-format msgid "Sale Order Lines of %s" msgstr "" @@ -351,8 +364,8 @@ msgid "Contract" msgstr "" #. module: account_analytic_analysis -#: view:account.analytic.account:0 -msgid "Invoiced" +#: help:sale.config.settings,group_template_required:0 +msgid "Allows you to set the template field as required when creating an analytic account or a contract." msgstr "" #. module: account_analytic_analysis @@ -484,11 +497,26 @@ msgstr "" msgid "Date of the latest work done on this account." msgstr "" +#. module: account_analytic_analysis +#: model:ir.model,name:account_analytic_analysis.model_sale_config_settings +msgid "sale.config.settings" +msgstr "" + +#. module: account_analytic_analysis +#: field:sale.config.settings,group_template_required:0 +msgid "Mandatory use of templates." +msgstr "" + #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts Having a Partner" msgstr "" +#. module: account_analytic_analysis +#: help:account.analytic.account,total_cost:0 +msgid "Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets." +msgstr "" + #. module: account_analytic_analysis #: field:account.analytic.account,est_total:0 msgid "Total Estimation" @@ -511,16 +539,13 @@ msgid "Total Time" msgstr "" #. module: account_analytic_analysis -#: field:account.analytic.account,invoice_on_timesheets:0 -msgid "On Timesheets" +#: model:res.groups,comment:account_analytic_analysis.group_template_required +msgid "the field template of the analytic accounts and contracts will be required." msgstr "" #. module: account_analytic_analysis -#: field:account.analytic.account,fix_price_to_invoice:0 -#: field:account.analytic.account,remaining_hours:0 -#: field:account.analytic.account,remaining_hours_to_invoice:0 -#: field:account.analytic.account,timesheet_ca_invoiced:0 -msgid "Remaining Time" +#: field:account.analytic.account,invoice_on_timesheets:0 +msgid "On Timesheets" msgstr "" #. module: account_analytic_analysis diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot index 89adb49c409..be15a31806a 100644 --- a/addons/account_analytic_default/i18n/account_analytic_default.pot +++ b/addons/account_analytic_default/i18n/account_analytic_default.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -92,11 +92,6 @@ msgstr "" msgid "Analytic Defaults" msgstr "" -#. module: account_analytic_default -#: sql_constraint:stock.picking:0 -msgid "Reference must be unique per Company!" -msgstr "" - #. module: account_analytic_default #: field:account.analytic.default,sequence:0 msgid "Sequence" diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot index e5ad6384b99..1e0b672eac7 100644 --- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot +++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,18 +16,8 @@ msgstr "" "Plural-Forms: \n" #. module: account_analytic_plans -#: view:analytic.plan.create.model:0 -msgid "This distribution model has been saved.You will be able to reuse it later." -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance.line,plan_id:0 -msgid "Plan Id" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "From Date" +#: field:account.analytic.plan.instance,account4_ids:0 +msgid "Account4 Id" msgstr "" #. module: account_analytic_plans @@ -38,6 +28,27 @@ msgstr "" msgid "Crossovered Analytic" msgstr "" +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account5_ids:0 +msgid "Account5 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.crossovered.analytic,date2:0 +msgid "End Date" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,rate:0 +msgid "Rate (%)" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/account_analytic_plans.py:234 +#, python-format +msgid "The total should be between %s and %s." +msgstr "" + #. module: account_analytic_plans #: view:account.analytic.plan:0 #: field:account.analytic.plan,name:0 @@ -48,124 +59,19 @@ msgstr "" msgid "Analytic Plan" msgstr "" -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,journal_id:0 -#: view:account.crossovered.analytic:0 -#: field:account.crossovered.analytic,journal_ids:0 -msgid "Analytic Journal" -msgstr "" - -#. module: account_analytic_plans -#: view:account.analytic.plan.line:0 -#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line -msgid "Analytic Plan Line" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance -msgid "Analytic Plan Instance" -msgstr "" - #. module: account_analytic_plans #: view:analytic.plan.create.model:0 -msgid "Ok" +msgid "This distribution model has been saved.You will be able to reuse it later." msgstr "" #. module: account_analytic_plans -#: field:account.analytic.plan.instance,plan_id:0 -msgid "Model's Plan" +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line +msgid "Analytic Instance Line" msgstr "" #. module: account_analytic_plans -#: field:account.analytic.plan.instance,account2_ids:0 -msgid "Account2 Id" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account_ids:0 -msgid "Account Id" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:221 -#: code:addons/account_analytic_plans/account_analytic_plans.py:234 -#: 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 "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Amount" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Code" -msgstr "" - -#. module: account_analytic_plans -#: sql_constraint:account.move.line:0 -msgid "Wrong credit or debit value in accounting entry !" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account6_ids:0 -msgid "Account6 Id" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action -msgid "Multi Plans" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line -msgid "Bank Statement Line" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.invoice:0 -msgid "Invalid BBA Structured Communication !" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 -#, python-format -msgid "There is no analytic plan defined." -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.move.line:0 -msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal." -msgstr "" - -#. module: account_analytic_plans -#: sql_constraint:account.journal:0 -msgid "The code of the journal must be unique per company !" -msgstr "" - -#. module: account_analytic_plans -#: field:account.crossovered.analytic,ref:0 -msgid "Analytic Account Reference" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_sale_order_line -msgid "Sales Order Line" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47 -#: view:analytic.plan.create.model:0 -#, python-format -msgid "Distribution Model Saved" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action -msgid "Analytic Distribution's Models" +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Lines" msgstr "" #. module: account_analytic_plans @@ -173,244 +79,19 @@ msgstr "" msgid "Print" msgstr "" -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -#: field:account.analytic.line,percentage:0 -msgid "Percentage" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 -#, python-format -msgid "There are no analytic lines related to account %s." -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance.line,analytic_account_id:0 -msgid "Analytic Account" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance.line,rate:0 -msgid "Rate (%)" -msgstr "" - -#. module: account_analytic_plans -#: view:account.analytic.plan:0 -#: field:account.analytic.plan,plan_ids:0 -#: field:account.journal,plan_id:0 -msgid "Analytic Plans" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Perc(%)" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.line,max_required:0 -msgid "Maximum Allowed (%)" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Printing date" -msgstr "" - -#. module: account_analytic_plans -#: view:account.analytic.plan.line:0 -msgid "Analytic Plan Lines" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.move.line:0 -msgid "Account and Period must belong to the same company." -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.bank.statement:0 -msgid "The journal and period chosen have to belong to the same company." -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_invoice_line -msgid "Invoice Line" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.move.line:0 -msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal." -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Currency" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.analytic.line:0 -msgid "You cannot create analytic line on view account." -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Company" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account5_ids:0 -msgid "Account5 Id" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.move.line:0 -msgid "You cannot create journal items on closed account." -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line -msgid "Analytic Instance Line" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.line,root_analytic_id:0 -msgid "Root Account" -msgstr "" - #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 msgid "To Date" msgstr "" #. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:342 -#: code:addons/account_analytic_plans/account_analytic_plans.py:486 -#, python-format -msgid "You have to define an analytic journal on the '%s' journal." +#: field:account.analytic.plan.instance.line,plan_id:0 +msgid "Plan Id" msgstr "" #. module: account_analytic_plans -#: field:account.crossovered.analytic,empty_line:0 -msgid "Dont show empty lines" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model -msgid "analytic.plan.create.model.action" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_analytic_line -msgid "Analytic Line" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Analytic Account :" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Analytic Account Reference:" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.line,name:0 -msgid "Plan Name" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan,default_instance_id:0 -msgid "Default Entries" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_move_line -msgid "Journal Items" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account1_ids:0 -msgid "Account1 Id" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.line,min_required:0 -msgid "Minimum Allowed (%)" -msgstr "" - -#. module: account_analytic_plans -#: help:account.analytic.plan.line,root_analytic_id:0 -msgid "Root account of this plan." -msgstr "" - -#. module: account_analytic_plans -#: view:analytic.plan.create.model:0 -msgid "Save This Distribution as a Model" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "Quantity" -msgstr "" - -#. module: account_analytic_plans -#: sql_constraint:account.invoice:0 -msgid "Invoice Number must be unique per Company!" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic -msgid "Print Crossovered Analytic" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:342 -#: code:addons/account_analytic_plans/account_analytic_plans.py:486 -#, python-format -msgid "No Analytic Journal !" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_bank_statement -msgid "Bank Statement" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account3_ids:0 -msgid "Account3 Id" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_invoice -msgid "Invoice" -msgstr "" - -#. module: account_analytic_plans -#: view:account.crossovered.analytic:0 -#: view:analytic.plan.create.model:0 -msgid "Cancel" -msgstr "" - -#. module: account_analytic_plans -#: field:account.analytic.plan.instance,account4_ids:0 -msgid "Account4 Id" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:234 -#, python-format -msgid "The total should be between %s and %s." -msgstr "" - -#. module: account_analytic_plans -#: view:account.analytic.plan.instance.line:0 -msgid "Analytic Distribution Lines" -msgstr "" - -#. module: account_analytic_plans -#: report:account.analytic.account.crossovered.analytic:0 -msgid "at" +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action +msgid "Analytic Distribution's Models" msgstr "" #. module: account_analytic_plans @@ -428,11 +109,282 @@ msgstr "" msgid "Distribution Code" msgstr "" +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +#: field:account.analytic.line,percentage:0 +msgid "Percentage" +msgstr "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Printing date" +msgstr "" + +#. module: account_analytic_plans +#: field:account.crossovered.analytic,empty_line:0 +msgid "Dont show empty lines" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 +#, python-format +msgid "There are no analytic lines related to account %s." +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account3_ids:0 +msgid "Account3 Id" +msgstr "" + +#. module: account_analytic_plans +#: view:account.crossovered.analytic:0 +#: view:analytic.plan.create.model:0 +msgid "or" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 msgid "100.00%" msgstr "" +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Currency" +msgstr "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account :" +msgstr "" + +#. module: account_analytic_plans +#: view:analytic.plan.create.model:0 +msgid "Save This Distribution as a Model" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line +msgid "Analytic Plan Line" +msgstr "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account Reference:" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,name:0 +msgid "Plan Name" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan,default_instance_id:0 +msgid "Default Entries" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,plan_ids:0 +#: field:account.journal,plan_id:0 +msgid "Analytic Plans" +msgstr "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Perc(%)" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model +msgid "analytic.plan.create.model" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account1_ids:0 +msgid "Account1 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,max_required:0 +msgid "Maximum Allowed (%)" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,root_analytic_id:0 +msgid "Root Account" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47 +#: view:analytic.plan.create.model:0 +#, python-format +msgid "Distribution Model Saved" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance +msgid "Analytic Plan Instance" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open +msgid "Distribution Models" +msgstr "" + +#. module: account_analytic_plans +#: view:analytic.plan.create.model:0 +msgid "Ok" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +msgid "Analytic Plan Lines" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,min_required:0 +msgid "Minimum Allowed (%)" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,plan_id:0 +msgid "Model's Plan" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account2_ids:0 +msgid "Account2 Id" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line +msgid "Bank Statement Line" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/account_analytic_plans.py:221 +#: code:addons/account_analytic_plans/account_analytic_plans.py:234 +#: 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 "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Amount" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic +msgid "Print Crossovered Analytic" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 +#, python-format +msgid "User Error!" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account6_ids:0 +msgid "Account6 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,journal_id:0 +#: view:account.crossovered.analytic:0 +#: field:account.crossovered.analytic,journal_ids:0 +msgid "Analytic Journal" +msgstr "" + +#. module: account_analytic_plans +#: 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 "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Quantity" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action +msgid "Multi Plans" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account_ids:0 +msgid "Account Id" +msgstr "" + +#. module: account_analytic_plans +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Code" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_journal +msgid "Journal" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/account_analytic_plans.py:342 +#: code:addons/account_analytic_plans/account_analytic_plans.py:486 +#, python-format +msgid "You have to define an analytic journal on the '%s' journal." +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/account_analytic_plans.py:342 +#: code:addons/account_analytic_plans/account_analytic_plans.py:486 +#, python-format +msgid "No Analytic Journal !" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model +msgid "analytic.plan.create.model.action" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_analytic_plans +#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 +#, python-format +msgid "There is no analytic plan defined." +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_bank_statement +msgid "Bank Statement" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,analytic_account_id:0 +msgid "Analytic Account" +msgstr "" + #. module: account_analytic_plans #: field:account.analytic.default,analytics_id:0 #: view:account.analytic.plan.instance:0 @@ -445,46 +397,30 @@ msgid "Analytic Distribution" msgstr "" #. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_account_journal -msgid "Journal" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.journal:0 -msgid "Configuration error!\n" -"The currency chosen should be shared by the default accounts too." -msgstr "" - -#. module: account_analytic_plans -#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model -msgid "analytic.plan.create.model" -msgstr "" - -#. module: account_analytic_plans -#: field:account.crossovered.analytic,date2:0 -msgid "End Date" -msgstr "" - -#. module: account_analytic_plans -#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open -msgid "Distribution Models" -msgstr "" - -#. module: account_analytic_plans -#: constraint:account.move.line:0 -msgid "You cannot create journal items on an account of type view." -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 +#: code:addons/account_analytic_plans/account_analytic_plans.py:221 #, python-format -msgid "User Error!" +msgid "A model with this name and code already exists." msgstr "" #. module: account_analytic_plans -#: 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." +#: help:account.analytic.plan.line,root_analytic_id:0 +msgid "Root account of this plan." +msgstr "" + +#. module: account_analytic_plans +#: field:account.crossovered.analytic,ref:0 +msgid "Analytic Account Reference" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_analytic_plans +#: view:account.crossovered.analytic:0 +#: view:analytic.plan.create.model:0 +msgid "Cancel" msgstr "" #. module: account_analytic_plans @@ -493,29 +429,22 @@ msgid "Start Date" msgstr "" #. module: account_analytic_plans -#: constraint:account.bank.statement.line:0 -msgid "The amount of the voucher must be the same amount as the one on the statement line." +#: report:account.analytic.account.crossovered.analytic:0 +msgid "at" msgstr "" #. module: account_analytic_plans -#: field:account.analytic.plan.line,sequence:0 -msgid "Sequence" +#: report:account.analytic.account.crossovered.analytic:0 +msgid "Company" msgstr "" #. module: account_analytic_plans -#: sql_constraint:account.journal:0 -msgid "The name of the journal must be unique per company !" +#: model:ir.model,name:account_analytic_plans.model_sale_order_line +msgid "Sales Order Line" msgstr "" #. module: account_analytic_plans -#: view:account.crossovered.analytic:0 -#: view:analytic.plan.create.model:0 -msgid "or" -msgstr "" - -#. module: account_analytic_plans -#: code:addons/account_analytic_plans/account_analytic_plans.py:221 -#, python-format -msgid "A model with this name and code already exists." +#: report:account.analytic.account.crossovered.analytic:0 +msgid "From Date" msgstr "" diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot index 616996eed8d..b2be72c3ec7 100644 --- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot +++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,41 +15,11 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" -#. module: account_anglo_saxon -#: sql_constraint:purchase.order:0 -msgid "Order Reference must be unique per Company!" -msgstr "" - -#. module: account_anglo_saxon -#: sql_constraint:account.invoice:0 -msgid "Invoice Number must be unique per Company!" -msgstr "" - #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_product_category msgid "Product Category" msgstr "" -#. module: account_anglo_saxon -#: sql_constraint:stock.picking:0 -msgid "Reference must be unique per Company!" -msgstr "" - -#. module: account_anglo_saxon -#: constraint:product.category:0 -msgid "Error ! You cannot create recursive categories." -msgstr "" - -#. module: account_anglo_saxon -#: constraint:account.invoice:0 -msgid "Invalid BBA Structured Communication !" -msgstr "" - -#. module: account_anglo_saxon -#: constraint:product.template:0 -msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category." -msgstr "" - #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line msgid "Invoice Line" diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot index 6661ac569dd..14109f6974c 100644 --- a/addons/account_asset/i18n/account_asset.pot +++ b/addons/account_asset/i18n/account_asset.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -37,11 +37,6 @@ msgstr "" msgid "Depr. Expense Account" msgstr "" -#. module: account_asset -#: view:asset.depreciation.confirmation.wizard:0 -msgid "Compute Asset" -msgstr "" - #. module: account_asset #: view:asset.asset.report:0 msgid "Group By..." @@ -190,11 +185,6 @@ msgstr "" msgid "Depreciation Entry" msgstr "" -#. module: account_asset -#: sql_constraint:account.move.line:0 -msgid "Wrong credit or debit value in accounting entry !" -msgstr "" - #. module: account_asset #: view:asset.asset.report:0 #: field:asset.asset.report,nbr:0 @@ -224,11 +214,6 @@ msgstr "" msgid "Reference" msgstr "" -#. module: account_asset -#: constraint:account.invoice:0 -msgid "Invalid BBA Structured Communication !" -msgstr "" - #. module: account_asset #: view:account.asset.asset:0 msgid "Account Asset" @@ -307,11 +292,6 @@ msgid "The method to use to compute the dates and number of depreciation lines.\ "Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond." msgstr "" -#. module: account_asset -#: constraint:account.move.line:0 -msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal." -msgstr "" - #. module: account_asset #: help:account.asset.history,method_period:0 msgid "Time in month between two depreciations" @@ -342,11 +322,6 @@ msgstr "" msgid "Assets in closed state" msgstr "" -#. module: account_asset -#: constraint:account.move.line:0 -msgid "Account and Period must belong to the same company." -msgstr "" - #. module: account_asset #: field:account.asset.asset,parent_id:0 msgid "Parent Asset" @@ -368,11 +343,6 @@ msgstr "" msgid "Invoice Line" msgstr "" -#. module: account_asset -#: constraint:account.move.line:0 -msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal." -msgstr "" - #. module: account_asset #: view:account.asset.asset:0 msgid "Depreciation Board" @@ -401,11 +371,6 @@ msgstr "" msgid "or" msgstr "" -#. module: account_asset -#: constraint:account.move.line:0 -msgid "You cannot create journal items on closed account." -msgstr "" - #. module: account_asset #: field:account.asset.asset,note:0 #: field:account.asset.category,note:0 @@ -531,8 +496,8 @@ msgid "History" msgstr "" #. module: account_asset -#: sql_constraint:account.invoice:0 -msgid "Invoice Number must be unique per Company!" +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" msgstr "" #. module: account_asset @@ -673,11 +638,6 @@ msgstr "" msgid "Name" msgstr "" -#. module: account_asset -#: constraint:account.move.line:0 -msgid "You cannot create journal items on an account of type view." -msgstr "" - #. module: account_asset #: help:account.asset.category,open_asset:0 msgid "Check this if you want to automatically confirm the assets of this category when created by invoices." diff --git a/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot b/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot index ba4a5d90924..552ba936135 100644 --- a/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot +++ b/addons/account_bank_statement_extensions/i18n/account_bank_statement_extensions.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -59,11 +59,6 @@ msgstr "" msgid "Value Date" msgstr "" -#. module: account_bank_statement_extensions -#: constraint:res.partner.bank:0 -msgid "The RIB and/or IBAN is not valid" -msgstr "" - #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Group By..." @@ -192,12 +187,6 @@ msgstr "" msgid "Confirmed lines cannot be changed anymore." msgstr "" -#. module: account_bank_statement_extensions -#: constraint:res.partner.bank:0 -msgid "\n" -"Please define BIC/Swift code on bank for bank type IBAN Account to make valid payments" -msgstr "" - #. module: account_bank_statement_extensions #: view:cancel.statement.line:0 msgid "Are you sure you want to cancel the selected Bank Statement lines ?" @@ -288,11 +277,6 @@ msgstr "" msgid "Code" msgstr "" -#. module: account_bank_statement_extensions -#: constraint:account.bank.statement.line:0 -msgid "The amount of the voucher must be the same amount as the one on the statement line." -msgstr "" - #. module: account_bank_statement_extensions #: field:account.bank.statement.line,counterparty_name:0 msgid "Counterparty Name" @@ -308,11 +292,6 @@ msgstr "" msgid "Bank Accounts" msgstr "" -#. module: account_bank_statement_extensions -#: constraint:account.bank.statement:0 -msgid "The journal and period chosen have to belong to the same company." -msgstr "" - #. module: account_bank_statement_extensions #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement msgid "Bank Statement" diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot index 06c77f0d6d0..3bcac6f887f 100644 --- a/addons/account_budget/i18n/account_budget.pot +++ b/addons/account_budget/i18n/account_budget.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -137,11 +137,6 @@ msgstr "" msgid "Total :" msgstr "" -#. module: account_budget -#: constraint:account.analytic.account:0 -msgid "Error! You cannot create recursive analytic accounts." -msgstr "" - #. module: account_budget #: field:account.budget.post,company_id:0 #: field:crossovered.budget,company_id:0 diff --git a/addons/account_check_writing/i18n/account_check_writing.pot b/addons/account_check_writing/i18n/account_check_writing.pot index 34620122fc3..804f04a531b 100644 --- a/addons/account_check_writing/i18n/account_check_writing.pot +++ b/addons/account_check_writing/i18n/account_check_writing.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -40,11 +40,6 @@ msgstr "" msgid "Check on bottom" msgstr "" -#. module: account_check_writing -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - #. module: account_check_writing #: help:account.journal,allow_check_writing:0 msgid "Check this if the journal is to be used for writing checks." @@ -123,11 +118,6 @@ msgstr "" msgid "Print Check (Bottom)" msgstr "" -#. module: account_check_writing -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - #. module: account_check_writing #: report:account.print.check.bottom:0 #: report:account.print.check.middle:0 @@ -140,12 +130,6 @@ msgstr "" msgid "Print Check (Middle)" msgstr "" -#. module: account_check_writing -#: constraint:account.journal:0 -msgid "Configuration error!\n" -"The currency chosen should be shared by the default accounts too." -msgstr "" - #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_res_company msgid "Companies" @@ -174,16 +158,6 @@ msgstr "" msgid "Accounting Voucher" msgstr "" -#. module: account_check_writing -#: sql_constraint:account.journal:0 -msgid "The name of the journal must be unique per company !" -msgstr "" - -#. module: account_check_writing -#: sql_constraint:account.journal:0 -msgid "The code of the journal must be unique per company !" -msgstr "" - #. module: account_check_writing #: field:account.voucher,amount_in_word:0 msgid "Amount in Word" diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index 3ee8c92af3c..3a09707c4b3 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -43,8 +43,10 @@ class followup(osv.osv): class followup_line(osv.osv): def _get_default_template(self, cr, uid, ids, context=None): - dummy, templ = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_followup', 'email_template_account_followup_default') - return templ + try: + return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_followup', 'email_template_account_followup_default')[1] + except ValueError: + return False _name = 'account_followup.followup.line' _description = 'Follow-up Criteria' diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot index 5e4dfde3b30..69064e36e01 100644 --- a/addons/account_followup/i18n/account_followup.pot +++ b/addons/account_followup/i18n/account_followup.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -15,38 +15,126 @@ msgstr "" "Content-Transfer-Encoding: \n" "Plural-Forms: \n" +#. module: account_followup +#: view:account_followup.followup.line:0 +#: field:account_followup.followup.line,manual_action:0 +msgid "Manual Action" +msgstr "" + +#. module: account_followup +#: help:res.partner,latest_followup_level_id:0 +msgid "The maximum follow-up level" +msgstr "" + +#. module: account_followup +#: view:res.partner:0 +msgid "Group by" +msgstr "" + #. module: account_followup #: view:account_followup.stat:0 +#: view:res.partner:0 msgid "Group By..." msgstr "" #. module: account_followup -#: view:res.company:0 -#: field:res.company,follow_up_msg:0 -msgid "Follow-up Message" -msgstr "" - -#. module: account_followup -#: field:account.followup.print,followup_id:0 +#: field:account_followup.print,followup_id:0 msgid "Follow-Up" msgstr "" #. module: account_followup -#: model:account_followup.followup.line,description:account_followup.demo_followup_line2 +#: view:account_followup.followup.line:0 +msgid "%(date)s" +msgstr "" + +#. module: account_followup +#: field:res.partner,payment_next_action_date:0 +msgid "Next Action Date" +msgstr "" + +#. module: account_followup +#: field:account_followup.sending.results,needprinting:0 +msgid "Needs Printing" +msgstr "" + +#. module: account_followup +#: view:res.partner:0 +msgid "⇾ Mark as Done" +msgstr "" + +#. module: account_followup +#: field:account_followup.followup.line,manual_action_note:0 +msgid "Action To Do" +msgstr "" + +#. module: account_followup +#: model:email.template,body_html:account_followup.email_template_account_followup_level0 msgid "\n" -"Dear %(partner_name)s,\n" +"Dear ${object.name},
\n" +"\n" +" Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take\n" +"appropriate measures in order to carry out this payment in the next 8 days.\n" "\n" -"It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services).\n" -"Please, take appropriate measures in order to carry out this payment in the next 8 days.\n" -"\n" -"If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n" -"\n" -"Details of due payments is printed below.\n" +"Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to\n" +"contact our accounting department at (+32).10.68.94.39.\n" "\n" +"
\n" +"| Invoice date | \n" +"Reference | \n" +"Due date | \n" +"Amount (%s) | \n" +"Lit. | \n" +"\"\n" +" strend = \" | \"\n" +" date = aml['date_maturity'] or aml['date']\n" +" if date <= ctx['current_date'] and aml['balance'] > 0:\n" +" strbegin = \"\"\n" +" strend = \" | \"\n" +" followup_table +=\"
Dear ${object.name},
\n" +"\n" +" Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take\n" +"appropriate measures in order to carry out this payment in the next 8 days.\n" +"Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to\n" +"contact our accounting department at (+32).10.68.94.39.\n" +"
\n" +"| Invoice date | \n" +"Reference | \n" +"Due date | \n" +"Amount (%s) | \n" +"Lit. | \n" +"\"\n" +" strend = \" | \"\n" +" date = aml['date_maturity'] or aml['date']\n" +" if date <= ctx['current_date'] and aml['balance'] > 0:\n" +" strbegin = \"\"\n" +" strend = \" | \"\n" +" followup_table +=\"
Dear ${object.name},
\n" +"\n" +" We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.\n" +"It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account\n" +"which means that we will no longer be able to supply your company with (goods/services).\n" +"Please, take appropriate measures in order to carry out this payment in the next 8 days.\n" +"If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting\n" +"department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n" +"Details of due payments is printed below.\n" +"
\n" +"| Invoice date | \n" +"Reference | \n" +"Due date | \n" +"Amount (%s) | \n" +"Lit. | \n" +"\"\n" +" strend = \" | \"\n" +" date = aml['date_maturity'] or aml['date']\n" +" if date <= ctx['current_date'] and aml['balance'] > 0:\n" +" strbegin = \"\"\n" +" strend = \" | \"\n" +" followup_table +=\"
\n" -" Click to define follow-up levels and their related messages.\n" -"
\n" -" For each step, specify the message and the day of delay. Use\n" -" the legend to know the using code to adapt the email content to\n" -" the good context (good name, good date) and you can manage the\n" -" multi language of messages.\n" -"
\n" -" " +#: help:res.partner,payment_note:0 +msgid "Payment Note" +msgstr "" + +#. module: account_followup +#: view:res.partner:0 +msgid "My Follow-ups" +msgstr "" + +#. module: account_followup +#: view:account_followup.followup.line:0 +msgid "%(company_name)s" msgstr "" #. module: account_followup @@ -486,25 +905,46 @@ msgstr "" msgid "Last move" msgstr "" +#. module: account_followup +#: field:account_followup.followup.line,sequence:0 +msgid "Sequence" +msgstr "" + #. module: account_followup #: field:account_followup.stat,period_id:0 msgid "Period" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:300 +#: code:addons/account_followup/wizard/account_followup_print.py:231 #, python-format -msgid "Followup Summary" +msgid "%s partners have no credits and as such the action is cleared" msgstr "" #. module: account_followup -#: view:account.followup.print:0 -#: view:account.followup.print.all:0 +#: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report +msgid "Follow-up Report" +msgstr "" + +#. module: account_followup +#: view:res.partner:0 +msgid ", the latest payment follow-up\n" +" was:" +msgstr "" + +#. module: account_followup +#: view:account_followup.print:0 msgid "Cancel" msgstr "" +#. module: account_followup +#: view:account_followup.sending.results:0 +msgid "Close" +msgstr "" + #. module: account_followup #: view:account_followup.stat:0 +#: view:res.partner:0 msgid "Litigation" msgstr "" @@ -514,19 +954,35 @@ msgid "Max Follow Up Level" msgstr "" #. module: account_followup -#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all -msgid "Payable Items" +#: code:addons/account_followup/wizard/account_followup_print.py:171 +#, python-format +msgid " had unknown email address(es)" msgstr "" #. module: account_followup -#: view:account.followup.print.all:0 -msgid "%(followup_amount)s: Total Amount Due" +#: view:res.partner:0 +msgid "Responsible" +msgstr "" + +#. module: account_followup +#: model:ir.ui.menu,name:account_followup.menu_finance_followup +#: view:res.partner:0 +msgid "Payment Follow-up" msgstr "" #. module: account_followup -#: view:account.followup.print.all:0 #: view:account_followup.followup.line:0 -msgid "%(date)s: Current Date" +msgid ": Current Date" +msgstr "" + +#. module: account_followup +#: field:res.partner,payment_amount_due:0 +msgid "Total amount due" +msgstr "" + +#. module: account_followup +#: field:account_followup.followup.line,name:0 +msgid "Follow-Up Action" msgstr "" #. module: account_followup @@ -535,21 +991,52 @@ msgid "Including journal entries marked as a litigation" msgstr "" #. module: account_followup -#: field:account_followup.followup,description:0 #: report:account_followup.followup.print:0 +#: field:account_followup.sending.results,description:0 msgid "Description" msgstr "" +#. module: account_followup +#: model:email.template,subject:account_followup.email_template_account_followup_default +#: model:email.template,subject:account_followup.email_template_account_followup_level0 +#: model:email.template,subject:account_followup.email_template_account_followup_level1 +#: model:email.template,subject:account_followup.email_template_account_followup_level2 +msgid "${user.company_id.name} Payment Follow-up" +msgstr "" + +#. module: account_followup +#: view:account_followup.sending.results:0 +msgid "Summary of actions" +msgstr "" + #. module: account_followup #: report:account_followup.followup.print:0 msgid "Ref" msgstr "" +#. module: account_followup +#: view:account_followup.followup.line:0 +msgid "After" +msgstr "" + #. module: account_followup #: view:account_followup.stat:0 msgid "This Fiscal year" msgstr "" +#. module: account_followup +#: view:res.partner:0 +msgid "If not specified by the latest follow-up level, it will send from the default follow-up of overdue invoices template" +msgstr "" + +#. module: account_followup +#: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable +msgid "\n" +" No journal items found.\n" +"
\n" +" " +msgstr "" + #. module: account_followup #: view:account.move.line:0 msgid "Partner entries" @@ -561,31 +1048,44 @@ msgid "Follow-up lines" msgstr "" #. module: account_followup -#: help:account.followup.print.all,partner_lang:0 +#: field:account_followup.followup.line,manual_action_responsible_id:0 +msgid "Assign a Responsible" +msgstr "" + +#. module: account_followup +#: view:account_followup.print:0 +msgid "This action will send follow-up emails, print the letters and\n" +" set the manual actions per customers." +msgstr "" + +#. module: account_followup +#: help:account_followup.print,partner_lang:0 msgid "Do not change message text, if you want to send email in partner language, or configure from company" msgstr "" #. module: account_followup -#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all -msgid "Receivable Items" +#: view:account_followup.followup.line:0 +msgid "Write here the introduction in the letter,\n" +" according to the level of the follow-up. You can\n" +" use the following keywords in the text. Don't\n" +" forget to translate in all languages you installed\n" +" using to top right icon." msgstr "" #. module: account_followup #: view:account_followup.stat:0 #: model:ir.actions.act_window,name:account_followup.action_followup_stat -#: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow msgid "Follow-ups Sent" msgstr "" #. module: account_followup -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" +#: field:account_followup.followup,name:0 +msgid "Name" msgstr "" #. module: account_followup -#: field:account_followup.followup,name:0 -#: field:account_followup.followup.line,name:0 -msgid "Name" +#: field:res.partner,latest_followup_level_id:0 +msgid "Latest Follow-up Level" msgstr "" #. module: account_followup @@ -600,28 +1100,113 @@ msgid "Follow-up Statistics by Partner" msgstr "" #. module: account_followup -#: view:account.followup.print:0 -msgid "Continue" +#: code:addons/account_followup/wizard/account_followup_print.py:172 +#, python-format +msgid " letter(s) in report" msgstr "" #. module: account_followup -#: field:account_followup.followup.line,delay:0 -msgid "Days of delay" +#: view:res.partner:0 +msgid "Customer Followup" msgstr "" #. module: account_followup -#: view:account.followup.print.all:0 -#: field:account.followup.print.all,summary:0 -msgid "Summary" +#: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form +msgid "\n" +" Click to define follow-up levels and their related actions.\n" +"
\n" +" For each step, specify the actions to be taken and delay in days. It is\n" +" possible to use print and e-mail templates to send specific messages to\n" +" the customer.\n" +"
\n" +" " msgstr "" #. module: account_followup -#: report:account_followup.followup.print:0 -msgid "Document : Customer account statement" +#: model:email.template,body_html:account_followup.email_template_account_followup_level2 +msgid "\n" +"Dear ${object.name},
\n" +"\n" +" Despite several reminders, your account is still not settled.\n" +"Unless full payment is made in next 8 days, legal action for the recovery of the debt will be taken without\n" +"further notice.\n" +"I trust that this action will prove unnecessary and details of due payments is printed below.\n" +"In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.\n" +"
\n" +"| Invoice date | \n" +"Reference | \n" +"Due date | \n" +"Amount (%s) | \n" +"Lit. | \n" +"\"\n" +" strend = \" | \"\n" +" date = aml['date_maturity'] or aml['date']\n" +" if date <= ctx['current_date'] and aml['balance'] > 0:\n" +" strbegin = \"\"\n" +" strend = \" | \"\n" +" followup_table +=\"
\n" +" Click to create a new opportunity.\n" +"
\n" +" OpenERP helps you keep track of your sales pipeline to follow\n" +" up potential sales and better forecast your future revenues.\n" +"
\n" +" You will be able to plan meetings and phone calls from\n" +" opportunities, convert them into quotations, attach related\n" +" documents, track all discussions, and much more.\n" +"
\n" +" " msgstr "" #. module: crm @@ -1897,11 +1914,6 @@ msgstr "" msgid "Note" msgstr "" -#. module: crm -#: constraint:res.users:0 -msgid "The chosen company is not in the allowed companies for this user" -msgstr "" - #. module: crm #: selection:crm.lead,priority:0 #: selection:crm.lead.report,priority:0 @@ -2096,7 +2108,7 @@ msgid "Product" msgstr "" #. module: crm -#: code:addons/crm/crm_phonecall.py:282 +#: code:addons/crm/crm_phonecall.py:284 #, python-format msgid "Phonecall has been created and opened." msgstr "" @@ -2126,11 +2138,6 @@ msgstr "" msgid "Unassigned Opportunities" msgstr "" -#. module: crm -#: view:crm.lead.report:0 -msgid "# of Emails" -msgstr "" - #. module: crm #: view:crm.lead:0 msgid "Search Leads" @@ -2143,12 +2150,6 @@ msgstr "" msgid "Delay to open" msgstr "" -#. module: crm -#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread -#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread -msgid "Mark unread" -msgstr "" - #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound @@ -2262,8 +2263,8 @@ msgid "Company" msgstr "" #. module: crm -#: field:crm.segmentation.line,operator:0 -msgid "Mandatory / Optional" +#: view:base.action.rule:0 +msgid "Conditions on Communication History" msgstr "" #. module: crm @@ -2352,11 +2353,6 @@ msgstr "" msgid "Related Status" msgstr "" -#. module: crm -#: view:crm.lead.report:0 -msgid "# Mails" -msgstr "" - #. module: crm #: field:crm.phonecall,name:0 msgid "Call Summary" @@ -2367,11 +2363,6 @@ msgstr "" msgid "Operator" msgstr "" -#. module: crm -#: model:ir.model,name:crm.model_crm_phonecall2phonecall -msgid "Phonecall To Phonecall" -msgstr "" - #. module: crm #: view:crm.lead:0 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act @@ -2469,11 +2460,6 @@ msgstr "" msgid "Email Campaign - Products" msgstr "" -#. module: crm -#: model:ir.filters,name:crm.filter_usa_lead -msgid "Filter on leads which come from USA." -msgstr "" - #. module: crm #: field:base.action.rule,act_categ_id:0 msgid "Set Category to" @@ -2504,11 +2490,6 @@ msgstr "" msgid "Calls" msgstr "" -#. module: crm -#: sql_constraint:res.users:0 -msgid "OAuth UID must be unique per provider" -msgstr "" - #. module: crm #: field:crm.case.stage,on_change:0 msgid "Change Probability Automatically" @@ -2777,8 +2758,13 @@ msgid "Planned Revenues" msgstr "" #. module: crm -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: model:ir.actions.server,name:crm.actions_server_crm_lead_read +msgid "CRM Lead: Mark read" +msgstr "" + +#. module: crm +#: model:ir.model,name:crm.model_crm_phonecall2phonecall +msgid "Phonecall To Phonecall" msgstr "" #. module: crm @@ -2791,11 +2777,6 @@ msgstr "" msgid "Stage of case" msgstr "" -#. module: crm -#: sql_constraint:res.users:0 -msgid "You can not have two users with the same login !" -msgstr "" - #. module: crm #: selection:crm.opportunity2phonecall,action:0 #: selection:crm.phonecall2phonecall,action:0 @@ -2920,8 +2901,8 @@ msgid "New Opportunities" msgstr "" #. module: crm -#: field:crm.lead.report,email:0 -msgid "# Emails" +#: field:crm.segmentation.line,operator:0 +msgid "Mandatory / Optional" msgstr "" #. module: crm @@ -3026,17 +3007,6 @@ msgstr "" msgid "Phone calls by user and section" msgstr "" -#. module: crm -#: model:ir.actions.server,name:crm.actions_server_crm_lead_read -#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read -msgid "Mark read" -msgstr "" - -#. module: crm -#: view:base.action.rule:0 -msgid "Conditions on Communication History" -msgstr "" - #. module: crm #: code:addons/crm/crm_meeting.py:55 #, python-format @@ -3053,21 +3023,6 @@ msgstr "" msgid "Sequence" msgstr "" -#. module: crm -#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11 -msgid "\n" -" Click to create a new opportunity.\n" -"
\n" -" OpenERP helps you keep track of your sales pipeline to follow\n" -" up potential sales and better forecast your future revenues.\n" -"
\n" -" You will be able to plan meetings and phone calls from\n" -" opportunities, convert them into quotations, attach related\n" -" documents, track all discussions, and much more.\n" -"
\n" -" " -msgstr "" - #. module: crm #: field:crm.segmentation.line,expr_name:0 msgid "Control Variable" diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot index 857b665c2d0..d05188c17f0 100644 --- a/addons/crm_claim/i18n/crm_claim.pot +++ b/addons/crm_claim/i18n/crm_claim.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -196,8 +196,8 @@ msgid "Partner" msgstr "" #. module: crm_claim -#: view:crm.claim.report:0 -msgid "Month of claim" +#: view:crm.claim:0 +msgid "Follow Up" msgstr "" #. module: crm_claim @@ -768,11 +768,6 @@ msgstr "" msgid "# Emails" msgstr "" -#. module: crm_claim -#: field:crm.claim.report,create_date:0 -msgid "Create Date" -msgstr "" - #. module: crm_claim #: code:addons/crm_claim/crm_claim.py:253 #, python-format @@ -780,8 +775,8 @@ msgid "Stage changed to %s." msgstr "" #. module: crm_claim -#: view:crm.claim:0 -msgid "Follow Up" +#: view:crm.claim.report:0 +msgid "Month of claim" msgstr "" #. module: crm_claim @@ -825,11 +820,6 @@ msgstr "" msgid "Messages and communication history" msgstr "" -#. module: crm_claim -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." -msgstr "" - #. module: crm_claim #: field:sale.config.settings,fetchmail_claim:0 msgid "Create claims from incoming mails" @@ -858,8 +848,8 @@ msgid "Sales Team" msgstr "" #. module: crm_claim -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" +#: field:crm.claim.report,create_date:0 +msgid "Create Date" msgstr "" #. module: crm_claim diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot index 288da638731..6e84e520cb5 100644 --- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot +++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -769,11 +769,6 @@ msgstr "" msgid "Activation" msgstr "" -#. module: crm_partner_assign -#: field:crm.lead.report.assign,create_date:0 -msgid "Create Date" -msgstr "" - #. module: crm_partner_assign #: view:crm.lead:0 #: field:crm.lead,partner_assigned_id:0 @@ -871,11 +866,6 @@ msgstr "" msgid "Related Document Model" msgstr "" -#. module: crm_partner_assign -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." -msgstr "" - #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history_mode:0 msgid "Case Information" @@ -907,8 +897,8 @@ msgid "Initial thread message." msgstr "" #. module: crm_partner_assign -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" +#: field:crm.lead.report.assign,create_date:0 +msgid "Create Date" msgstr "" #. module: crm_partner_assign diff --git a/addons/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot index b5155d95963..ca625908eaf 100644 --- a/addons/crm_profiling/i18n/crm_profiling.pot +++ b/addons/crm_profiling/i18n/crm_profiling.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -138,21 +138,11 @@ msgstr "" msgid "Error ! You cannot create recursive profiles." msgstr "" -#. module: crm_profiling -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." -msgstr "" - #. module: crm_profiling #: field:crm.segmentation,answer_yes:0 msgid "Included Answers" msgstr "" -#. module: crm_profiling -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" -msgstr "" - #. module: crm_profiling #: view:crm_profiling.question:0 #: field:crm_profiling.questionnaire,questions_ids:0 diff --git a/addons/crm_todo/i18n/crm_todo.pot b/addons/crm_todo/i18n/crm_todo.pot index 7d68a136d3d..482530d2811 100644 --- a/addons/crm_todo/i18n/crm_todo.pot +++ b/addons/crm_todo/i18n/crm_todo.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -35,11 +35,6 @@ msgstr "" msgid "For cancelling the task" msgstr "" -#. module: crm_todo -#: constraint:project.task:0 -msgid "Error ! Task end-date must be greater then task start-date" -msgstr "" - #. module: crm_todo #: view:crm.lead:0 msgid "Next" @@ -62,11 +57,6 @@ msgstr "" msgid "Done" msgstr "" -#. module: crm_todo -#: constraint:project.task:0 -msgid "Error ! You cannot create recursive tasks." -msgstr "" - #. module: crm_todo #: view:crm.lead:0 msgid "Cancel" diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot index 7f4f05f71cf..7a63f822797 100644 --- a/addons/decimal_precision/i18n/decimal_precision.pot +++ b/addons/decimal_precision/i18n/decimal_precision.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,11 +20,6 @@ msgstr "" msgid "Digits" msgstr "" -#. module: decimal_precision -#: constraint:decimal.precision:0 -msgid "Error! You cannot define the decimal precision of 'Account' as greater than the rounding factor of the company's main currency" -msgstr "" - #. module: decimal_precision #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot index 1cb7398d7b9..7d32197f80e 100644 --- a/addons/delivery/i18n/delivery.pot +++ b/addons/delivery/i18n/delivery.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -255,11 +255,6 @@ msgstr "" msgid "Picking List" msgstr "" -#. module: delivery -#: field:delivery.carrier,grids_id:0 -msgid "Delivery Grids" -msgstr "" - #. module: delivery #: field:delivery.grid.line,name:0 msgid "Name" @@ -386,21 +381,11 @@ msgstr "" msgid "Condition" msgstr "" -#. module: delivery -#: constraint:stock.move:0 -msgid "You must assign a serial number for this product." -msgstr "" - #. module: delivery #: field:delivery.grid.line,standard_price:0 msgid "Cost Price" msgstr "" -#. module: delivery -#: constraint:stock.move:0 -msgid "You cannot move products from or to a location of the type view." -msgstr "" - #. module: delivery #: selection:delivery.grid.line,price_type:0 #: field:delivery.grid.line,type:0 @@ -412,13 +397,6 @@ msgstr "" msgid "This delivery method will be used when invoicing from picking." msgstr "" -#. module: delivery -#: sql_constraint:stock.picking:0 -#: sql_constraint:stock.picking.in:0 -#: sql_constraint:stock.picking.out:0 -msgid "Reference must be unique per Company!" -msgstr "" - #. module: delivery #: field:delivery.grid.line,max_value:0 msgid "Maximum Value" @@ -445,11 +423,6 @@ msgstr "" msgid "Free if more than %.2f" msgstr "" -#. module: delivery -#: sql_constraint:sale.order:0 -msgid "Order Reference must be unique per Company!" -msgstr "" - #. module: delivery #: model:ir.model,name:delivery.model_stock_picking_in msgid "Incoming Shipments" @@ -460,11 +433,6 @@ msgstr "" msgid "<=" msgstr "" -#. module: delivery -#: constraint:stock.move:0 -msgid "You try to assign a lot which is not from the same product." -msgstr "" - #. module: delivery #: report:sale.shipping:0 msgid "Description" @@ -549,8 +517,8 @@ msgid "The order state have to be draft to add delivery lines." msgstr "" #. module: delivery -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: field:delivery.carrier,grids_id:0 +msgid "Delivery Grids" msgstr "" #. module: delivery @@ -574,11 +542,6 @@ msgstr "" msgid "States" msgstr "" -#. module: delivery -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" -msgstr "" - #. module: delivery #: field:delivery.grid.line,price_type:0 msgid "Price Type" diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot index 2064b29db48..f9ed9590d0a 100644 --- a/addons/document_webdav/i18n/document_webdav.pot +++ b/addons/document_webdav/i18n/document_webdav.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -37,11 +37,6 @@ msgstr "" msgid "Search Document properties" msgstr "" -#. module: document_webdav -#: sql_constraint:document.directory:0 -msgid "Directory must have a parent or a storage." -msgstr "" - #. module: document_webdav #: view:document.webdav.dir.property:0 #: field:document.webdav.dir.property,namespace:0 @@ -93,21 +88,11 @@ msgstr "" msgid "Folders" msgstr "" -#. module: document_webdav -#: sql_constraint:document.directory:0 -msgid "Directory cannot be parent of itself!" -msgstr "" - #. module: document_webdav #: view:document.directory:0 msgid "WebDAV properties" msgstr "" -#. module: document_webdav -#: sql_constraint:document.directory:0 -msgid "The directory name must be unique !" -msgstr "" - #. module: document_webdav #: code:addons/document_webdav/webdav.py:37 #, python-format @@ -182,11 +167,6 @@ msgstr "" msgid "DAV Properties" msgstr "" -#. module: document_webdav -#: constraint:document.directory:0 -msgid "Error! You cannot create recursive directories." -msgstr "" - #. module: document_webdav #: field:document.webdav.dir.property,do_subst:0 #: field:document.webdav.file.property,do_subst:0 diff --git a/addons/edi/i18n/edi.pot b/addons/edi/i18n/edi.pot index eb4797d4962..ecea05980e8 100644 --- a/addons/edi/i18n/edi.pot +++ b/addons/edi/i18n/edi.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -29,16 +29,6 @@ msgstr "" msgid "The document has been successfully imported!" msgstr "" -#. module: edi -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: edi -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." -msgstr "" - #. module: edi #. openerp-web #: code:addons/edi/static/src/js/edi.js:65 @@ -46,26 +36,11 @@ msgstr "" msgid "Sorry, the document could not be imported." msgstr "" -#. module: edi -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - #. module: edi #: model:ir.model,name:edi.model_res_company msgid "Companies" msgstr "" -#. module: edi -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" -msgstr "" - -#. module: edi -#: sql_constraint:res.currency:0 -msgid "The currency code must be unique per company!" -msgstr "" - #. module: edi #: model:ir.model,name:edi.model_res_currency msgid "Currency" @@ -101,11 +76,6 @@ msgstr "" msgid "Partner" msgstr "" -#. module: edi -#: constraint:res.currency:0 -msgid "Error! You cannot define a rounding factor for the company's main currency that is smaller than the decimal precision of 'Account'." -msgstr "" - #. module: edi #: model:ir.model,name:edi.model_edi_edi msgid "EDI Subsystem" diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot index 863da188e95..4869430b905 100644 --- a/addons/email_template/i18n/email_template.pot +++ b/addons/email_template/i18n/email_template.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -85,8 +85,8 @@ msgid "Report Filename" msgstr "" #. module: email_template -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: view:email.template:0 +msgid "Preview" msgstr "" #. module: email_template @@ -112,11 +112,6 @@ msgstr "" msgid "%s (copy)" msgstr "" -#. module: email_template -#: view:email.template:0 -msgid "Preview" -msgstr "" - #. module: email_template #: help:email.template,user_signature:0 #: help:email_template.preview,user_signature:0 @@ -151,12 +146,6 @@ msgid "Name to use for the generated report file (may contain placeholders)\n" "The extension can be omitted and will then come from the report type." msgstr "" -#. module: email_template -#: code:addons/email_template/email_template.py:205 -#, python-format -msgid "Warning" -msgstr "" - #. module: email_template #: field:email.template,ref_ir_act_window:0 #: field:email_template.preview,ref_ir_act_window:0 @@ -424,8 +413,9 @@ msgid "When a relationship field is selected as first field, this field lets you msgstr "" #. module: email_template -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" +#: code:addons/email_template/email_template.py:205 +#, python-format +msgid "Warning" msgstr "" #. module: email_template diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot index 407eb6fd417..1931d5c570f 100644 --- a/addons/event/i18n/event.pot +++ b/addons/event/i18n/event.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -266,6 +266,11 @@ msgstr "" msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views." msgstr "" +#. module: event +#: selection:report.event.registration,month:0 +msgid "May" +msgstr "" + #. module: event #: view:report.event.registration:0 msgid "Registrations in confirmed or done state" @@ -292,8 +297,8 @@ msgid "Partner" msgstr "" #. module: event -#: help:event.type,default_registration_min:0 -msgid "It will select this default minimum value when you choose this event" +#: model:ir.actions.server,name:event.actions_server_event_event_read +msgid "Event: Mark read" msgstr "" #. module: event @@ -393,12 +398,6 @@ msgstr "" msgid "New registration confirmed: %s." msgstr "" -#. module: event -#: model:ir.actions.server,name:event.actions_server_event_event_read -#: model:ir.actions.server,name:event.actions_server_event_registration_read -msgid "Mark read" -msgstr "" - #. module: event #: view:event.event:0 msgid "Upcoming" @@ -479,6 +478,11 @@ msgstr "" msgid "State set to Done" msgstr "" +#. module: event +#: model:ir.actions.server,name:event.actions_server_event_registration_read +msgid "Event registration : Mark read" +msgstr "" + #. module: event #: model:ir.actions.act_window,name:event.act_event_reg #: view:report.event.registration:0 @@ -553,12 +557,6 @@ msgstr "" msgid "Finish Event" msgstr "" -#. module: event -#: model:ir.actions.server,name:event.actions_server_event_event_unread -#: model:ir.actions.server,name:event.actions_server_event_registration_unread -msgid "Mark unread" -msgstr "" - #. module: event #: view:event.registration:0 msgid "Registrations in unconfirmed state" @@ -792,8 +790,8 @@ msgid "October" msgstr "" #. module: event -#: selection:report.event.registration,month:0 -msgid "January" +#: model:ir.actions.server,name:event.actions_server_event_registration_unread +msgid "Event registration : Mark unread" msgstr "" #. module: event @@ -991,13 +989,13 @@ msgid "No ticket available." msgstr "" #. module: event -#: field:event.event,street:0 -msgid "Street" +#: help:event.type,default_registration_min:0 +msgid "It will select this default minimum value when you choose this event" msgstr "" #. module: event -#: view:event.event:0 -msgid "available." +#: selection:report.event.registration,month:0 +msgid "January" msgstr "" #. module: event @@ -1102,8 +1100,8 @@ msgid "Subscribe" msgstr "" #. module: event -#: constraint:res.partner:0 -msgid "Error ! You cannot create recursive associated members." +#: view:event.event:0 +msgid "available." msgstr "" #. module: event @@ -1138,8 +1136,8 @@ msgid "The email address of the organizer is likely to be put here, with the eff msgstr "" #. module: event -#: selection:report.event.registration,month:0 -msgid "May" +#: model:ir.actions.server,name:event.actions_server_event_event_unread +msgid "Event: Mark unread" msgstr "" #. module: event @@ -1148,8 +1146,8 @@ msgid "Manager" msgstr "" #. module: event -#: constraint:res.partner:0 -msgid "Error: Invalid ean code" +#: field:event.event,street:0 +msgid "Street" msgstr "" #. module: event diff --git a/addons/event_moodle/i18n/event_moodle.pot b/addons/event_moodle/i18n/event_moodle.pot index 29937ca0f94..e808ff3d8f1 100644 --- a/addons/event_moodle/i18n/event_moodle.pot +++ b/addons/event_moodle/i18n/event_moodle.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -147,11 +147,6 @@ msgstr "" msgid "Moodle Configuration" msgstr "" -#. module: event_moodle -#: constraint:event.event:0 -msgid "Error ! Closing Date cannot be set before Beginning Date." -msgstr "" - #. module: event_moodle #: view:event.moodle.config.wiz:0 msgid "or" diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot index 57793509a15..3201defaab3 100644 --- a/addons/event_sale/i18n/event_sale.pot +++ b/addons/event_sale/i18n/event_sale.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,8 +31,8 @@ msgid "Choose an event and it will automatically create a registration for this msgstr "" #. module: event_sale -#: sql_constraint:product.product:0 -msgid "Error ! Ending Date cannot be set before Beginning Date." +#: field:product.product,event_type_id:0 +msgid "Type of Event" msgstr "" #. module: event_sale @@ -46,8 +46,8 @@ msgid "Filter the list of event on this category only, in the sale order lines" msgstr "" #. module: event_sale -#: constraint:product.product:0 -msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead." +#: field:sale.order.line,event_ok:0 +msgid "event_ok" msgstr "" #. module: event_sale @@ -56,21 +56,11 @@ msgstr "" msgid "The registration %s has been created from the Sale Order %s." msgstr "" -#. module: event_sale -#: field:sale.order.line,event_ok:0 -msgid "event_ok" -msgstr "" - #. module: event_sale #: field:product.product,event_ok:0 msgid "Event Subscription" msgstr "" -#. module: event_sale -#: field:product.product,event_type_id:0 -msgid "Type of Event" -msgstr "" - #. module: event_sale #: field:sale.order.line,event_type_id:0 msgid "Event Type" diff --git a/addons/google_base_account/i18n/google_base_account.pot b/addons/google_base_account/i18n/google_base_account.pot index 5235940f7be..735c848bb20 100644 --- a/addons/google_base_account/i18n/google_base_account.pot +++ b/addons/google_base_account/i18n/google_base_account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -20,11 +20,6 @@ msgstr "" msgid "Username" msgstr "" -#. module: google_base_account -#: view:res.users:0 -msgid "Synchronization" -msgstr "" - #. module: google_base_account #: model:ir.actions.act_window,name:google_base_account.act_google_login_form msgid "Google Login" @@ -42,18 +37,8 @@ msgid "Users" msgstr "" #. module: google_base_account -#: constraint:res.users:0 -msgid "The chosen company is not in the allowed companies for this user" -msgstr "" - -#. module: google_base_account -#: sql_constraint:res.users:0 -msgid "You can not have two users with the same login !" -msgstr "" - -#. module: google_base_account -#: sql_constraint:res.users:0 -msgid "OAuth UID must be unique per provider" +#: view:google.login:0 +msgid "or" msgstr "" #. module: google_base_account @@ -66,11 +51,6 @@ msgstr "" msgid "Google Password" msgstr "" -#. module: google_base_account -#: view:google.login:0 -msgid "or" -msgstr "" - #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:77 #, python-format @@ -83,8 +63,8 @@ msgid "Google Account" msgstr "" #. module: google_base_account -#: constraint:res.users:0 -msgid "Error: Invalid ean code" +#: view:res.users:0 +msgid "Synchronization" msgstr "" #. module: google_base_account diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot index 85a32e7414a..e5caf54313a 100644 --- a/addons/hr/i18n/hr.pot +++ b/addons/hr/i18n/hr.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:51+0000\n" -"PO-Revision-Date: 2012-11-24 02:51+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -44,7 +44,6 @@ msgstr "" #: model:ir.actions.act_window,name:hr.open_board_hr #: model:ir.ui.menu,name:hr.menu_hr_dashboard #: model:ir.ui.menu,name:hr.menu_hr_main -#: model:ir.ui.menu,name:hr.menu_hr_management #: model:ir.ui.menu,name:hr.menu_hr_reporting #: model:ir.ui.menu,name:hr.menu_hr_root #: model:ir.ui.menu,name:hr.menu_human_resources_configuration @@ -155,8 +154,9 @@ msgid "Birth" msgstr "" #. module: hr -#: field:hr.employee,last_login:0 -msgid "Latest Connection" +#: model:ir.actions.act_window,name:hr.open_view_categ_form +#: model:ir.ui.menu,name:hr.menu_view_employee_category_form +msgid "Employee Tags" msgstr "" #. module: hr @@ -239,12 +239,6 @@ msgstr "" msgid "Female" msgstr "" -#. module: hr -#: model:ir.actions.act_window,name:hr.open_view_categ_form -#: model:ir.ui.menu,name:hr.menu_view_employee_category_form -msgid "Categories of Employees" -msgstr "" - #. module: hr #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config msgid "Attendance" @@ -345,6 +339,11 @@ msgstr "" msgid "Configuration" msgstr "" +#. module: hr +#: model:process.node,note:hr.process_node_employee0 +msgid "Employee form and structure" +msgstr "" + #. module: hr #: field:hr.config.settings,module_hr_expense:0 msgid "Manage employees expenses" @@ -370,11 +369,6 @@ msgstr "" msgid "Parent Category" msgstr "" -#. module: hr -#: sql_constraint:res.users:0 -msgid "OAuth UID must be unique per provider" -msgstr "" - #. module: hr #: view:hr.department:0 #: model:ir.actions.act_window,name:hr.open_module_tree_department @@ -490,11 +484,6 @@ msgstr "" msgid "Employees Structure" msgstr "" -#. module: hr -#: constraint:res.users:0 -msgid "The chosen company is not in the allowed companies for this user" -msgstr "" - #. module: hr #: view:hr.employee:0 msgid "Contact Information" @@ -614,11 +603,6 @@ msgstr "" msgid "Error! You cannot create recursive departments." msgstr "" -#. module: hr -#: sql_constraint:res.users:0 -msgid "You can not have two users with the same login !" -msgstr "" - #. module: hr #: field:hr.employee,address_id:0 msgid "Working Address" @@ -640,8 +624,8 @@ msgid "ir.actions.act_window" msgstr "" #. module: hr -#: model:process.node,note:hr.process_node_employee0 -msgid "Employee form and structure" +#: field:hr.employee,last_login:0 +msgid "Latest Connection" msgstr "" #. module: hr @@ -739,12 +723,6 @@ msgstr "" msgid "Manage timesheets" msgstr "" -#. module: hr -#: model:ir.actions.act_window,name:hr.open_view_categ_tree -#: model:ir.ui.menu,name:hr.menu_view_employee_category_tree -msgid "Categories Structure" -msgstr "" - #. module: hr #: model:ir.actions.act_window,name:hr.open_payroll_modules msgid "Payroll" @@ -940,11 +918,6 @@ msgstr "" msgid "Manager" msgstr "" -#. module: hr -#: constraint:res.users:0 -msgid "Error: Invalid ean code" -msgstr "" - #. module: hr #: selection:hr.employee,marital:0 msgid "Widower" diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot index 71c94b53c70..eb5b219ae7b 100644 --- a/addons/hr_attendance/i18n/hr_attendance.pot +++ b/addons/hr_attendance/i18n/hr_attendance.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:53+0000\n" -"PO-Revision-Date: 2012-11-24 02:53+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -439,11 +439,6 @@ msgstr "" msgid "Operation" msgstr "" -#. module: hr_attendance -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - #. module: hr_attendance #: report:report.hr.timesheet.attendance.error:0 msgid "(*) A negative delay means that the employee worked more than encoded." diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot index b9456094fd1..ae451c39539 100644 --- a/addons/hr_contract/i18n/hr_contract.pot +++ b/addons/hr_contract/i18n/hr_contract.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:53+0000\n" -"PO-Revision-Date: 2012-11-24 02:53+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -183,11 +183,6 @@ msgstr "" msgid "Start Date" msgstr "" -#. module: hr_contract -#: field:hr.contract,trial_date_end:0 -msgid "Trial End Date" -msgstr "" - #. module: hr_contract #: field:hr.contract,visa_no:0 msgid "Visa No" @@ -224,8 +219,8 @@ msgid "Medical Examination Date" msgstr "" #. module: hr_contract -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." +#: field:hr.contract,trial_date_end:0 +msgid "Trial End Date" msgstr "" #. module: hr_contract diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot index 282cd1e97eb..3cf9d4bd325 100644 --- a/addons/hr_evaluation/i18n/hr_evaluation.pot +++ b/addons/hr_evaluation/i18n/hr_evaluation.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -700,11 +700,6 @@ msgstr "" msgid "Cancel" msgstr "" -#. module: hr_evaluation -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - #. module: hr_evaluation #: view:hr.evaluation.report:0 msgid "In Progress" diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot index 68f9d03ae5d..0b8ec0973aa 100644 --- a/addons/hr_expense/i18n/hr_expense.pot +++ b/addons/hr_expense/i18n/hr_expense.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -48,11 +48,6 @@ msgstr "" msgid "Air Ticket" msgstr "" -#. module: hr_expense -#: model:ir.ui.menu,name:hr_expense.menu_hr_product -msgid "Type of Expenses" -msgstr "" - #. module: hr_expense #: report:hr.expense:0 msgid "Validated By" @@ -196,11 +191,6 @@ msgid "When the expense request is created the status is 'Draft'.\n" " If a receipt is made for the expense request, the status is 'Done'." msgstr "" -#. module: hr_expense -#: constraint:product.product:0 -msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead." -msgstr "" - #. module: hr_expense #: help:hr.expense.expense,date_confirm:0 msgid "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed." @@ -467,11 +457,6 @@ msgstr "" msgid "Waiting Approval" msgstr "" -#. module: hr_expense -#: field:hr.expense.expense,amount:0 -msgid "Total Amount" -msgstr "" - #. module: hr_expense #: model:process.node,note:hr_expense.process_node_draftexpenses0 msgid "Employee encode all his expenses" @@ -525,8 +510,8 @@ msgid "The direct manager approves the sheet" msgstr "" #. module: hr_expense -#: sql_constraint:product.product:0 -msgid "Error ! Ending Date cannot be set before Beginning Date." +#: field:hr.expense.expense,amount:0 +msgid "Total Amount" msgstr "" #. module: hr_expense @@ -862,6 +847,11 @@ msgstr "" msgid "Sequence" msgstr "" +#. module: hr_expense +#: model:ir.ui.menu,name:hr_expense.menu_hr_product +msgid "Types of Expenses" +msgstr "" + #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_confirmexpense0 msgid "Expense is confirmed." diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot index 3313b2dff89..8527e572a14 100644 --- a/addons/hr_holidays/i18n/hr_holidays.pot +++ b/addons/hr_holidays/i18n/hr_holidays.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -67,23 +67,12 @@ msgstr "" msgid "Department" msgstr "" -#. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays -msgid "Requests Approve" -msgstr "" - #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.request_approve_allocation #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_allocation msgid "Allocation Requests to Approve" msgstr "" -#. module: hr_holidays -#: selection:hr.employee,current_leave_state:0 -#: selection:hr.holidays,state:0 -msgid "Refused" -msgstr "" - #. module: hr_holidays #: help:hr.holidays,category_id:0 msgid "Category of Employee" @@ -99,19 +88,29 @@ msgstr "" msgid "Remaining Days" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "of the" +msgstr "" + #. module: hr_holidays #: selection:hr.holidays,holiday_type:0 msgid "By Employee" msgstr "" #. module: hr_holidays -#: help:hr.holidays,employee_id:0 -msgid "Leave Manager can let this field empty if this leave request/allocation is for every employee" +#: view:hr.holidays:0 +msgid "The default duration interval between the start date and the end date is 8 hours. Feel free to adapt it to your needs." msgstr "" #. module: hr_holidays -#: view:hr.holidays:0 -msgid "The default duration interval between the start date and the end date is 8 hours. Feel free to adapt it to your needs." +#: field:hr.holidays,number_of_days_temp:0 +msgid "Allocation" +msgstr "" + +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "to" msgstr "" #. module: hr_holidays @@ -182,8 +181,8 @@ msgid "Messages" msgstr "" #. module: hr_holidays -#: model:ir.model,name:hr_holidays.model_hr_holidays -msgid "Leave" +#: xsl:holidays.summary:0 +msgid "Analyze from" msgstr "" #. module: hr_holidays @@ -204,6 +203,18 @@ msgstr "" msgid "Leaves by Department" msgstr "" +#. module: hr_holidays +#: field:hr.holidays,manager_id2:0 +#: selection:hr.holidays,state:0 +msgid "Second Approval" +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/hr_holidays.py:448 +#, python-format +msgid "The request has been approved." +msgstr "" + #. module: hr_holidays #: selection:hr.employee,current_leave_state:0 #: selection:hr.holidays,state:0 @@ -216,11 +227,6 @@ msgid "Choose 'Leave Request' if someone wants to take an off-day. \n" "Choose 'Allocation Request' if you want to increase the number of leaves available for someone" msgstr "" -#. module: hr_holidays -#: help:hr.employee,remaining_leaves:0 -msgid "Total number of legal leaves allocated to this employee, change this value to create allocation/leave requests." -msgstr "" - #. module: hr_holidays #: view:hr.holidays.status:0 msgid "Validation" @@ -242,13 +248,13 @@ msgid "This area is automatically filled by the user who validate the leave" msgstr "" #. module: hr_holidays +#: xsl:holidays.summary:0 #: field:hr.holidays,holiday_status_id:0 #: field:hr.holidays.remaining.leaves.user,leave_type:0 #: view:hr.holidays.status:0 #: field:hr.holidays.status,name:0 #: field:hr.holidays.summary.dept,holiday_type:0 #: model:ir.model,name:hr_holidays.model_hr_holidays_status -#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status msgid "Leave Type" msgstr "" @@ -306,6 +312,11 @@ msgstr "" msgid "Leave Request for %s" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "Sum" +msgstr "" + #. module: hr_holidays #: view:hr.holidays.status:0 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status @@ -317,11 +328,6 @@ msgstr "" msgid "Remaining Leaves" msgstr "" -#. module: hr_holidays -#: selection:hr.holidays.status,color_name:0 -msgid "Wheat" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,message_follower_ids:0 msgid "Followers" @@ -361,19 +367,14 @@ msgstr "" msgid "Leaves by Type" msgstr "" +#. module: hr_holidays +#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread +msgid "Holidays: Mark unread" +msgstr "" + #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 -msgid "Light Salmon" -msgstr "" - -#. module: hr_holidays -#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read -msgid "Mark read" -msgstr "" - -#. module: hr_holidays -#: constraint:resource.calendar.leaves:0 -msgid "Error! leave start-date must be lower then leave end-date." +msgid "Wheat" msgstr "" #. module: hr_holidays @@ -382,12 +383,6 @@ msgstr "" msgid "Allocation for %s" 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 -msgid "My Leave Requests" -msgstr "" - #. module: hr_holidays #: help:hr.holidays,state:0 msgid "The status is set to 'To Submit', when a holiday request is created. \n" @@ -399,7 +394,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 #: field:hr.holidays,number_of_days:0 -#: field:hr.holidays,number_of_days_temp:0 msgid "Number of Days" msgstr "" @@ -416,9 +410,8 @@ msgid "Search Leave Type" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:448 -#, python-format -msgid "The request has been approved." +#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read +msgid "Holidays: Mark read" msgstr "" #. module: hr_holidays @@ -427,9 +420,13 @@ msgid "Waiting Approval" msgstr "" #. module: hr_holidays -#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays -#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays -msgid "My Allocation Requests" +#: field:hr.holidays,category_id:0 +msgid "Employee Tag" +msgstr "" + +#. module: hr_holidays +#: field:hr.holidays.status,max_leaves:0 +msgid "Maximum Allowed" msgstr "" #. module: hr_holidays @@ -456,11 +453,6 @@ msgstr "" msgid "Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar." msgstr "" -#. module: hr_holidays -#: view:hr.holidays:0 -msgid "Validated" -msgstr "" - #. module: hr_holidays #: field:hr.holidays,parent_id:0 msgid "Parent" @@ -471,6 +463,11 @@ msgstr "" msgid "Lavender" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "Month" +msgstr "" + #. module: hr_holidays #: field:hr.holidays,message_unread:0 msgid "Unread Messages" @@ -478,6 +475,8 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 +#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays +#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new msgid "Leave Requests" msgstr "" @@ -524,7 +523,6 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 -#: field:hr.holidays,category_id:0 msgid "Category" msgstr "" @@ -533,6 +531,11 @@ msgstr "" msgid "This value is given by the sum of all holidays requests with a positive value." msgstr "" +#. module: hr_holidays +#: help:hr.holidays.status,limit:0 +msgid "If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the \"Remaining Legal Leaves\" defined on the employee form." +msgstr "" + #. module: hr_holidays #: view:hr.holidays:0 msgid "Reset to New" @@ -563,6 +566,11 @@ msgstr "" msgid "Allocate Leaves for Employees" msgstr "" +#. module: hr_holidays +#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status +msgid "Leaves Types" +msgstr "" + #. module: hr_holidays #: field:hr.holidays,meeting_id:0 msgid "Meeting" @@ -589,6 +597,11 @@ msgstr "" msgid "HR Leaves Summary Report By Employee" msgstr "" +#. module: hr_holidays +#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays +msgid "Requests to Approve" +msgstr "" + #. module: hr_holidays #: field:hr.holidays.status,leaves_taken:0 msgid "Leaves Already Taken" @@ -638,6 +651,7 @@ msgid "Unpaid" msgstr "" #. module: hr_holidays +#: xsl:holidays.summary:0 #: view:hr.holidays:0 #: view:hr.holidays.summary.employee:0 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee @@ -699,8 +713,8 @@ msgid "Compensatory Days" msgstr "" #. module: hr_holidays -#: field:hr.holidays,notes:0 -msgid "Reasons" +#: selection:hr.holidays.status,color_name:0 +msgid "Light Yellow" msgstr "" #. module: hr_holidays @@ -716,8 +730,8 @@ msgid "Cancel" msgstr "" #. module: hr_holidays -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." +#: view:hr.holidays:0 +msgid "Validated" msgstr "" #. module: hr_holidays @@ -732,6 +746,11 @@ msgstr "" msgid "Allocation Request" msgstr "" +#. module: hr_holidays +#: help:hr.holidays,holiday_type:0 +msgid "By Employee: Allocation/Request for individual Employee, By Employee Tag: Allocation/Request for group of employees in category" +msgstr "" + #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves msgid "Leave Detail" @@ -744,6 +763,7 @@ msgid "Apply Double Validation" msgstr "" #. module: hr_holidays +#: view:hr.employee:0 #: view:hr.holidays:0 msgid "days" msgstr "" @@ -759,11 +779,6 @@ msgstr "" msgid "Details" msgstr "" -#. module: hr_holidays -#: help:hr.holidays.status,limit:0 -msgid "If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type." -msgstr "" - #. module: hr_holidays #: view:board.board:0 #: view:hr.holidays:0 @@ -772,8 +787,8 @@ msgid "My Leaves" 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 @@ -796,14 +811,14 @@ msgid "Description" msgstr "" #. module: hr_holidays -#: code:addons/hr_holidays/hr_holidays.py:453 -#, python-format -msgid "Request refused" +#: selection:hr.holidays,holiday_type:0 +msgid "By Employee Tag" 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" +#: selection:hr.employee,current_leave_state:0 +#: selection:hr.holidays,state:0 +msgid "Refused" msgstr "" #. module: hr_holidays @@ -817,14 +832,8 @@ msgid "Remaining leaves" msgstr "" #. module: hr_holidays -#: field:hr.holidays.summary.dept,depts:0 -msgid "Department(s)" -msgstr "" - -#. module: hr_holidays -#: field:hr.holidays,manager_id2:0 -#: selection:hr.holidays,state:0 -msgid "Second Approval" +#: view:hr.holidays:0 +msgid "Allocated Days" msgstr "" #. module: hr_holidays @@ -848,8 +857,8 @@ msgid "Violet" msgstr "" #. module: hr_holidays -#: field:hr.holidays.status,max_leaves:0 -msgid "Maximum Allowed" +#: selection:hr.holidays.status,color_name:0 +msgid "Light Salmon" msgstr "" #. module: hr_holidays @@ -857,11 +866,6 @@ msgstr "" 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 -#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread -msgid "Mark unread" -msgstr "" - #. module: hr_holidays #: view:hr.holidays:0 msgid "Mode" @@ -891,6 +895,17 @@ msgstr "" msgid "The start date must be anterior to the end date." msgstr "" +#. module: hr_holidays +#: model:ir.model,name:hr_holidays.model_hr_holidays +msgid "Leave" +msgstr "" + +#. module: hr_holidays +#: code:addons/hr_holidays/hr_holidays.py:453 +#, python-format +msgid "Request refused" +msgstr "" + #. module: hr_holidays #: help:hr.holidays.status,double_validation:0 msgid "When selected, the Allocation/Leave Requests for this type require a second validation to be approved." @@ -898,12 +913,19 @@ msgstr "" #. module: hr_holidays #: view:hr.holidays:0 +#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays +#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays msgid "Allocation Requests" msgstr "" #. module: hr_holidays -#: selection:hr.holidays.status,color_name:0 -msgid "Light Yellow" +#: xsl:holidays.summary:0 +msgid "Color" +msgstr "" + +#. module: hr_holidays +#: help:hr.employee,remaining_leaves:0 +msgid "Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit." msgstr "" #. module: hr_holidays @@ -911,6 +933,11 @@ msgstr "" msgid "Light Pink" msgstr "" +#. module: hr_holidays +#: xsl:holidays.summary:0 +msgid "leaves." +msgstr "" + #. module: hr_holidays #: view:hr.holidays:0 msgid "Manager" @@ -943,6 +970,11 @@ msgstr "" msgid "You have to select at least one Department. And try again." msgstr "" +#. module: hr_holidays +#: field:hr.holidays,notes:0 +msgid "Reasons" +msgstr "" + #. module: hr_holidays #: field:hr.holidays.summary.employee,holiday_type:0 msgid "Select Leave Type" diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot index 151b446c203..beedbbd733b 100644 --- a/addons/hr_payroll/i18n/hr_payroll.pot +++ b/addons/hr_payroll/i18n/hr_payroll.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -574,11 +574,6 @@ msgstr "" msgid "Sum of all current contract's wage of employee." msgstr "" -#. module: hr_payroll -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - #. module: hr_payroll #: view:hr.payslip:0 msgid "Payslip" @@ -939,11 +934,6 @@ msgstr "" msgid "Defines the rules that have to be applied to this payslip, accordingly to the contract chosen. If you let empty the field contract, this field isn't mandatory anymore and thus the rules applied will be all the rules set on the structure of all contracts of the employee valid for the chosen period" msgstr "" -#. module: hr_payroll -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - #. module: hr_payroll #: field:hr.payroll.structure,children_ids:0 #: field:hr.salary.rule.category,children_ids:0 diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot index 680e9f004cb..81ac3ea6177 100644 --- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot +++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:53+0000\n" -"PO-Revision-Date: 2012-11-24 02:53+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -43,11 +43,6 @@ msgstr "" msgid "The Expense Journal \"%s\" has not properly configured the Debit Account!" msgstr "" -#. module: hr_payroll_account -#: constraint:hr.payslip:0 -msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" - #. module: hr_payroll_account #: field:hr.salary.rule,account_tax_id:0 msgid "Tax Code" @@ -96,11 +91,6 @@ msgstr "" msgid "Configuration Error!" msgstr "" -#. module: hr_payroll_account -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - #. module: hr_payroll_account #: model:ir.model,name:hr_payroll_account.model_hr_salary_rule msgid "hr.salary.rule" diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot index f715f438d3c..64352dfa03d 100644 --- a/addons/hr_recruitment/i18n/hr_recruitment.pot +++ b/addons/hr_recruitment/i18n/hr_recruitment.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-24 02:52+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -335,9 +335,8 @@ msgid "Job Description" msgstr "" #. module: hr_recruitment -#: view:hr.applicant:0 -#: field:hr.applicant,source_id:0 -msgid "Source" +#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read +msgid "HR Applicant: Mark read" msgstr "" #. module: hr_recruitment @@ -393,11 +392,6 @@ msgstr "" msgid "Good" msgstr "" -#. module: hr_recruitment -#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read -msgid "Mark read" -msgstr "" - #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.applicant,create_date:0 @@ -411,6 +405,11 @@ msgstr "" msgid "Create Employee" msgstr "" +#. module: hr_recruitment +#: field:hr.applicant,partner_phone:0 +msgid "Phone" +msgstr "" + #. module: hr_recruitment #: view:hr.applicant:0 #: field:hr.applicant,priority:0 @@ -735,8 +734,8 @@ msgid "Degree" msgstr "" #. module: hr_recruitment -#: field:hr.applicant,partner_phone:0 -msgid "Phone" +#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread +msgid "HR Applicant: Mark unread" msgstr "" #. module: hr_recruitment @@ -892,6 +891,12 @@ msgstr "" msgid "Applicant has been hired and created as an employee." msgstr "" +#. module: hr_recruitment +#: view:hr.applicant:0 +#: field:hr.applicant,source_id:0 +msgid "Source" +msgstr "" + #. module: hr_recruitment #: model:hr.recruitment.stage,name:hr_recruitment.stage_job4 msgid "Contract Proposed" @@ -1154,11 +1159,6 @@ msgstr "" msgid "April" msgstr "" -#. module: hr_recruitment -#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread -msgid "Mark unread" -msgstr "" - #. module: hr_recruitment #: view:hr.recruitment.report:0 msgid "Pending recruitment" @@ -1189,11 +1189,6 @@ msgstr "" msgid "In progress recruitment" msgstr "" -#. module: hr_recruitment -#: sql_constraint:hr.job:0 -msgid "The name of the job position must be unique per company!" -msgstr "" - #. module: hr_recruitment #: field:hr.recruitment.degree,sequence:0 #: field:hr.recruitment.stage,sequence:0 diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot index a27336abf99..e02c9397c16 100644 --- a/addons/hr_timesheet/i18n/hr_timesheet.pot +++ b/addons/hr_timesheet/i18n/hr_timesheet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:51+0000\n" -"PO-Revision-Date: 2012-11-24 02:51+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -122,8 +122,8 @@ msgid "Minimum Analytic Amount" msgstr "" #. module: hr_timesheet -#: view:hr.analytic.timesheet:0 -msgid "Total time" +#: view:hr.analytical.timesheet.employee:0 +msgid "Monthly Employee Timesheet" msgstr "" #. module: hr_timesheet @@ -204,6 +204,11 @@ msgstr "" msgid "Sun" msgstr "" +#. module: hr_timesheet +#: xsl:hr.analytical.timesheet:0 +msgid "Sum" +msgstr "" + #. module: hr_timesheet #: view:hr.analytic.timesheet:0 msgid "Analytic account" @@ -233,11 +238,6 @@ msgstr "" msgid "Check this field if this project manages timesheets" msgstr "" -#. module: hr_timesheet -#: constraint:account.analytic.account:0 -msgid "Error! You cannot create recursive analytic accounts." -msgstr "" - #. module: hr_timesheet #: view:hr.analytical.timesheet.users:0 msgid "Monthly Employees Timesheet" @@ -330,6 +330,11 @@ msgstr "" msgid "or" msgstr "" +#. module: hr_timesheet +#: xsl:hr.analytical.timesheet:0 +msgid "Timesheet by Employee" +msgstr "" + #. module: hr_timesheet #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet msgid "Employee timesheet" @@ -357,6 +362,7 @@ msgid "(Keep empty for current time)" msgstr "" #. module: hr_timesheet +#: field:account.analytic.account,use_timesheets:0 #: view:hr.employee:0 msgid "Timesheets" msgstr "" @@ -482,11 +488,7 @@ msgid "Cancel" msgstr "" #. module: hr_timesheet -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - -#. module: hr_timesheet +#: xsl:hr.analytical.timesheet_users:0 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users #: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users @@ -541,8 +543,8 @@ msgid "May" msgstr "" #. module: hr_timesheet -#: view:hr.analytical.timesheet.employee:0 -msgid "Monthly Employee Timesheet" +#: view:hr.analytic.timesheet:0 +msgid "Total time" msgstr "" #. module: hr_timesheet @@ -580,11 +582,6 @@ msgstr "" msgid "Employees" msgstr "" -#. module: hr_timesheet -#: constraint:hr.analytic.timesheet:0 -msgid "You cannot modify an entry in a Confirmed/Done timesheet !" -msgstr "" - #. module: hr_timesheet #: code:addons/hr_timesheet/report/user_timesheet.py:41 #: code:addons/hr_timesheet/report/users_timesheet.py:73 @@ -610,11 +607,6 @@ msgstr "" msgid "User Error!" msgstr "" -#. module: hr_timesheet -#: field:account.analytic.account,use_timesheets:0 -msgid "Use Timesheets" -msgstr "" - #. module: hr_timesheet #: view:hr.sign.in.project:0 msgid "Start Working" @@ -636,6 +628,12 @@ msgstr "" msgid "Accounting" msgstr "" +#. module: hr_timesheet +#: xsl:hr.analytical.timesheet:0 +#: xsl:hr.analytical.timesheet_users:0 +msgid "Total" +msgstr "" + #. module: hr_timesheet #: view:hr.sign.out.project:0 msgid "Change Work" diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot index 1ae94bda081..152442f66f3 100644 --- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot +++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:53+0000\n" -"PO-Revision-Date: 2012-11-24 02:53+0000\n" +"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-03 16:03+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -92,11 +92,6 @@ msgstr "" msgid "March" msgstr "" -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all -msgid "Timesheet by User" -msgstr "" - #. module: hr_timesheet_invoice #: help:account.analytic.account,to_invoice:0 msgid "You usually invoice 100% of the timesheets. But if you mix fixed price and timesheet invoicing, you may use another ratio. For instance, if you do a 20% advance invoice (fixed price, based on a sale order), you should invoice the rest on timesheet with a 80% ratio." @@ -108,7 +103,7 @@ msgid "Profit" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165 #, python-format msgid "You cannot modify an invoiced analytic line!" msgstr "" @@ -169,25 +164,21 @@ msgid "Invoiced Amount" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:73 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209 #, python-format msgid "Analytic Account incomplete !" msgstr "" -#. module: hr_timesheet_invoice -#: sql_constraint:account.invoice:0 -msgid "Invoice Number must be unique per Company!" -msgstr "" - #. module: hr_timesheet_invoice #: field:report_timesheet.invoice,account_id:0 msgid "Project" msgstr "" #. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree -#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree -msgid "Invoice Tasks Work" +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254 +#, python-format +msgid "Error!" msgstr "" #. module: hr_timesheet_invoice @@ -195,18 +186,13 @@ msgstr "" msgid "Amount" msgstr "" -#. module: hr_timesheet_invoice -#: sql_constraint:account.move.line:0 -msgid "Wrong credit or debit value in accounting entry !" -msgstr "" - #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create,name:0 msgid "The detail of each work done will be displayed on the invoice" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:115 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:116 #, python-format msgid "Contract has been set as pending." msgstr "" @@ -231,11 +217,6 @@ msgstr "" msgid "Analytic account to close" msgstr "" -#. module: hr_timesheet_invoice -#: constraint:account.invoice:0 -msgid "Invalid BBA Structured Communication !" -msgstr "" - #. module: hr_timesheet_invoice #: view:hr.timesheet.invoice.create:0 msgid "Create Invoices" @@ -261,7 +242,7 @@ msgid "Deadline" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:133 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267 #, python-format msgid "Configuration Error!" msgstr "" @@ -298,7 +279,7 @@ msgid "Costs to invoice" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:133 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267 #, python-format msgid "Please define income account for product '%s'." msgstr "" @@ -330,22 +311,19 @@ msgid "Force to use a special product" msgstr "" #. module: hr_timesheet_invoice -#: constraint:account.move.line:0 -msgid "The date of your Journal Entry is not in the defined period! You should change the date or remove this constraint from the journal." +#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_user_stat_all +msgid "Timesheet by User" msgstr "" #. module: hr_timesheet_invoice -#: constraint:account.analytic.account:0 -msgid "Error! You cannot create recursive analytic accounts." +#: view:account.analytic.line:0 +#: view:hr.analytic.timesheet:0 +#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice +msgid "To Invoice" msgstr "" #. module: hr_timesheet_invoice -#: constraint:account.move.line:0 -msgid "You cannot create journal items on an account of type view." -msgstr "" - -#. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:97 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98 #, python-format msgid "Contract has been closed." msgstr "" @@ -383,7 +361,7 @@ msgid "Invoiceable" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:213 +#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56 #, python-format msgid "Warning!" msgstr "" @@ -409,11 +387,6 @@ msgstr "" msgid "Analytic lines to invoice report" msgstr "" -#. module: hr_timesheet_invoice -#: constraint:account.move.line:0 -msgid "Account and Period must belong to the same company." -msgstr "" - #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_timesheet_invoice_stat_all msgid "Timesheet by Invoice" @@ -442,7 +415,7 @@ msgstr "" #. module: hr_timesheet_invoice #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:58 -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:224 +#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:68 #, python-format msgid "Invoices" msgstr "" @@ -461,11 +434,6 @@ msgstr "" msgid "Invoice contract" msgstr "" -#. module: hr_timesheet_invoice -#: constraint:account.move.line:0 -msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account or select a multi-currency view on the journal." -msgstr "" - #. module: hr_timesheet_invoice #: field:report.account.analytic.line.to.invoice,month:0 #: view:report.timesheet.line:0 @@ -486,23 +454,11 @@ msgstr "" msgid "Users" msgstr "" -#. module: hr_timesheet_invoice -#: constraint:account.analytic.line:0 -msgid "You cannot create analytic line on view account." -msgstr "" - #. module: hr_timesheet_invoice #: view:report.timesheet.line:0 msgid "Non Assigned timesheets to users" msgstr "" -#. module: hr_timesheet_invoice -#: view:account.analytic.line:0 -#: view:hr.analytic.timesheet:0 -#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice -msgid "To Invoice" -msgstr "" - #. module: hr_timesheet_invoice #: view:account.analytic.line:0 #: view:hr.analytic.timesheet:0 @@ -569,18 +525,6 @@ msgstr "" msgid "June" msgstr "" -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,help:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree -msgid "\n" -" Click to add some tasks work to be invoiced.\n" -"
\n" -" This list shows every task you can invoice to the customer.\n" -" Select the lines and invoice from the 'more...' contextual\n" -" menu to generate invoices automatically.\n" -"
\n" -" " -msgstr "" - #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create.final,name:0 msgid "Display detail of work in the invoice line." @@ -602,12 +546,6 @@ msgstr "" msgid "Journal Items" msgstr "" -#. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120 -#, python-format -msgid "There is no product defined for the line %s. Please select one or force the product through the wizard." -msgstr "" - #. module: hr_timesheet_invoice #: selection:report.account.analytic.line.to.invoice,month:0 #: selection:report.timesheet.line,month:0 @@ -718,19 +656,6 @@ msgstr "" msgid "canceled" msgstr "" -#. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:74 -#, python-format -msgid "Please fill in the Partner or Customer and Sale Pricelist fields in the Analytic Account:\n" -"%s." -msgstr "" - -#. module: hr_timesheet_invoice -#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice -#: view:report.account.analytic.line.to.invoice:0 -msgid "Analytic Lines to Invoice" -msgstr "" - #. module: hr_timesheet_invoice #: help:account.analytic.line,to_invoice:0 msgid "It allows to set the discount while making invoice, keep empty if the activities should not be invoiced." @@ -782,11 +707,6 @@ msgstr "" msgid "Billing Data" msgstr "" -#. module: hr_timesheet_invoice -#: constraint:account.move.line:0 -msgid "You cannot create journal items on closed account." -msgstr "" - #. module: hr_timesheet_invoice #: help:hr_timesheet_invoice.factor,customer_name:0 msgid "Label for the customer" @@ -831,11 +751,17 @@ msgid "Timesheets to invoice" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:103 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104 #, python-format msgid "Contract has been canceled." msgstr "" +#. module: hr_timesheet_invoice +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210 +#, python-format +msgid "Contract incomplete. Please fill in the Customer and Pricelist fields." +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" @@ -879,7 +805,7 @@ msgid "The product that will be used to invoice the remaining amount" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:109 +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:110 #, python-format msgid "Contract has been opened." msgstr "" @@ -943,11 +869,6 @@ msgstr "" msgid "Print Timesheet Profit" msgstr "" -#. module: hr_timesheet_invoice -#: constraint:hr.analytic.timesheet:0 -msgid "You cannot modify an entry in a Confirmed/Done timesheet !" -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" @@ -962,13 +883,19 @@ msgstr "" msgid "April" msgstr "" +#. module: hr_timesheet_invoice +#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254 +#, python-format +msgid "There is no product defined. Please select one or force the product through the wizard." +msgstr "" + #. module: hr_timesheet_invoice #: help:hr_timesheet_invoice.factor,factor:0 msgid "Discount in percentage" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:213 +#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:56 #, python-format msgid "Invoice is already linked to some of the analytic line(s)!" msgstr "" @@ -985,10 +912,9 @@ msgid "Units" msgstr "" #. module: hr_timesheet_invoice -#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:163 -#: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:120 -#, python-format -msgid "Error!" +#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice +#: view:report.account.analytic.line.to.invoice:0 +msgid "Analytic Lines to Invoice" msgstr "" #. module: hr_timesheet_invoice diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot index ccd03894135..5e6eb17431b 100644 --- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot +++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-24 02:51+0000\n" -"PO-Revision-Date: 2012-11-24 02:51+0000\n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-03 16:02+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -24,8 +24,8 @@ msgid "Sheet" msgstr "" #. module: hr_timesheet_sheet -#: constraint:hr.attendance:0 -msgid "Error ! Sign in (resp. Sign out) must follow Sign out (resp. Sign in)" +#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0 +msgid "Service" msgstr "" #. module: hr_timesheet_sheet @@ -78,11 +78,6 @@ msgstr "" msgid "March" msgstr "" -#. module: hr_timesheet_sheet -#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0 -msgid "Service" -msgstr "" - #. module: hr_timesheet_sheet #: view:timesheet.report:0 #: field:timesheet.report,cost:0 @@ -348,11 +343,6 @@ msgstr "" msgid "Timesheet lines" msgstr "" -#. module: hr_timesheet_sheet -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,message_follower_ids:0 msgid "Followers" @@ -544,21 +534,8 @@ msgid "You will be able to register your working hours and\n" msgstr "" #. module: hr_timesheet_sheet -#. openerp-web -#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:61 -#, python-format -msgid "By default, you record timesheets on analytic accounts.\n" -" But if an analytic account represents a customer\n" -" contract, you can change the type of the analytic\n" -" account to 'Contract or Project' to setup the invoicing\n" -" options." -msgstr "" - -#. module: hr_timesheet_sheet -#. openerp-web -#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:56 -#, python-format -msgid "Click to add projects/analytic accounts you worked on." +#: view:hr.timesheet.current.open:0 +msgid "or" msgstr "" #. module: hr_timesheet_sheet @@ -867,6 +844,13 @@ msgstr "" msgid "Group by year of date" msgstr "" +#. module: hr_timesheet_sheet +#. openerp-web +#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:56 +#, python-format +msgid "Click to add projects, contracts or analytic accounts." +msgstr "" + #. module: hr_timesheet_sheet #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0 msgid "State is 'validated'." @@ -943,8 +927,8 @@ msgid "May" msgstr "" #. module: hr_timesheet_sheet -#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0 -msgid "Defines the work summary of task" +#: field:hr.timesheet.report,journal_id:0 +msgid "Journal" msgstr "" #. module: hr_timesheet_sheet @@ -992,11 +976,6 @@ msgstr "" msgid "February" msgstr "" -#. module: hr_timesheet_sheet -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - #. module: hr_timesheet_sheet #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all msgid "\n" @@ -1008,11 +987,6 @@ msgid "
\n"
" "
msgstr ""
-#. module: hr_timesheet_sheet
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
-
#. module: hr_timesheet_sheet
#: view:hr_timesheet_sheet.sheet:0
msgid "Employees"
@@ -1089,11 +1063,6 @@ msgstr ""
msgid "#Total Attendance"
msgstr ""
-#. module: hr_timesheet_sheet
-#: view:hr.timesheet.current.open:0
-msgid "or"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: field:hr.timesheet.report,cost:0
msgid "Cost"
@@ -1138,8 +1107,8 @@ msgid "Total"
msgstr ""
#. module: hr_timesheet_sheet
-#: field:hr.timesheet.report,journal_id:0
-msgid "Journal"
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
msgstr ""
#. module: hr_timesheet_sheet
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index c58c960bdb4..e9e6c892227 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-03 10:24+0000\n"
+"PO-Revision-Date: 2012-12-03 10:24+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,11 +31,6 @@ msgstr ""
msgid "By States"
msgstr ""
-#. module: idea
-#: view:idea.idea:0
-msgid "Refuse"
-msgstr ""
-
#. module: idea
#: sql_constraint:idea.category:0
msgid "The name of the category must be unique"
@@ -61,12 +56,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: idea
-#: code:addons/idea/idea.py:81
-#, python-format
-msgid "Idea closed."
-msgstr ""
-
#. module: idea
#: field:idea.category,name:0
msgid "Category Name"
@@ -83,6 +72,12 @@ msgstr ""
msgid "New Ideas"
msgstr ""
+#. module: idea
+#: code:addons/idea/idea.py:71
+#, python-format
+msgid "Idea has been refused."
+msgstr ""
+
#. module: idea
#: view:idea.idea:0
#: field:idea.idea,state:0
@@ -110,14 +105,9 @@ msgid "Unread Messages"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:71
+#: code:addons/idea/idea.py:86
#, python-format
-msgid "Idea canceled."
-msgstr ""
-
-#. module: idea
-#: help:idea.idea,message_ids:0
-msgid "Messages and communication history"
+msgid "Idea has been created."
msgstr ""
#. module: idea
@@ -125,6 +115,14 @@ msgstr ""
msgid "Is a Follower"
msgstr ""
+#. module: idea
+#: view:idea.idea:0
+#: model:ir.actions.act_window,name:idea.action_idea_idea
+#: model:ir.ui.menu,name:idea.menu_idea_idea
+#: model:ir.ui.menu,name:idea.menu_ideas
+msgid "Ideas"
+msgstr ""
+
#. module: idea
#: model:ir.model,name:idea.model_idea_idea
msgid "Email Thread"
@@ -150,7 +148,12 @@ msgstr ""
#. module: idea
#: view:idea.idea:0
-msgid "Open"
+msgid "Refuse"
+msgstr ""
+
+#. module: idea
+#: help:idea.idea,message_ids:0
+msgid "Messages and communication history"
msgstr ""
#. module: idea
@@ -159,17 +162,9 @@ msgid "Messages"
msgstr ""
#. module: idea
-#: view:idea.idea:0
-#: model:ir.actions.act_window,name:idea.action_idea_idea
-#: model:ir.ui.menu,name:idea.menu_idea_idea
-#: model:ir.ui.menu,name:idea.menu_ideas
-msgid "Ideas"
-msgstr ""
-
-#. module: idea
-#: code:addons/idea/idea.py:86
+#: code:addons/idea/idea.py:81
#, python-format
-msgid "Idea reset to draft."
+msgid "Idea has been accepted."
msgstr ""
#. module: idea
@@ -209,8 +204,14 @@ msgid "Creator"
msgstr ""
#. module: idea
-#: view:idea.category:0
-msgid "Ideas Categories"
+#: view:idea.idea:0
+msgid "Open"
+msgstr ""
+
+#. module: idea
+#: code:addons/idea/idea.py:76
+#, python-format
+msgid "Idea has been opened."
msgstr ""
#. module: idea
@@ -249,9 +250,8 @@ msgid "Category of Ideas"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:76
-#, python-format
-msgid "Idea accepted."
+#: view:idea.category:0
+msgid "Ideas Categories"
msgstr ""
#. module: idea
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index c93d5308901..4a5aaa24823 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -106,10 +106,10 @@ class base_report(report_sxw.rml_parse):
value=line["debit"]-line["credit"]
elif(type == "D"):
value=line["debit"]-line["credit"]
- if(value<0.001): value=0.0
+ if(abs(value)<0.001): value=0.0
elif(type == "C"):
value=line["credit"]-line["debit"]
- if(value<0.001): value=0.0
+ if(abs(value)<0.001): value=0.0
if(operator == '+'):
sum += value
else:
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 8bb8832082f..ac7cb2b1e0f 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:01+0000\n"
+"PO-Revision-Date: 2012-12-03 16:01+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -63,13 +63,6 @@ msgstr ""
msgid "Automatically sanitized HTML contents"
msgstr ""
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:43
-#, python-format
-msgid "Write an internal note..."
-msgstr ""
-
#. module: mail
#: help:mail.alias,alias_name:0
msgid "The name of the email alias, e.g. 'jobs' if you want to catch emails for \n"
-" No todo!\n"
-" \n"
-" When you process messages in your inbox, you can mark some\n"
-" as todo. From this menu, you can process all your todo.\n"
-" \n"
" "
msgstr ""
+#. module: mail
+#: view:mail.group:0
+msgid "This group is visible by everyone,\n"
+" including your customers if you installed\n"
+" the portal module."
+msgstr ""
+
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:201
+#: code:addons/mail/static/src/xml/mail.xml:210
#, python-format
msgid "Set back to Todo"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:109
+#: code:addons/mail/static/src/xml/mail.xml:113
#, python-format
msgid "this document"
msgstr ""
@@ -1406,7 +1392,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:117
+#: code:addons/mail/static/src/xml/mail.xml:125
#, python-format
msgid "others..."
msgstr ""
@@ -1478,8 +1464,10 @@ msgid "Related Document Model"
msgstr ""
#. module: mail
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:272
+#, python-format
+msgid "unlike"
msgstr ""
#. module: mail
@@ -1510,12 +1498,14 @@ msgid "Mail Vote"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:156
-#: view:mail.compose.message:0
-#: view:mail.wizard.invite:0
-#, python-format
-msgid "or"
+#: model:ir.actions.client,help:mail.action_mail_star_feeds
+msgid " \n"
+" No todo.\n"
+" \n"
+" When you process messages in your inbox, you can mark some\n"
+" as todo. From this menu, you can process all your todo.\n"
+" \n"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:869
+#: code:addons/point_of_sale/point_of_sale.py:870
#, python-format
msgid "Customer Invoice"
msgstr ""
@@ -847,11 +831,6 @@ msgstr ""
msgid "Spa Reine 1L"
msgstr ""
-#. module: point_of_sale
-#: constraint:account.bank.statement.line:0
-msgid "The amount of the voucher must be the same amount as the one on the statement line."
-msgstr ""
-
#. module: point_of_sale
#: constraint:res.partner:0
#: constraint:res.users:0
@@ -916,6 +895,11 @@ msgstr ""
msgid "pos.session.opening"
msgstr ""
+#. module: point_of_sale
+#: view:res.users:0
+msgid "Edit EAN"
+msgstr ""
+
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_open_statement.py:80
#, python-format
@@ -954,7 +938,7 @@ msgid "User's Product"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1142
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
@@ -1328,7 +1312,7 @@ msgid "Today's Closed Cashbox"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:899
+#: code:addons/point_of_sale/point_of_sale.py:900
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
@@ -1559,6 +1543,12 @@ msgstr ""
msgid "pos.config"
msgstr ""
+#. module: point_of_sale
+#: view:pos.ean_wizard:0
+msgid "Enter a reference, it will be converted\n"
+" automatically to a valid EAN number."
+msgstr ""
+
#. module: point_of_sale
#: field:product.product,expense_pdt:0
msgid "Point of Sale Cash Out"
@@ -1603,7 +1593,7 @@ msgid "Number of Transaction"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:739
+#: code:addons/point_of_sale/point_of_sale.py:740
#, python-format
msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)."
msgstr ""
@@ -1854,8 +1844,9 @@ msgid "User:"
msgstr ""
#. module: point_of_sale
-#: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
+#: code:addons/point_of_sale/point_of_sale.py:318
+#, python-format
+msgid "Unable to open the session. You have to assign a sale journal to your point of sale."
msgstr ""
#. module: point_of_sale
@@ -1925,7 +1916,7 @@ msgid "Salespeople"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:757
+#: code:addons/point_of_sale/point_of_sale.py:758
#: code:addons/point_of_sale/wizard/pos_box_entries.py:118
#: code:addons/point_of_sale/wizard/pos_box_out.py:91
#, python-format
@@ -1933,7 +1924,7 @@ msgid "You have to open at least one cashbox."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1140
+#: code:addons/point_of_sale/point_of_sale.py:1141
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -2375,11 +2366,6 @@ msgstr ""
msgid "Opening Balance"
msgstr ""
-#. module: point_of_sale
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-
#. module: point_of_sale
#: view:account.bank.statement:0
#: selection:report.pos.order,state:0
@@ -2479,12 +2465,6 @@ msgstr ""
msgid "% discount"
msgstr ""
-#. module: point_of_sale
-#: constraint:account.journal:0
-msgid "Configuration error!\n"
-"The currency chosen should be shared by the default accounts too."
-msgstr ""
-
#. module: point_of_sale
#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
msgid "Sales by margin"
@@ -3035,11 +3015,11 @@ msgstr ""
#: code:addons/point_of_sale/point_of_sale.py:411
#: code:addons/point_of_sale/point_of_sale.py:421
#: code:addons/point_of_sale/point_of_sale.py:459
-#: code:addons/point_of_sale/point_of_sale.py:713
-#: code:addons/point_of_sale/point_of_sale.py:757
-#: code:addons/point_of_sale/point_of_sale.py:819
-#: code:addons/point_of_sale/point_of_sale.py:899
-#: code:addons/point_of_sale/point_of_sale.py:1004
+#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:1005
#: code:addons/point_of_sale/report/pos_invoice.py:46
#: code:addons/point_of_sale/wizard/pos_box.py:22
#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
@@ -3133,16 +3113,11 @@ msgid "Chaudfontaine 1.5l"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1067
+#: code:addons/point_of_sale/point_of_sale.py:1068
#, python-format
msgid "Trade Receivables"
msgstr ""
-#. module: point_of_sale
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
-
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:531
#, python-format
@@ -3177,7 +3152,7 @@ msgid "Journal Entry"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:737
+#: code:addons/point_of_sale/point_of_sale.py:738
#, python-format
msgid "There is no receivable account defined to make payment."
msgstr ""
@@ -3207,11 +3182,6 @@ msgstr ""
msgid "Supplier Invoice"
msgstr ""
-#. module: point_of_sale
-#: constraint:account.bank.statement:0
-msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
-
#. module: point_of_sale
#: code:addons/point_of_sale/point_of_sale.py:460
#, python-format
@@ -3277,11 +3247,6 @@ msgstr ""
msgid "Orval 33cl"
msgstr ""
-#. module: point_of_sale
-#: sql_constraint:res.users:0
-msgid "OAuth UID must be unique per provider"
-msgstr ""
-
#. module: point_of_sale
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:521
@@ -3295,7 +3260,7 @@ msgid "Coca-Cola Regular 1L"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:713
+#: code:addons/point_of_sale/point_of_sale.py:714
#, python-format
msgid "Unable to cancel the picking."
msgstr ""
@@ -3336,7 +3301,7 @@ msgid "Spa Barisart 1.5l"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:790
+#: code:addons/point_of_sale/point_of_sale.py:791
#: view:pos.order:0
#, python-format
msgid "Return Products"
@@ -3493,7 +3458,7 @@ msgid "PRO-FORMA"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:819
+#: code:addons/point_of_sale/point_of_sale.py:820
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
@@ -3629,11 +3594,6 @@ msgstr ""
msgid "The session"
msgstr ""
-#. module: point_of_sale
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
#. module: point_of_sale
#: view:pos.order:0
msgid "General Information"
@@ -3698,12 +3658,6 @@ msgstr ""
msgid "Pyament Report"
msgstr ""
-#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
-#, python-format
-msgid "Unable to open the session. You have to assign a sale journal to your point of sale."
-msgstr ""
-
#. module: point_of_sale
#: field:report.transaction.pos,jl_id:0
msgid "Cash Journals"
@@ -3803,7 +3757,6 @@ msgstr ""
#. module: point_of_sale
#: view:res.partner:0
-#: view:res.users:0
msgid "Edit"
msgstr ""
@@ -3877,11 +3830,6 @@ msgstr ""
msgid "Black Grapes"
msgstr ""
-#. module: point_of_sale
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
#. module: point_of_sale
#: field:pos.category,sequence:0
msgid "Sequence"
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index 58938ea4f84..dd25f7beb85 100644
--- a/addons/portal/i18n/portal.pot
+++ b/addons/portal/i18n/portal.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-03 16:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,11 +65,6 @@ msgstr ""
msgid "Invitation Message"
msgstr ""
-#. module: portal
-#: model:ir.ui.menu,name:portal.portal_company
-msgid "Our company"
-msgstr ""
-
#. module: portal
#: view:res.groups:0
msgid "Non-Portal Groups"
@@ -80,6 +75,16 @@ msgstr ""
msgid "Details"
msgstr ""
+#. module: portal
+#: model:ir.ui.menu,name:portal.portal_orders
+msgid "Quotations and Sales Orders"
+msgstr ""
+
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "reference: the reference number of the document to pay"
+msgstr ""
+
#. module: portal
#: help:portal.payment.acquirer,visible:0
msgid "Make this payment acquirer available in portal forms (Customer invoices, etc.)"
@@ -91,13 +96,16 @@ msgid "Share Wizard"
msgstr ""
#. module: portal
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
+#: field:portal.wizard.user,email:0
+msgid "Email"
msgstr ""
#. module: portal
-#: field:portal.wizard.user,email:0
-msgid "Email"
+#: model:ir.actions.client,help:portal.action_news
+msgid " \n"
+" Youd don't have unread company's news.\n"
+" \n"
+" Youd don't have unread job offers.\n"
+" \n"
+" Good Job! Your inbox is empty.\n"
+" \n"
+" Your inbox contains private messages or emails sent to you\n"
+" as well as information related to documents or people you\n"
+" follow.\n"
+" \n"
+" Click to start a new project.\n"
+" \n"
" Click to create an issue.\n"
" \n"
-" OpenERP's kanban view will help you track easily your current \n"
-" pipeline of issues to fix.\n"
+" You can track your issues from this menu and the action we\n"
+" will take.\n"
" \n"
" "
msgstr ""
-#. module: procurement
-#: field:stock.warehouse.orderpoint,qty_multiple:0
-msgid "Qty Multiple"
-msgstr ""
-
#. module: procurement
#: help:procurement.order,procure_method:0
msgid "If you encode manually a Procurement, you probably want to use a make to order method."
@@ -574,11 +564,6 @@ msgstr ""
msgid "Normal"
msgstr ""
-#. module: procurement
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: procurement
#: help:product.template,supply_method:0
msgid "Manufacture: When procuring the product, a manufacturing order or a task will be generated, depending on the product type. \n"
@@ -623,11 +608,6 @@ msgstr ""
msgid "Comments and emails"
msgstr ""
-#. module: procurement
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
#. module: procurement
#: field:procurement.order,date_planned:0
msgid "Scheduled date"
@@ -656,13 +636,8 @@ msgid "Automatic Order Point"
msgstr ""
#. module: procurement
-#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
-msgid "Minimum Inventory Rule"
-msgstr ""
-
-#. module: procurement
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
msgstr ""
#. module: procurement
@@ -701,11 +676,6 @@ msgstr ""
msgid "Order to Max"
msgstr ""
-#. module: procurement
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
#. module: procurement
#: field:procurement.order,date_close:0
msgid "Date Closed"
@@ -857,11 +827,6 @@ msgstr ""
msgid "Product"
msgstr ""
-#. module: procurement
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
#. module: procurement
#: view:procurement.order:0
msgid "Temporary"
@@ -878,11 +843,6 @@ msgstr ""
msgid "Urgent"
msgstr ""
-#. module: procurement
-#: constraint:product.template:0
-msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
-msgstr ""
-
#. module: procurement
#: selection:procurement.order,state:0
msgid "Running"
@@ -925,11 +885,6 @@ msgstr ""
msgid "Temporary Procurement Exceptions"
msgstr ""
-#. module: procurement
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
#. module: procurement
#: field:mrp.property,name:0
#: field:stock.warehouse.orderpoint,name:0
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 72f3608fb1e..2a551953938 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-03 16:03+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -305,11 +305,6 @@ msgstr ""
msgid "Public Price"
msgstr ""
-#. module: product
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: product
#: field:product.price_list,qty5:0
msgid "Quantity-5"
@@ -576,7 +571,6 @@ msgstr ""
#. module: product
#: constraint:product.packaging:0
-#: constraint:res.partner:0
msgid "Error: Invalid ean code"
msgstr ""
@@ -836,11 +830,6 @@ msgstr ""
msgid "Product Categories"
msgstr ""
-#. module: product
-#: sql_constraint:res.currency:0
-msgid "The currency code must be unique per company!"
-msgstr ""
-
#. module: product
#: view:product.template:0
msgid "Procurement & Locations"
@@ -2268,11 +2257,6 @@ msgstr ""
msgid "On demand hard-disk having capacity based on requirement."
msgstr ""
-#. module: product
-#: help:product.template,volume:0
-msgid "The volume in m3."
-msgstr ""
-
#. module: product
#: selection:product.template,state:0
msgid "End of Lifecycle"
@@ -2295,11 +2279,6 @@ msgstr ""
msgid "Pricelist Versions"
msgstr ""
-#. module: product
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
#. module: product
#: help:product.pricelist.item,price_round:0
msgid "Sets the price so that it is a multiple of this value.\n"
@@ -2338,8 +2317,8 @@ msgid "This is a quantity which is converted into Default Unit of Measure."
msgstr ""
#. module: product
-#: sql_constraint:decimal.precision:0
-msgid "Only one value can be defined for each given usage!"
+#: help:product.template,volume:0
+msgid "The volume in m3."
msgstr ""
#. module: product
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 7f2be9b16a7..377a17a93a2 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -45,11 +45,6 @@ msgstr ""
msgid "Product Use Time"
msgstr ""
-#. module: product_expiry
-#: sql_constraint:stock.production.lot:0
-msgid "The combination of Serial Number and internal reference must be unique !"
-msgstr ""
-
#. module: product_expiry
#: model:ir.model,name:product_expiry.model_product_product
msgid "Product"
@@ -60,11 +55,6 @@ msgstr ""
msgid "When a new a Serial Number is issued, this is the number of days before the goods starts deteriorating, without being dangerous yet."
msgstr ""
-#. module: product_expiry
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: product_expiry
#: field:product.product,removal_time:0
msgid "Product Removal Time"
@@ -90,11 +80,6 @@ msgstr ""
msgid "Removal Date"
msgstr ""
-#. module: product_expiry
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
#. module: product_expiry
#: model:product.template,name:product_expiry.product_product_pain_product_template
msgid "Bread"
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index 86fb34aa4cc..e0a4ea1d858 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -47,11 +47,6 @@ msgstr ""
msgid "Attribute"
msgstr ""
-#. module: product_manufacturer
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: product_manufacturer
#: field:product.manufacturer.attribute,value:0
msgid "Value"
@@ -63,11 +58,6 @@ msgstr ""
msgid "Attributes"
msgstr ""
-#. module: product_manufacturer
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
#. module: product_manufacturer
#: field:product.product,manufacturer_pname:0
msgid "Manufacturer Product Name"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 3a99050f753..590d3f9763a 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -73,11 +73,6 @@ msgstr ""
msgid "Product"
msgstr ""
-#. module: product_margin
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: product_margin
#: view:product.product:0
msgid "Catalog Price"
@@ -120,11 +115,6 @@ msgstr ""
msgid "# Invoiced"
msgstr ""
-#. module: product_margin
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
#. module: product_margin
#: view:product.product:0
#: field:product.product,total_cost:0
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 10197d63c1c..c35af7ac6c8 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-03 16:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgid "Start Task"
msgstr ""
#. module: project
-#: code:addons/project/project.py:962
+#: code:addons/project/project.py:960
#, python-format
msgid "Warning !"
msgstr ""
@@ -127,8 +127,8 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: project
-#: code:addons/project/project.py:434
-#: code:addons/project/project.py:1416
+#: code:addons/project/project.py:440
+#: code:addons/project/project.py:1414
#, python-format
msgid "Warning!"
msgstr ""
@@ -185,11 +185,6 @@ msgstr ""
msgid "Task Delegation"
msgstr ""
-#. module: project
-#: constraint:account.analytic.account:0
-msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
-
#. module: project
#: field:project.project,planned_hours:0
#: field:project.task.history,planned_hours:0
@@ -258,7 +253,7 @@ msgid "Project Task Delegate"
msgstr ""
#. module: project
-#: code:addons/project/project.py:551
+#: code:addons/project/project.py:557
#, python-format
msgid "Project has been created."
msgstr ""
@@ -304,7 +299,7 @@ msgid "August"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1305
+#: code:addons/project/project.py:1303
#, python-format
msgid "Task has been delegated to %s."
msgstr ""
@@ -370,7 +365,7 @@ msgid "Assigned to"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1059
+#: code:addons/project/project.py:1057
#, python-format
msgid "Delegated User should be specified"
msgstr ""
@@ -407,7 +402,7 @@ msgid "Re-evaluate Task"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1294
+#: code:addons/project/project.py:1292
#, python-format
msgid "Stage changed to %s."
msgstr ""
@@ -422,11 +417,6 @@ msgstr ""
msgid "Use integrated collaborative note pads on task"
msgstr ""
-#. module: project
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
#. module: project
#: model:process.node,note:project.process_node_opentask0
msgid "Encode your working hours."
@@ -448,8 +438,8 @@ msgid "Delegation"
msgstr ""
#. module: project
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
+#: field:project.task,create_date:0
+msgid "Create Date"
msgstr ""
#. module: project
@@ -814,10 +804,8 @@ msgid "Is a Follower"
msgstr ""
#. module: project
-#: field:project.task.history,date:0
-#: field:project.task.history.cumulative,date:0
-#: field:project.task.work,date:0
-msgid "Date"
+#: field:project.task,work_ids:0
+msgid "Work done"
msgstr ""
#. module: project
@@ -841,8 +829,10 @@ msgid "Companies"
msgstr ""
#. module: project
-#: field:project.task,work_ids:0
-msgid "Work done"
+#: field:project.task.history,date:0
+#: field:project.task.history.cumulative,date:0
+#: field:project.task.work,date:0
+msgid "Date"
msgstr ""
#. module: project
@@ -865,7 +855,7 @@ msgid "10"
msgstr ""
#. module: project
-#: code:addons/project/project.py:560
+#: code:addons/project/project.py:566
#, python-format
msgid "Project has been canceled."
msgstr ""
@@ -886,11 +876,16 @@ msgid "Cancel"
msgstr ""
#. module: project
-#: code:addons/project/project.py:563
+#: code:addons/project/project.py:569
#, python-format
msgid "Project has been closed."
msgstr ""
+#. module: project
+#: model:ir.actions.server,name:project.actions_server_project_task_read
+msgid "Task: Mark read"
+msgstr ""
+
#. module: project
#: view:project.project:0
msgid "Other Info"
@@ -992,13 +987,13 @@ msgid "Work summary"
msgstr ""
#. module: project
-#: code:addons/project/project.py:557
+#: code:addons/project/project.py:563
#, python-format
msgid "Project is now pending."
msgstr ""
#. module: project
-#: code:addons/project/project.py:554
+#: code:addons/project/project.py:560
#, python-format
msgid "Project has been opened."
msgstr ""
@@ -1055,6 +1050,11 @@ msgstr ""
msgid "Parent Tasks"
msgstr ""
+#. module: project
+#: model:ir.actions.server,name:project.actions_server_project_read
+msgid "Project: Mark read"
+msgstr ""
+
#. module: project
#: model:process.node,name:project.process_node_opentask0
msgid "Open task"
@@ -1103,7 +1103,7 @@ msgid "Done by"
msgstr ""
#. module: project
-#: code:addons/project/project.py:174
+#: code:addons/project/project.py:180
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1134,6 +1134,11 @@ msgstr ""
msgid "Number of documents attached"
msgstr ""
+#. module: project
+#: model:ir.actions.server,name:project.actions_server_project_task_unread
+msgid "Task: Mark unread"
+msgstr ""
+
#. module: project
#: field:project.task,priority:0
#: field:report.project.task.user,priority:0
@@ -1169,9 +1174,9 @@ msgid "Computed as: Time Spent + Remaining Time."
msgstr ""
#. module: project
-#: code:addons/project/project.py:358
-#: code:addons/project/project.py:379
-#: code:addons/project/project.py:727
+#: code:addons/project/project.py:364
+#: code:addons/project/project.py:385
+#: code:addons/project/project.py:728
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -1352,7 +1357,7 @@ msgid "Estimated time to do the task, usually set by the project manager when th
msgstr ""
#. module: project
-#: code:addons/project/project.py:213
+#: code:addons/project/project.py:219
#, python-format
msgid "Attachments"
msgstr ""
@@ -1372,7 +1377,7 @@ msgid "Done"
msgstr ""
#. module: project
-#: code:addons/project/project.py:175
+#: code:addons/project/project.py:181
#, python-format
msgid "You cannot delete a project containing tasks. You can either delete all the project's tasks and then delete the project or simply deactivate the project."
msgstr ""
@@ -1463,12 +1468,6 @@ msgstr ""
msgid "Hours Spent"
msgstr ""
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_task_unread
-#: model:ir.actions.server,name:project.actions_server_project_unread
-msgid "Mark unread"
-msgstr ""
-
#. module: project
#: help:project.config.settings,module_pad:0
msgid "Lets the company customize which Pad installation should be used to link to new pads\n"
@@ -1487,7 +1486,7 @@ msgid "Overpassed Tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:962
+#: code:addons/project/project.py:960
#, python-format
msgid "Child task still open.\n"
"Please cancel or complete child task first."
@@ -1528,11 +1527,6 @@ msgstr ""
msgid "Deadlines"
msgstr ""
-#. module: project
-#: field:project.task,create_date:0
-msgid "Create Date"
-msgstr ""
-
#. module: project
#: code:addons/project/wizard/project_task_delegate.py:69
#: code:addons/project/wizard/project_task_delegate.py:70
@@ -1543,7 +1537,7 @@ msgid "CHECK: "
msgstr ""
#. module: project
-#: code:addons/project/project.py:434
+#: code:addons/project/project.py:440
#, python-format
msgid "You must assign members on the project '%s' !"
msgstr ""
@@ -1599,11 +1593,6 @@ msgstr ""
msgid "Define the Requirements and Set Planned Hours."
msgstr ""
-#. module: project
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
#. module: project
#: field:project.project,message_ids:0
#: field:project.task,message_ids:0
@@ -1671,11 +1660,6 @@ msgstr ""
msgid "Documents"
msgstr ""
-#. module: project
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
#. module: project
#: view:report.project.task.user:0
#: field:report.project.task.user,no_of_days:0
@@ -1718,12 +1702,6 @@ msgstr ""
msgid "OverPass delay"
msgstr ""
-#. module: project
-#: model:ir.actions.server,name:project.actions_server_project_read
-#: model:ir.actions.server,name:project.actions_server_project_task_read
-msgid "Mark read"
-msgstr ""
-
#. module: project
#: view:project.task.delegate:0
msgid "Validation Task"
@@ -1774,7 +1752,7 @@ msgid "Starting Date"
msgstr ""
#. module: project
-#: code:addons/project/project.py:400
+#: code:addons/project/project.py:406
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.ui.menu,name:project.menu_projects
#: view:project.project:0
@@ -1808,7 +1786,7 @@ msgid "Project Tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1298
+#: code:addons/project/project.py:1296
#, python-format
msgid "Task has been created."
msgstr ""
@@ -1876,7 +1854,7 @@ msgid "Kanban State"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1301
+#: code:addons/project/project.py:1299
#, python-format
msgid "Task has been set as draft."
msgstr ""
@@ -1944,6 +1922,11 @@ msgstr ""
msgid "January"
msgstr ""
+#. module: project
+#: model:ir.actions.server,name:project.actions_server_project_unread
+msgid "Project: Mark unread"
+msgstr ""
+
#. module: project
#: field:project.task.delegate,prefix:0
msgid "Your Task Title"
@@ -1955,7 +1938,7 @@ msgid "Reevaluation Task"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1416
+#: code:addons/project/project.py:1414
#, python-format
msgid "Please delete the project linked with this account first."
msgstr ""
@@ -2048,11 +2031,6 @@ msgstr ""
msgid "Open Tasks"
msgstr ""
-#. module: project
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
#. module: project
#: field:project.project,priority:0
#: field:project.project,sequence:0
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index 04847f0066e..4c071809224 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -111,13 +111,8 @@ msgid "My Tasks"
msgstr ""
#. module: project_gtd
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_gtd
-#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
-msgid "This Week"
+#: help:project.task,context_id:0
+msgid "The context place where user has to treat task"
msgstr ""
#. module: project_gtd
@@ -132,8 +127,8 @@ msgid "Tasks having no timebox assigned yet"
msgstr ""
#. module: project_gtd
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
+#: model:project.gtd.timebox,name:project_gtd.timebox_weekly
+msgid "This Week"
msgstr ""
#. module: project_gtd
@@ -265,11 +260,6 @@ msgstr ""
msgid "Get from Timebox"
msgstr ""
-#. module: project_gtd
-#: help:project.task,context_id:0
-msgid "The context place where user has to treat task"
-msgstr ""
-
#. module: project_gtd
#: view:project.timebox.fill.plan:0
msgid "Cancel"
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index fd739ec11a5..abca23e4870 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-03 16:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,11 +41,6 @@ msgstr ""
msgid "Working Hours to Open the Issue"
msgstr ""
-#. module: project_issue
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
#. module: project_issue
#: field:project.issue,date_open:0
msgid "Opened"
@@ -73,11 +68,16 @@ msgid "Unread Messages"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:562
+#: code:addons/project_issue/project_issue.py:560
#, python-format
msgid "escalated."
msgstr ""
+#. module: project_issue
+#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
+msgid "Issue: Mark unread"
+msgstr ""
+
#. module: project_issue
#: field:project.issue,email_cc:0
msgid "Watchers Emails"
@@ -99,7 +99,7 @@ msgid "Days to Open"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:474
+#: code:addons/project_issue/project_issue.py:472
#, python-format
msgid "You cannot escalate this issue.\n"
"The relevant Project has not configured the Escalation Project!"
@@ -176,6 +176,11 @@ msgstr ""
msgid "Cancelled"
msgstr ""
+#. module: project_issue
+#: field:project.issue,description:0
+msgid "Private Note"
+msgstr ""
+
#. module: project_issue
#: field:project.issue.report,date_closed:0
msgid "Date of Closing"
@@ -247,7 +252,7 @@ msgid "Maintenance"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:549
+#: code:addons/project_issue/project_issue.py:547
#, python-format
msgid "Project issue converted to task."
msgstr ""
@@ -308,11 +313,6 @@ msgstr ""
msgid "%s (copy)"
msgstr ""
-#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Mark read"
-msgstr ""
-
#. module: project_issue
#: view:project.issue:0
msgid "Unassigned Issues"
@@ -325,11 +325,6 @@ msgstr ""
msgid "Creation Date"
msgstr ""
-#. module: project_issue
-#: constraint:account.analytic.account:0
-msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
-
#. module: project_issue
#: model:ir.actions.act_window,name:project_issue.project_issue_version_action
#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act
@@ -384,7 +379,7 @@ msgid "Issues Analysis"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:495
+#: code:addons/project_issue/project_issue.py:493
#, python-format
msgid "No Subject"
msgstr ""
@@ -403,7 +398,7 @@ msgid "Contact"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:553
+#: code:addons/project_issue/project_issue.py:551
#, python-format
msgid "Project issue created."
msgstr ""
@@ -425,8 +420,8 @@ msgid "# of Issues"
msgstr ""
#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
+#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
+msgid "Issue: Mark read"
msgstr ""
#. module: project_issue
@@ -563,11 +558,6 @@ msgstr ""
msgid "Normal"
msgstr ""
-#. module: project_issue
-#: view:project.issue:0
-msgid "Escalate"
-msgstr ""
-
#. module: project_issue
#: field:project.project,issue_count:0
msgid "unknown"
@@ -620,7 +610,7 @@ msgid "November"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:474
+#: code:addons/project_issue/project_issue.py:472
#, python-format
msgid "Warning!"
msgstr ""
@@ -688,6 +678,11 @@ msgstr ""
msgid "Current Features"
msgstr ""
+#. module: project_issue
+#: selection:project.issue.report,month:0
+msgid "September"
+msgstr ""
+
#. module: project_issue
#: view:project.issue.version:0
msgid "Issue Version"
@@ -742,7 +737,7 @@ msgid "Creation Month"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:559
+#: code:addons/project_issue/project_issue.py:557
#, python-format
msgid "escalated to '%s'."
msgstr ""
@@ -768,7 +763,7 @@ msgid "Issue"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:542
+#: code:addons/project_issue/project_issue.py:540
#, python-format
msgid "Stage changed to %s."
msgstr ""
@@ -785,7 +780,6 @@ msgstr ""
#. module: project_issue
#: view:project.issue:0
-#: field:project.issue,description:0
msgid "Description"
msgstr ""
@@ -857,8 +851,8 @@ msgid "April"
msgstr ""
#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Mark unread"
+#: view:project.issue:0
+msgid "⇒ Escalate"
msgstr ""
#. module: project_issue
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 3b1b006d6e0..35dce21e8bd 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,11 +41,6 @@ msgstr ""
msgid "on_change_project(project_id)"
msgstr ""
-#. module: project_issue_sheet
-#: constraint:hr.analytic.timesheet:0
-msgid "You cannot modify an entry in a Confirmed/Done timesheet !"
-msgstr ""
-
#. module: project_issue_sheet
#: code:addons/project_issue_sheet/project_issue_sheet.py:57
#: field:project.issue,analytic_account_id:0
@@ -69,11 +64,6 @@ msgstr ""
msgid "Timesheets"
msgstr ""
-#. module: project_issue_sheet
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
-
#. module: project_issue_sheet
#: field:hr.analytic.timesheet,issue_id:0
msgid "Issue"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index 383d56b442b..179629da2ef 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,17 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: project_long_term
+#: help:project.phase,constraint_date_end:0
+msgid "force the phase to finish before this date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "In Progress"
+msgstr ""
+
#. module: project_long_term
#: field:account.analytic.account,use_phases:0
#: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -22,36 +33,102 @@ msgstr ""
msgid "Phases"
msgstr ""
+#. module: project_long_term
+#: field:project.phase,user_ids:0
+msgid "Assigned Users"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
#: field:project.phase,next_phase_ids:0
msgid "Next Phases"
msgstr ""
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_user_allocation
+msgid "Phase User Allocation"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
msgid "Project's Tasks"
msgstr ""
+#. module: project_long_term
+#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
+msgid "To schedule phases of all or a specified project. It then open a gantt view.\n"
+" "
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,task_ids:0
+msgid "Project Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
+#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
+#: view:project.compute.phases:0
+msgid "Schedule Phases"
+msgstr ""
+
#. module: project_long_term
#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Group By..."
+#: field:project.phase,state:0
+msgid "Status"
msgstr ""
#. module: project_long_term
-#: field:project.phase,user_ids:0
-msgid "Assigned Users"
+#: field:project.compute.phases,target_project:0
+msgid "Action"
msgstr ""
#. module: project_long_term
-#: field:project.phase,progress:0
-msgid "Progress"
+#: view:project.phase:0
+msgid "Start Phase"
msgstr ""
#. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
+#: model:ir.model,name:project_long_term.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Draft"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "C_ompute"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "New"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,product_uom:0
+msgid "Duration Unit of Measure"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
+msgid "Resource Leaves"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,progress:0
+msgid "Computed based on related tasks"
msgstr ""
#. module: project_long_term
@@ -59,6 +136,12 @@ msgstr ""
msgid "In Progress Phases"
msgstr ""
+#. module: project_long_term
+#: code:addons/project_long_term/project_long_term.py:141
+#, python-format
+msgid "%s (copy)"
+msgstr ""
+
#. module: project_long_term
#: code:addons/project_long_term/wizard/project_compute_phases.py:48
#, python-format
@@ -66,13 +149,95 @@ msgid "Please specify a project to schedule."
msgstr ""
#. module: project_long_term
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
msgstr ""
#. module: project_long_term
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Group By..."
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Remaining Hours"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_start:0
+msgid "Minimum Start Date"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,product_uom:0
+msgid "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,user_ids:0
+msgid "The resources on the project can be computed automatically by the scheduler."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: project_long_term
+#: help:account.analytic.account,use_phases:0
+msgid "Check this field if you plan to use phase-based scheduling"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,state:0
+msgid "If the phase is created the status 'Draft'.\n"
+" If the phase is started, the status becomes 'In Progress'.\n"
+" If review is needed the phase is in 'Pending' status. \n"
+" If the phase is over, the status is set to 'Done'."
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,progress:0
+msgid "Progress"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource
+msgid "Resources"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "My Projects"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.project:0
+#: view:project.user.allocation:0
+msgid "Phase"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,duration:0
+msgid "By default in days"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
+msgid "Working Time"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Pending Phases"
msgstr ""
#. module: project_long_term
@@ -82,13 +247,24 @@ msgid "Day"
msgstr ""
#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_user_allocation
-msgid "Phase User Allocation"
+#: view:project.phase:0
+msgid "Related Tasks"
msgstr ""
#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_task
-msgid "Task"
+#: view:project.phase:0
+msgid "Start Month"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,date_end:0
+#: field:project.user.allocation,date_end:0
+msgid "End Date"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_project_compute_tasks
+msgid "Project Compute Tasks"
msgstr ""
#. module: project_long_term
@@ -108,11 +284,18 @@ msgid "Previous Phases"
msgstr ""
#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
-#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
#: view:project.phase:0
-#: view:project.user.allocation:0
-msgid "Planning of Users"
+msgid "New Phases"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Tasks Details"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.project,phase_count:0
+msgid "Open Phases"
msgstr ""
#. module: project_long_term
@@ -120,6 +303,17 @@ msgstr ""
msgid " It's computed by the scheduler according to the start date and the duration."
msgstr ""
+#. module: project_long_term
+#: constraint:project.phase:0
+msgid "Loops in phases not allowed"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+#: field:project.user.allocation,user_id:0
+msgid "User"
+msgstr ""
+
#. module: project_long_term
#: model:ir.model,name:project_long_term.model_project_project
#: field:project.compute.phases,project_id:0
@@ -132,240 +326,6 @@ msgstr ""
msgid "Project"
msgstr ""
-#. module: project_long_term
-#: code:addons/project_long_term/wizard/project_compute_phases.py:48
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: project_long_term
-#: selection:project.phase,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.user.allocation,date_end:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_account_analytic_account
-msgid "Analytic Account"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,constraint_date_end:0
-msgid "Deadline"
-msgstr ""
-
-#. module: project_long_term
-#: selection:project.compute.phases,target_project:0
-msgid "Compute All My Projects"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.user.allocation:0
-msgid "Project User Allocation"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "C_ompute"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Pending Phases"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "New"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,progress:0
-msgid "Computed based on related tasks"
-msgstr ""
-
-#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
-#, python-format
-msgid "%s (copy)"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,constraint_date_start:0
-msgid "Minimum Start Date"
-msgstr ""
-
-#. module: project_long_term
-#: constraint:account.analytic.account:0
-msgid "Error! You cannot create recursive analytic accounts."
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,state:0
-msgid "If the phase is created the status 'Draft'.\n"
-" If the phase is started, the status becomes 'In Progress'.\n"
-" If review is needed the phase is in 'Pending' status. \n"
-" If the phase is over, the status is set to 'Done'."
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_pm_users_project1
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource
-msgid "Resources"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "My Projects"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.user.allocation,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Related Tasks"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "New Phases"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,constraint_date_start:0
-msgid "force the phase to start after this date"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,task_ids:0
-msgid "Project Tasks"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
-msgid "Tasks"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,user_ids:0
-msgid "The resources on the project can be computed automatically by the scheduler."
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,date_start:0
-msgid "It's computed by the scheduler according the project date or the end date of the previous phase."
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Month"
-msgstr ""
-
-#. module: project_long_term
-#: constraint:project.phase:0
-msgid "Phase start-date must be lower than phase end-date."
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Start Month"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,date_start:0
-#: field:project.user.allocation,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,constraint_date_end:0
-msgid "force the phase to finish before this date"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Draft"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,product_uom:0
-msgid "Duration Unit of Measure"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "Pending"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,state:0
-msgid "Status"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.user.allocation:0
-#: field:project.user.allocation,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,product_uom:0
-msgid "Unit of Measure (Unit of Measure) is the unit of measurement for Duration"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.model,name:project_long_term.model_project_compute_tasks
-msgid "Project Compute Tasks"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.compute.phases,target_project:0
-msgid "Action"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Constraints"
-msgstr ""
-
-#. module: project_long_term
-#: help:project.phase,sequence:0
-msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.act_project_phase
-#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
-#: model:ir.ui.menu,name:project_long_term.menu_project_phase
-#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
-#: view:project.phase:0
-#: field:project.project,phase_ids:0
-msgid "Project Phases"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "Done"
-msgstr ""
-
#. module: project_long_term
#: view:project.compute.phases:0
#: view:project.compute.tasks:0
@@ -373,82 +333,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: project_long_term
-#: view:project.phase:0
-#: selection:project.phase,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_long_term
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Time"
-msgstr ""
-
-#. module: project_long_term
-#: model:ir.actions.act_window,name:project_long_term.action_project_compute_phases
-#: model:ir.ui.menu,name:project_long_term.menu_compute_phase
-#: view:project.compute.phases:0
-msgid "Schedule Phases"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Start Phase"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Total Hours"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.user.allocation:0
-msgid "Users"
-msgstr ""
-
-#. module: project_long_term
-#: help:account.analytic.account,use_phases:0
-msgid "Check this field if you plan to use phase-based scheduling"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.project:0
-#: view:project.user.allocation:0
-msgid "Phase"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,date_end:0
-#: field:project.user.allocation,date_end:0
-msgid "End Date"
-msgstr ""
-
-#. module: project_long_term
-#: field:project.phase,name:0
-msgid "Name"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_long_term
-#: view:project.phase:0
-#: field:project.phase,duration:0
-msgid "Duration"
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
msgid "Project Users"
@@ -464,14 +348,23 @@ msgid "Project Phase"
msgstr ""
#. module: project_long_term
-#: model:ir.actions.act_window,help:project_long_term.action_project_compute_phases
-msgid "To schedule phases of all or a specified project. It then open a gantt view.\n"
-" "
+#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
+msgid "Scheduling"
msgstr ""
#. module: project_long_term
-#: field:project.project,phase_count:0
-msgid "Open Phases"
+#: constraint:project.phase:0
+msgid "Phase start-date must be lower than phase end-date."
+msgstr ""
+
+#. module: project_long_term
+#: selection:project.phase,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Total Hours"
msgstr ""
#. module: project_long_term
@@ -480,18 +373,75 @@ msgid "Project Compute Phases"
msgstr ""
#. module: project_long_term
-#: constraint:project.phase:0
-msgid "Loops in phases not allowed"
+#: field:project.phase,date_start:0
+#: field:project.user.allocation,date_start:0
+msgid "Start Date"
msgstr ""
#. module: project_long_term
-#: field:project.phase,sequence:0
-msgid "Sequence"
+#: view:project.phase:0
+msgid "Constraints"
msgstr ""
#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
-msgid "Resource Leaves"
+#: help:project.phase,sequence:0
+msgid "Gives the sequence order when displaying a list of phases."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.project_phase_task_list
+msgid "Tasks"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.user.allocation,date_end:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: project_long_term
+#: code:addons/project_long_term/wizard/project_compute_phases.py:48
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,date_start:0
+msgid "It's computed by the scheduler according the project date or the end date of the previous phase."
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase
+#: model:ir.actions.act_window,name:project_long_term.act_project_phase_list
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase
+#: model:ir.ui.menu,name:project_long_term.menu_project_phase_list
+#: view:project.phase:0
+#: field:project.project,phase_ids:0
+msgid "Project Phases"
+msgstr ""
+
+#. module: project_long_term
+#: help:project.phase,constraint_date_start:0
+msgid "force the phase to start after this date"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.phase:0
+msgid "Month"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.model,name:project_long_term.model_account_analytic_account
+msgid "Analytic Account"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,constraint_date_end:0
+msgid "Deadline"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Project User Allocation"
msgstr ""
#. module: project_long_term
@@ -502,8 +452,14 @@ msgid "Schedule Tasks"
msgstr ""
#. module: project_long_term
-#: help:project.phase,duration:0
-msgid "By default in days"
+#: view:project.phase:0
+#: selection:project.phase,state:0
+msgid "Done"
+msgstr ""
+
+#. module: project_long_term
+#: selection:project.compute.phases,target_project:0
+msgid "Compute All My Projects"
msgstr ""
#. module: project_long_term
@@ -512,7 +468,26 @@ msgid "Force Assigned Users"
msgstr ""
#. module: project_long_term
-#: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
-msgid "Scheduling"
+#: view:project.phase:0
+#: field:project.phase,duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: project_long_term
+#: view:project.user.allocation:0
+msgid "Users"
+msgstr ""
+
+#. module: project_long_term
+#: field:project.phase,name:0
+msgid "Name"
+msgstr ""
+
+#. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_resouce_allocation
+#: model:ir.ui.menu,name:project_long_term.menu_resouce_allocation
+#: view:project.phase:0
+#: view:project.user.allocation:0
+msgid "Planning of Users"
msgstr ""
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index 076e1741911..9a3d4228e51 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+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: project_mrp
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
#. module: project_mrp
#: model:process.node,note:project_mrp.process_node_procuretasktask0
msgid "For each product, on type service and on order"
@@ -30,11 +25,6 @@ msgstr ""
msgid "Product type is service, then its creates the task."
msgstr ""
-#. module: project_mrp
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
#. module: project_mrp
#: code:addons/project_mrp/project_procurement.py:93
#, python-format
@@ -61,16 +51,6 @@ msgstr ""
msgid "if product type is 'service' then it creates the task."
msgstr ""
-#. module: project_mrp
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mrp
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: project_mrp
#: model:process.transition,name:project_mrp.process_transition_ordertask0
msgid "Order Task"
@@ -128,11 +108,6 @@ msgstr ""
msgid "Task created."
msgstr ""
-#. module: project_mrp
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
#. module: project_mrp
#: model:process.transition,note:project_mrp.process_transition_ordertask0
msgid "If procurement method is Make to order and supply method is produce"
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index bcd7f8dfde9..047c156a1dd 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Group by year of date"
msgstr ""
#. module: project_timesheet
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
+#: selection:report.timesheet.task.user,month:0
+msgid "June"
msgstr ""
#. module: project_timesheet
@@ -74,12 +74,6 @@ msgstr ""
msgid "Timesheets"
msgstr ""
-#. module: project_timesheet
-#: view:report.timesheet.task.user:0
-#: field:report.timesheet.task.user,year:0
-msgid "Year"
-msgstr ""
-
#. module: project_timesheet
#: view:project.project:0
msgid "Billable"
@@ -106,11 +100,6 @@ msgstr ""
msgid "Analytic account/project"
msgstr ""
-#. module: project_timesheet
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
#. module: project_timesheet
#: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
msgid "Customer Projects"
@@ -149,8 +138,10 @@ msgid "May"
msgstr ""
#. module: project_timesheet
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
+#: code:addons/project_timesheet/project_timesheet.py:93
+#, python-format
+msgid "Please define journal on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
msgstr ""
#. module: project_timesheet
@@ -195,11 +186,6 @@ msgstr ""
msgid "User"
msgstr ""
-#. module: project_timesheet
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
#. module: project_timesheet
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,name:0
@@ -221,11 +207,6 @@ msgstr ""
msgid "Task Hours"
msgstr ""
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_taskwork0
-msgid "Work on task"
-msgstr ""
-
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "February"
@@ -345,8 +326,8 @@ msgid " Timesheets on this project may be invoiced to %s, according to the ter
msgstr ""
#. module: project_timesheet
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
+#: model:process.node,note:project_timesheet.process_node_taskwork0
+msgid "Work on task"
msgstr ""
#. module: project_timesheet
@@ -371,11 +352,6 @@ msgstr ""
msgid "After task is completed, Create its invoice."
msgstr ""
-#. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "June"
-msgstr ""
-
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:266
#, python-format
@@ -388,11 +364,6 @@ msgstr ""
msgid "Month"
msgstr ""
-#. module: project_timesheet
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:57
#, python-format
@@ -405,10 +376,9 @@ msgid "Timesheet Hours"
msgstr ""
#. module: project_timesheet
-#: code:addons/project_timesheet/project_timesheet.py:93
-#, python-format
-msgid "Please define journal on the related employee.\n"
-"Fill in the timesheet tab of the employee form."
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
msgstr ""
#. module: project_timesheet
@@ -416,8 +386,3 @@ msgstr ""
msgid "Fill Timesheet"
msgstr ""
-#. module: project_timesheet
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
-msgstr ""
-
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index ccf61f01b8e..d33163c1470 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-03 16:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -37,71 +37,6 @@ msgid "Allow to configure notification on products and trigger them when a user
" Supplier: don't forget to ask for an express delivery."
msgstr ""
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid "\n"
-" Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''}, Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: \n"
-" REFERENCES If you have any question, do not hesitate to contact us. Thank you! \n"
" "
msgstr ""
-#. module: purchase
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
#. module: purchase
#: selection:purchase.report,month:0
msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:820
+#: code:addons/purchase/purchase.py:837
#, python-format
msgid "Purchase Order for %s cancelled."
msgstr ""
@@ -405,12 +340,6 @@ msgstr ""
msgid "A pick list is generated to track the incoming products."
msgstr ""
-#. module: purchase
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
#. module: purchase
#: model:ir.actions.act_window,name:purchase.purchase_rfq
#: model:ir.ui.menu,name:purchase.menu_purchase_rfq
@@ -432,7 +361,7 @@ msgid "Quantity"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:802
+#: code:addons/purchase/purchase.py:819
#, python-format
msgid "Shipment %s scheduled for %s."
msgstr ""
@@ -490,7 +419,7 @@ msgid "Put an address if you want to deliver directly from the supplier to the c
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:807
+#: code:addons/purchase/purchase.py:824
#, python-format
msgid "Draft Invoice of %s %s is waiting for validation."
msgstr ""
@@ -516,11 +445,6 @@ msgstr ""
msgid "Journal"
msgstr ""
-#. module: purchase
-#: constraint:product.template:0
-msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
-msgstr ""
-
#. module: purchase
#: view:board.board:0
#: model:ir.actions.act_window,name:purchase.purchase_draft
@@ -537,11 +461,6 @@ msgstr ""
msgid "Purchase orders that include lines not invoiced."
msgstr ""
-#. module: purchase
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
#. module: purchase
#: view:product.product:0
#: field:product.template,purchase_ok:0
@@ -565,11 +484,6 @@ msgstr ""
msgid "Purchase Lead Time"
msgstr ""
-#. module: purchase
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
#. module: purchase
#: model:process.transition,note:purchase.process_transition_invoicefrompurchase0
msgid "The invoice is created automatically if the Invoice control of the purchase order is 'On order'. The invoice can also be generated manually by the accountant (Invoice control = Manual)."
@@ -615,7 +529,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:508
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -704,8 +618,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:548
-#: code:addons/purchase/purchase.py:555
+#: code:addons/purchase/purchase.py:565
+#: code:addons/purchase/purchase.py:572
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -721,9 +635,8 @@ msgid "Reception Analysis allows you to easily check and analyse your company or
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: view:purchase.order:0
+msgid "Print"
msgstr ""
#. module: purchase
@@ -827,7 +740,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1141
+#: code:addons/purchase/purchase.py:1158
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -837,11 +750,6 @@ msgstr ""
msgid "Product Categories"
msgstr ""
-#. module: purchase
-#: view:purchase.order:0
-msgid "Send Request for Quotation"
-msgstr ""
-
#. module: purchase
#: help:purchase.order,invoiced:0
msgid "It indicates that an invoice has been paid"
@@ -940,11 +848,6 @@ msgstr ""
msgid "Qty"
msgstr ""
-#. module: purchase
-#: model:res.groups,name:purchase.group_delivery_invoice_address
-msgid "Addresses in Purchase Orders"
-msgstr ""
-
#. module: purchase
#: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
#: model:process.transition.action,name:purchase.process_transition_action_cancelpurchaseorder0
@@ -995,7 +898,7 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:789
+#: code:addons/purchase/purchase.py:806
#, python-format
msgid "Request for quotation created."
msgstr ""
@@ -1005,11 +908,6 @@ msgstr ""
msgid "a draft purchase order"
msgstr ""
-#. module: purchase
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
#. module: purchase
#: view:purchase.report:0
msgid "Order of Year"
@@ -1032,9 +930,9 @@ msgid "In case there is no supplier for this product, the buyer can fill the for
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,module_purchase_double_validation:0
-msgid "Provide a double validation mechanism for purchases exceeding minimum amount.\n"
-" This installs the module purchase_double_validation."
+#: help:purchase.config.settings,group_purchase_pricelist:0
+msgid "Allows to manage different prices based on rules per category of Supplier.\n"
+" Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
#. module: purchase
@@ -1043,11 +941,16 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:420
+#: code:addons/purchase/purchase.py:437
#, python-format
msgid "You cannot confirm a purchase order without any purchase order line."
msgstr ""
+#. module: purchase
+#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
+msgid "Purchase: Mark unread"
+msgstr ""
+
#. module: purchase
#: help:purchase.order,message_ids:0
msgid "Messages and communication history"
@@ -1060,7 +963,7 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:973
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure."
msgstr ""
@@ -1077,7 +980,7 @@ msgid "Manage pricelist per supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:816
+#: code:addons/purchase/purchase.py:833
#, python-format
msgid "Purchase Order has been set to draft."
msgstr ""
@@ -1088,7 +991,7 @@ msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:549
+#: code:addons/purchase/purchase.py:566
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1136,11 +1039,6 @@ msgstr ""
msgid "Set to Draft"
msgstr ""
-#. module: purchase
-#: field:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allow a different address for incoming products and invoicing"
-msgstr ""
-
#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
@@ -1171,7 +1069,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:252
+#: code:addons/purchase/purchase.py:255
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1264,7 +1162,7 @@ msgid "a draft\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
+#: code:addons/purchase/purchase.py:310
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1352,18 +1250,18 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1116
+#: code:addons/purchase/purchase.py:1133
#, python-format
msgid "PO: %s"
msgstr ""
#. module: purchase
-#: model:process.node,note:purchase.process_node_packinginvoice0
-msgid "Outgoing products to invoice"
+#: view:purchase.order:0
+msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:481
+#: code:addons/purchase/purchase.py:498
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1446,8 +1344,8 @@ msgid "Invoice"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this product, OpenERP will trigger"
+#: model:process.node,note:purchase.process_node_purchaseorder0
+msgid "Confirmed purchase order to invoice"
msgstr ""
#. module: purchase
@@ -1525,7 +1423,7 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:337
+#: code:addons/purchase/purchase.py:340
#: code:addons/purchase/wizard/purchase_line_invoice.py:141
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
@@ -1571,11 +1469,6 @@ msgstr ""
msgid "Invoice Received"
msgstr ""
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_unread
-msgid "Mark unread"
-msgstr ""
-
#. module: purchase
#: field:purchase.order,invoice_method:0
msgid "Invoicing Control"
@@ -1635,6 +1528,11 @@ msgstr ""
msgid "Open Purchase Menu"
msgstr ""
+#. module: purchase
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr ""
+
#. module: purchase
#: field:purchase.order,company_id:0
#: field:purchase.order.line,company_id:0
@@ -1701,10 +1599,10 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:307
-#: code:addons/purchase/purchase.py:420
-#: code:addons/purchase/purchase.py:480
-#: code:addons/purchase/purchase.py:491
+#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:497
+#: code:addons/purchase/purchase.py:508
#: code:addons/purchase/wizard/purchase_line_invoice.py:109
#, python-format
msgid "Error!"
@@ -1738,7 +1636,7 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:810
+#: code:addons/purchase/purchase.py:827
#, python-format
msgid "Shipment received."
msgstr ""
@@ -1753,11 +1651,6 @@ msgstr ""
msgid "Resend Purchase Order"
msgstr ""
-#. module: purchase
-#: help:purchase.config.settings,group_purchase_delivery_address:0
-msgid "Allows you to specify different delivery and invoice addresses on a purchase order."
-msgstr ""
-
#. module: purchase
#: report:purchase.order:0
msgid "Net Price"
@@ -1781,11 +1674,6 @@ msgstr ""
msgid "Based on receptions"
msgstr ""
-#. module: purchase
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
#. module: purchase
#: field:purchase.order,partner_ref:0
msgid "Supplier Reference"
@@ -1813,11 +1701,6 @@ msgstr ""
msgid "Invoice Lines"
msgstr ""
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Mark read"
-msgstr ""
-
#. module: purchase
#: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
msgid "Purchase Analysis allows you to easily check and analyse your company purchase history and performance. From this menu you can track your negotiation performance, the delivery performance of your suppliers, etc."
@@ -1829,7 +1712,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:971
+#: code:addons/purchase/purchase.py:988
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1850,9 +1733,9 @@ msgid "Configuration"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_purchase_pricelist:0
-msgid "Allows to manage different prices based on rules per category of Supplier.\n"
-" Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+#: help:purchase.config.settings,module_purchase_double_validation:0
+msgid "Provide a double validation mechanism for purchases exceeding minimum amount.\n"
+" This installs the module purchase_double_validation."
msgstr ""
#. module: purchase
@@ -1867,6 +1750,11 @@ msgstr ""
msgid "Reference Unit of Measure"
msgstr ""
+#. module: purchase
+#: model:process.node,note:purchase.process_node_packinginvoice0
+msgid "Outgoing products to invoice"
+msgstr ""
+
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
@@ -1971,11 +1859,6 @@ msgstr ""
msgid "January"
msgstr ""
-#. module: purchase
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
#. module: purchase
#: help:purchase.order,invoice_method:0
msgid "Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n"
@@ -2008,6 +1891,71 @@ msgstr ""
msgid "Invoicing Settings"
msgstr ""
+#. module: purchase
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid "\n"
+" Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''}, Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: \n"
+" REFERENCES If you have any question, do not hesitate to contact us. Thank you! \n"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_line_invoice.py:109
#, 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"
@@ -1876,7 +1884,7 @@ msgid "Prepare invoices based on timesheets"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:689
+#: code:addons/sale/sale.py:655
#, python-format
msgid "Sale Order for %s cancelled."
msgstr ""
@@ -1923,7 +1931,7 @@ msgid "from stock"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:989
+#: code:addons/sale/sale.py:968
#, python-format
msgid "No Pricelist ! : "
msgstr ""
@@ -1957,7 +1965,6 @@ msgstr ""
#. module: sale
#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
msgid "Do you really want to create the invoice(s)?"
msgstr ""
@@ -2006,11 +2013,6 @@ msgstr ""
msgid "What do you want to invoice?"
msgstr ""
-#. module: sale
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
#. module: sale
#: field:sale.order.line,sequence:0
msgid "Sequence"
@@ -2048,3 +2050,8 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: sale
+#: view:sale.order.line.make.invoice:0
+msgid "Do you want to invoice the selected sale order lines?"
+msgstr ""
+
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index dac62d5ed51..af9d5788df2 100644
--- a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
+++ b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,11 +20,6 @@ msgstr ""
msgid "Analytic Distribution"
msgstr ""
-#. module: sale_analytic_plans
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
#. module: sale_analytic_plans
#: model:ir.model,name:sale_analytic_plans.model_sale_order
msgid "Sales Order"
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index dbb0b44b0dd..3b652c1dfd3 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,46 +15,10 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: sale_crm
-#: field:crm.make.sale,partner_id:0
-msgid "Customer"
-msgstr ""
-
-#. module: sale_crm
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale_crm
-#: view:sale.order:0
-msgid "My Sales Team(s)"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model,name:sale_crm.model_crm_make_sale
-msgid "Make sales"
-msgstr ""
-
-#. module: sale_crm
-#: model:ir.model,name:sale_crm.model_sale_order
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale_crm
-#: help:crm.make.sale,close:0
-msgid "Check this to close the opportunity after having created the sale order."
-msgstr ""
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:93
-#, python-format
-msgid "Opportunity: %s"
-msgstr ""
-
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:90
#, python-format
-msgid "No addresse(s) defined for this customer."
+msgid "Insufficient Data!"
msgstr ""
#. module: sale_crm
@@ -64,6 +28,94 @@ msgid "Convert to Quotation"
msgstr ""
#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_account_invoice_report
+msgid "Invoices Statistics"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,close:0
+msgid "Mark Won"
+msgstr ""
+
+#. module: sale_crm
+#: field:res.users,default_section_id:0
+msgid "Default Sales Team"
+msgstr ""
+
+#. module: sale_crm
+#: view:sale.order:0
+msgid "My Sales Team(s)"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: sale_crm
+#: help:crm.make.sale,close:0
+msgid "Check this to close the opportunity after having created the sale order."
+msgstr ""
+
+#. module: sale_crm
+#: field:sale.order,categ_ids:0
+msgid "Categories"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:124
+#: code:addons/sale_crm/wizard/crm_make_sale.py:135
+#, python-format
+msgid "Quotation"
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_crm
+#: view:crm.make.sale:0
+msgid "_Create"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_crm_make_sale
+msgid "Make sales"
+msgstr ""
+
+#. module: sale_crm
+#: model:ir.model,name:sale_crm.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:93
+#, python-format
+msgid "Opportunity: %s"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:110
+#, python-format
+msgid "Opportunity has been converted to the quotation %s."
+msgstr ""
+
+#. module: sale_crm
+#: field:crm.make.sale,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale_crm
+#: code:addons/sale_crm/wizard/crm_make_sale.py:90
+#, python-format
+msgid "No addresse(s) defined for this customer."
+msgstr ""
+
+#. module: sale_crm
+#: view:account.invoice:0
+#: field:account.invoice,section_id:0
+#: field:account.invoice.report,section_id:0
#: view:sale.order:0
#: field:sale.order,section_id:0
msgid "Sales Team"
@@ -74,43 +126,19 @@ msgstr ""
msgid "Create Quotation"
msgstr ""
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:110
-#, python-format
-msgid "Opportunity has been converted to the quotation %s."
-msgstr ""
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:90
-#, python-format
-msgid "Insufficient Data!"
-msgstr ""
-
#. module: sale_crm
#: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
msgid "Make Quotation"
msgstr ""
-#. module: sale_crm
-#: view:crm.make.sale:0
-msgid "_Create"
-msgstr ""
-
#. module: sale_crm
#: view:crm.make.sale:0
msgid "Cancel"
msgstr ""
#. module: sale_crm
-#: field:crm.make.sale,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale_crm
-#: code:addons/sale_crm/wizard/crm_make_sale.py:124
-#: code:addons/sale_crm/wizard/crm_make_sale.py:135
-#, python-format
-msgid "Quotation"
+#: model:ir.model,name:sale_crm.model_sale_order
+msgid "Sales Order"
msgstr ""
#. module: sale_crm
@@ -118,13 +146,3 @@ msgstr ""
msgid "or"
msgstr ""
-#. module: sale_crm
-#: field:sale.order,categ_ids:0
-msgid "Categories"
-msgstr ""
-
-#. module: sale_crm
-#: field:crm.make.sale,close:0
-msgid "Mark Won"
-msgstr ""
-
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index 5482f2df54b..4905681a2c3 100644
--- a/addons/sale_journal/i18n/sale_journal.pot
+++ b/addons/sale_journal/i18n/sale_journal.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale_journal
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
+#: field:sale_journal.invoice.type,note:0
+msgid "Note"
+msgstr ""
+
+#. module: sale_journal
+#: field:res.partner,property_invoice_type:0
+msgid "Invoicing Type"
msgstr ""
#. module: sale_journal
@@ -30,6 +35,63 @@ msgstr ""
msgid "Sales & Purchases"
msgstr ""
+#. module: sale_journal
+#: view:res.partner:0
+msgid "Invoicing"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.model,name:sale_journal.model_stock_picking_in
+msgid "Incoming Shipments"
+msgstr ""
+
+#. module: sale_journal
+#: help:sale_journal.invoice.type,active:0
+msgid "If the active field is set to False, it will allow you to hide the invoice type without removing it."
+msgstr ""
+
+#. module: sale_journal
+#: view:sale_journal.invoice.type:0
+msgid "Notes"
+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_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_journal
+#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
+#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
+#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
+msgid "Invoice Types"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Non grouped"
+msgstr ""
+
+#. module: sale_journal
+#: selection:sale_journal.invoice.type,invoicing_method:0
+msgid "Grouped"
+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
+#: help:sale.order,invoice_type_id:0
+msgid "Generate invoice based on the selected option."
+msgstr ""
+
#. module: sale_journal
#: view:sale.order:0
#: field:sale.order,invoice_type_id:0
@@ -44,95 +106,11 @@ msgstr ""
msgid "Invoice Type"
msgstr ""
-#. module: sale_journal
-#: field:sale_journal.invoice.type,note:0
-msgid "Note"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Grouped"
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale_journal
-#: view:res.partner:0
-msgid "Invoicing"
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.model,name:sale_journal.model_stock_picking_in
-msgid "Incoming Shipments"
-msgstr ""
-
-#. module: sale_journal
-#: help:sale.order,invoice_type_id:0
-msgid "Generate invoice based on the selected option."
-msgstr ""
-
-#. module: sale_journal
-#: field:sale_journal.invoice.type,invoicing_method:0
-msgid "Invoicing method"
-msgstr ""
-
#. module: sale_journal
#: field:sale_journal.invoice.type,active:0
msgid "Active"
msgstr ""
-#. module: sale_journal
-#: help:sale_journal.invoice.type,active:0
-msgid "If the active field is set to False, it will allow you to hide the invoice type without removing it."
-msgstr ""
-
-#. module: sale_journal
-#: view:sale_journal.invoice.type:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale_journal
-#: selection:sale_journal.invoice.type,invoicing_method:0
-msgid "Non grouped"
-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
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.in:0
-#: sql_constraint:stock.picking.out:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale_journal
-#: field:res.partner,property_invoice_type:0
-msgid "Invoicing Type"
-msgstr ""
-
-#. module: sale_journal
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
-msgstr ""
-
-#. module: sale_journal
-#: model:ir.actions.act_window,name:sale_journal.action_definition_journal_invoice_type
-#: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
-#: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
-msgid "Invoice Types"
-msgstr ""
-
-#. module: sale_journal
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
#. module: sale_journal
#: model:ir.model,name:sale_journal.model_res_partner
msgid "Partner"
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index 835e26a4594..10e5c4a1465 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,21 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: sale_margin
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
#. module: sale_margin
#: field:sale.order.line,purchase_price:0
msgid "Cost Price"
msgstr ""
-#. module: sale_margin
-#: help:sale.order,margin:0
-msgid "It gives profitability by calculating the difference between the Unit Price and the cost price."
-msgstr ""
-
#. module: sale_margin
#: model:ir.model,name:sale_margin.model_sale_order
msgid "Sales Order"
@@ -46,3 +36,8 @@ msgstr ""
msgid "Sales Order Line"
msgstr ""
+#. module: sale_margin
+#: help:sale.order,margin:0
+msgid "It gives profitability by calculating the difference between the Unit Price and the cost price."
+msgstr ""
+
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 4639a73248f..45a8960fa4b 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,38 +15,28 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
-#. module: sale_mrp
-#: help:mrp.production,sale_ref:0
-msgid "Indicate the Customer Reference from sales order."
-msgstr ""
-
-#. module: sale_mrp
-#: field:mrp.production,sale_name:0
-msgid "Sale Name"
-msgstr ""
-
#. module: sale_mrp
#: model:ir.model,name:sale_mrp.model_mrp_production
msgid "Manufacturing Order"
msgstr ""
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sales order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sales order."
+msgstr ""
+
#. module: sale_mrp
#: field:mrp.production,sale_ref:0
msgid "Sale Reference"
msgstr ""
#. module: sale_mrp
-#: sql_constraint:mrp.production:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale_mrp
-#: constraint:mrp.production:0
-msgid "Order quantity cannot be negative or zero!"
-msgstr ""
-
-#. module: sale_mrp
-#: help:mrp.production,sale_name:0
-msgid "Indicate the name of sales order."
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
msgstr ""
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 4983a044b7c..99620d3e442 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+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: sale_order_dates
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
#. module: sale_order_dates
#: view:sale.order:0
msgid "Dates"
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 083870ea53b..950c5e64ffd 100644
--- a/addons/sale_stock/i18n/sale_stock.pot
+++ b/addons/sale_stock/i18n/sale_stock.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,6 +36,12 @@ msgstr ""
msgid "Allows you to specify different delivery and invoice addresses on a sale order."
msgstr ""
+#. module: sale_stock
+#: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:569
#, python-format
@@ -186,11 +192,6 @@ msgstr ""
msgid "The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts."
msgstr ""
-#. module: sale_stock
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
#. module: sale_stock
#: help:res.company,security_lead:0
msgid "This is the days added to what you promise to customers for security purpose"
@@ -351,11 +352,6 @@ msgstr ""
msgid "Properties"
msgstr ""
-#. module: sale_stock
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
#. module: sale_stock
#: field:sale.config.settings,group_mrp_properties:0
msgid "Product properties on order lines"
@@ -366,11 +362,6 @@ msgstr ""
msgid "You can generate invoices based on sales orders or based on shippings."
msgstr ""
-#. module: sale_stock
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_report
msgid "Sales Orders Statistics"
@@ -389,12 +380,6 @@ msgid "Lets you transfer the entries under tasks defined for Project Management
" This installs the modules project_timesheet and project_mrp."
msgstr ""
-#. module: sale_stock
-#: sql_constraint:stock.picking:0
-#: sql_constraint:stock.picking.out:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
#. module: sale_stock
#: model:process.node,note:sale_stock.process_node_saleprocurement0
msgid "One Procurement order for each sales order line and for each of the components."
@@ -450,11 +435,6 @@ msgstr ""
msgid "Number Packages"
msgstr ""
-#. module: sale_stock
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
#. module: sale_stock
#: field:sale.order,shipped:0
msgid "Delivered"
@@ -497,11 +477,6 @@ msgstr ""
msgid "Incoterm"
msgstr ""
-#. module: sale_stock
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
#. module: sale_stock
#: code:addons/sale_stock/sale_stock.py:521
#, python-format
@@ -528,11 +503,6 @@ msgstr ""
msgid "Related Picking"
msgstr ""
-#. module: sale_stock
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
#. module: sale_stock
#: model:ir.model,name:sale_stock.model_sale_config_settings
msgid "sale.config.settings"
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index 17571b1813c..dc77004aba4 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -164,11 +164,6 @@ msgstr ""
msgid "Optional domain for further data filtering"
msgstr ""
-#. module: share
-#: sql_constraint:res.users:0
-msgid "You can not have two users with the same login !"
-msgstr ""
-
#. module: share
#: view:share.wizard:0
msgid "Next"
@@ -214,11 +209,6 @@ msgstr ""
msgid "Please select the action that opens the screen containing the data you want to share."
msgstr ""
-#. module: share
-#: sql_constraint:res.users:0
-msgid "OAuth UID must be unique per provider"
-msgstr ""
-
#. module: share
#: field:res.groups,share:0
msgid "Share Group"
@@ -308,11 +298,6 @@ msgstr ""
msgid "The action that opens the screen containing the data you wish to share."
msgstr ""
-#. module: share
-#: constraint:res.users:0
-msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
-
#. module: share
#: code:addons/share/wizard/share_wizard.py:541
#, python-format
@@ -346,11 +331,6 @@ msgstr ""
msgid "You must configure your email address in the user preferences before using the Share button."
msgstr ""
-#. module: share
-#: sql_constraint:res.groups:0
-msgid "The name of the group must be unique !"
-msgstr ""
-
#. module: share
#: model:res.groups,name:share.group_share_user
msgid "User"
@@ -596,11 +576,6 @@ msgstr ""
msgid "or"
msgstr ""
-#. module: share
-#: constraint:res.users:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
#. module: share
#: help:share.wizard,access_mode:0
msgid "Access rights to be granted on the shared documents."
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 20d5605b99f..d62666475ac 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:51+0000\n"
-"PO-Revision-Date: 2012-11-24 02:51+0000\n"
+"POT-Creation-Date: 2012-12-03 16:02+0000\n"
+"PO-Revision-Date: 2012-12-03 16:02+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -551,6 +551,12 @@ msgstr ""
msgid "Location & Warehouse"
msgstr ""
+#. module: stock
+#: code:addons/stock/stock.py:1848
+#, python-format
+msgid "Quantities, Units of Measure, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)."
+msgstr ""
+
#. module: stock
#: help:report.stock.move,type:0
#: help:stock.picking,type:0
@@ -774,11 +780,6 @@ msgstr ""
msgid "Analyse Current Inventory"
msgstr ""
-#. module: stock
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
-msgstr ""
-
#. module: stock
#: code:addons/stock/stock.py:1202
#, python-format
@@ -807,11 +808,6 @@ msgstr ""
msgid "Procurement Location"
msgstr ""
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Recipient"
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,name:stock.action_location_tree
#: model:ir.ui.menu,name:stock.menu_action_location_tree
@@ -847,11 +843,6 @@ msgstr ""
msgid "Summary"
msgstr ""
-#. module: stock
-#: help:stock.location,chained_picking_type:0
-msgid "Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."
-msgstr ""
-
#. module: stock
#: view:product.category:0
msgid "Account Stock Properties"
@@ -972,11 +963,6 @@ msgstr ""
msgid "Change Product Quantity"
msgstr ""
-#. module: stock
-#: model:ir.model,name:stock.model_stock_inventory_merge
-msgid "Merge Inventory"
-msgstr ""
-
#. module: stock
#: code:addons/stock/product.py:459
#, python-format
@@ -1013,11 +999,6 @@ msgstr ""
msgid "Please define journal on the product category: \"%s\" (id: %d)"
msgstr ""
-#. module: stock
-#: report:stock.picking.list:0
-msgid "Expected Shipping Date"
-msgstr ""
-
#. module: stock
#: view:stock.move:0
msgid "Details"
@@ -1068,11 +1049,6 @@ msgstr ""
msgid "is scheduled %s."
msgstr ""
-#. module: stock
-#: constraint:product.template:0
-msgid "Error: The default Unit of Measure and the purchase Unit of Measure must be in the same category."
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
msgid "Create Draft Invoices"
@@ -1090,11 +1066,6 @@ msgstr ""
msgid "Ready to Receive"
msgstr ""
-#. module: stock
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
#. module: stock
#: view:stock.move:0
#: view:stock.picking:0
@@ -1175,11 +1146,6 @@ msgstr ""
msgid "Stock Valuation Account"
msgstr ""
-#. module: stock
-#: constraint:res.partner:0
-msgid "Error: Invalid ean code"
-msgstr ""
-
#. module: stock
#: view:stock.config.settings:0
msgid "Apply"
@@ -1202,22 +1168,8 @@ msgid "Please define journal on the product category: \"%s\" (id: %d)."
msgstr ""
#. module: stock
-#: model:res.company,follow_up_msg:stock.res_company_1
-#: model:res.company,follow_up_msg:stock.res_company_2
-msgid "\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Please find in attachment a reminder of all your unpaid invoices, for a total amount due of:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-" "
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
msgstr ""
#. module: stock
@@ -1966,8 +1918,9 @@ msgid "_Deliver"
msgstr ""
#. module: stock
-#: view:stock.location:0
-msgid "Customer Locations"
+#: code:addons/stock/wizard/stock_inventory_merge.py:64
+#, python-format
+msgid "Merging is only allowed on draft inventories."
msgstr ""
#. module: stock
@@ -2048,12 +2001,8 @@ msgid "Return Shipment"
msgstr ""
#. module: stock
-#: model:ir.model,name:stock.model_stock_inventory
-#: selection:report.stock.inventory,location_type:0
-#: field:stock.inventory.line,inventory_id:0
-#: report:stock.inventory.move:0
-#: selection:stock.location,usage:0
-msgid "Inventory"
+#: model:ir.model,name:stock.model_stock_inventory_merge
+msgid "Merge Inventory"
msgstr ""
#. module: stock
@@ -2207,9 +2156,8 @@ msgid "Logistical shipping unit: pallet, box, pack ..."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:64
-#, python-format
-msgid "Merging is only allowed on draft inventories."
+#: view:stock.location:0
+msgid "Customer Locations"
msgstr ""
#. module: stock
@@ -2314,11 +2262,6 @@ msgstr ""
msgid "Move date: scheduled date until move is done, then date of actual move processing"
msgstr ""
-#. module: stock
-#: field:report.stock.lines.date,date:0
-msgid "Latest Inventory Date"
-msgstr ""
-
#. module: stock
#: view:report.stock.inventory:0
#: view:report.stock.move:0
@@ -2393,11 +2336,6 @@ msgstr ""
msgid "Current quantity of products with this Serial Number available in company warehouses"
msgstr ""
-#. module: stock
-#: view:stock.move:0
-msgid "Tracability"
-msgstr ""
-
#. module: stock
#: view:stock.inventory:0
msgid "Set to Draft"
@@ -2969,6 +2907,7 @@ msgstr ""
#: field:stock.move.split.lines,prodlot_id:0
#: field:stock.partial.move.line,prodlot_id:0
#: field:stock.partial.picking.line,prodlot_id:0
+#: report:stock.picking.list:0
#: view:stock.production.lot:0
#: field:stock.production.lot,name:0
#: field:stock.production.lot.revision,lot_id:0
@@ -3230,12 +3169,6 @@ msgstr ""
msgid "Process Entirely"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1848
-#, python-format
-msgid "Quantities, Unit of Measures, Products and Locations cannot be modified on stock moves that have already been processed (except by the Administrator)."
-msgstr ""
-
#. module: stock
#: help:product.template,property_stock_procurement:0
msgid "This stock location will be used, instead of the default one, as the source location for stock moves generated by procurements."
@@ -4406,6 +4339,11 @@ msgstr ""
msgid "Delays"
msgstr ""
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Schedule Date"
+msgstr ""
+
#. module: stock
#: field:stock.location.product,to_date:0
msgid "To"
@@ -4610,8 +4548,17 @@ msgid "By default, the pack reference is generated following the sscc standard.
msgstr ""
#. module: stock
-#: constraint:res.partner:0
-msgid "Error ! You cannot create recursive associated members."
+#: model:ir.model,name:stock.model_stock_inventory
+#: selection:report.stock.inventory,location_type:0
+#: field:stock.inventory.line,inventory_id:0
+#: report:stock.inventory.move:0
+#: selection:stock.location,usage:0
+msgid "Inventory"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,chained_picking_type:0
+msgid "Shipping Type of the Picking List that will contain the chained move (leave empty to automatically detect the type based on the source and destination locations)."
msgstr ""
#. module: stock
@@ -4620,11 +4567,6 @@ msgstr ""
msgid "The rounding of the initial uom does not allow you to ship \"%s %s\", as it would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is accepted by the uom."
msgstr ""
-#. module: stock
-#: constraint:product.category:0
-msgid "Error ! You cannot create recursive categories."
-msgstr ""
-
#. module: stock
#: help:stock.move,move_dest_id:0
msgid "Optional: next stock move when chaining them"
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index 8a4209d7617..5d1487a29cb 100644
--- a/addons/stock_location/i18n/stock_location.pot
+++ b/addons/stock_location/i18n/stock_location.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -68,11 +68,6 @@ msgstr ""
msgid "Location used by Destination Location to supply"
msgstr ""
-#. module: stock_location
-#: constraint:stock.move:0
-msgid "You must assign a serial number for this product."
-msgstr ""
-
#. module: stock_location
#: selection:product.pulled.flow,picking_type:0
#: selection:stock.location.path,picking_type:0
@@ -143,8 +138,9 @@ msgid "Pulled flows"
msgstr ""
#. module: stock_location
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
msgstr ""
#. module: stock_location
@@ -214,11 +210,6 @@ msgstr ""
msgid "These rules set the right path of the product in the whole location tree."
msgstr ""
-#. module: stock_location
-#: constraint:stock.move:0
-msgid "You cannot move products from or to a location of the type view."
-msgstr ""
-
#. module: stock_location
#: selection:stock.location.path,auto:0
msgid "Manual Operation"
@@ -246,11 +237,6 @@ msgstr ""
msgid "Is the destination location that needs supplying"
msgstr ""
-#. module: stock_location
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product."
-msgstr ""
-
#. module: stock_location
#: field:stock.location.path,product_id:0
msgid "Products"
@@ -289,12 +275,6 @@ msgstr ""
msgid "Move for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
msgstr ""
-#. module: stock_location
-#: field:product.pulled.flow,journal_id:0
-#: field:stock.location.path,journal_id:0
-msgid "Journal"
-msgstr ""
-
#. module: stock_location
#: model:ir.model,name:stock_location.model_procurement_order
msgid "Procurement"
@@ -318,11 +298,6 @@ msgstr ""
msgid "Getting Goods"
msgstr ""
-#. module: stock_location
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
#. module: stock_location
#: view:product.product:0
msgid "Action Type"
@@ -355,9 +330,9 @@ msgid "Location Paths"
msgstr ""
#. module: stock_location
-#: field:product.pulled.flow,company_id:0
-#: field:stock.location.path,company_id:0
-msgid "Company"
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
msgstr ""
#. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
index 48ae2df3cc1..f9b0757ba6d 100644
--- a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
+++ b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-24 02:54+0000\n"
-"PO-Revision-Date: 2012-11-24 02:54+0000\n"
+"POT-Creation-Date: 2012-12-03 16:04+0000\n"
+"PO-Revision-Date: 2012-12-03 16:04+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: stock_no_autopicking
-#: model:ir.model,name:stock_no_autopicking.model_product_product
-msgid "Product"
-msgstr ""
-
#. module: stock_no_autopicking
#: model:ir.model,name:stock_no_autopicking.model_mrp_production
msgid "Manufacturing Order"
msgstr ""
#. module: stock_no_autopicking
-#: sql_constraint:product.product:0
-msgid "Error ! Ending Date cannot be set before Beginning Date."
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
msgstr ""
#. module: stock_no_autopicking
@@ -40,18 +35,3 @@ msgstr ""
msgid "Auto picking for raw materials of production orders."
msgstr ""
-#. module: stock_no_autopicking
-#: sql_constraint:mrp.production:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: stock_no_autopicking
-#: constraint:mrp.production:0
-msgid "Order quantity cannot be negative or zero!"
-msgstr ""
-
-#. module: stock_no_autopicking
-#: constraint:product.product:0
-msgid "You provided an invalid \"EAN13 Barcode\" reference. You may use the \"Internal Reference\" field instead."
-msgstr ""
-
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
deleted file mode 100644
index 2f27d66ad8a..00000000000
--- a/addons/stock_planning/i18n/zh_CN.po
+++ /dev/null
@@ -1,1664 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR
\n"
-" Order number: ${object.name}
\n"
-" Order total: ${object.amount_total} ${object.pricelist_id.currency_id.name}
\n"
-" Order date: ${object.date_order}
\n"
-" % if object.origin:\n"
-" Order reference: ${object.origin}
\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" Your reference: ${object.partner_ref}
\n"
-" % endif\n"
-" % if object.user_id:\n"
-" Your contact: ${object.validator.name}\n"
-" % endif\n"
-"
\n"
-"
\n"
-"
\n"
-" \n"
-" ${object.company_id.name}
\n"
-"
\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}
\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}
\n"
-" % endif\n"
-" % if object.company_id.country_id:\n"
-" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n"
-" % endif\n"
-" \n"
-" % if object.company_id.phone:\n"
-"
\n"
+" Order number: ${object.name}
\n"
+" Order total: ${object.amount_total} ${object.pricelist_id.currency_id.name}
\n"
+" Order date: ${object.date_order}
\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}
\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" Your reference: ${object.partner_ref}
\n"
+" % endif\n"
+" % if object.validator:\n"
+" Your contact: ${object.validator.name}\n"
+" % endif\n"
+"
\n"
+"
\n"
+"
\n"
+" \n"
+" ${object.company_id.name}
\n"
+"
\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}
\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}
\n"
+" % endif\n"
+" % if object.company_id.country_id:\n"
+" ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
\n"
+" % endif\n"
+" \n"
+" % if object.company_id.phone:\n"
+"