diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index ffeb66fbc86a06a4b4ede3f5ca4b30080b41b183..12661a8ee22fa55468f883cd5ecab5011e25caba 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,11 +25,6 @@ msgstr ""
msgid "An account fiscal position could be defined only once time on same accounts."
msgstr ""
-#. module: account
-#: view:account.unreconcile:0
-msgid "Unreconciliate Transactions"
-msgstr ""
-
#. module: account
#: help:account.tax.code,sequence:0
msgid "Determine the display order in the report 'Accounting \\ Reporting \\ Generic Reporting \\ Taxes \\ Taxes Report'"
@@ -74,9 +69,9 @@ msgid "Import from invoice or payment"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1048
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1198
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1211
#, python-format
msgid "Bad Account!"
msgstr ""
@@ -87,11 +82,6 @@ msgstr ""
msgid "Total Debit"
msgstr ""
-#. module: account
-#: view:account.unreconcile:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"
-msgstr ""
-
#. module: account
#: constraint:account.account.template:0
msgid "Error!\n"
@@ -101,7 +91,6 @@ 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
@@ -128,19 +117,19 @@ msgid "If the active field is set to False, it will allow you to hide the paymen
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
-#: 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:1519
+#: code:addons/account/account.py:641
+#: code:addons/account/account.py:686
+#: code:addons/account/account.py:781
+#: code:addons/account/account.py:1049
+#: code:addons/account/account_invoice.py:792
+#: code:addons/account/account_invoice.py:795
+#: code:addons/account/account_invoice.py:798
+#: code:addons/account/account_invoice.py:1509
#: code:addons/account/account_move_line.py:98
-#: 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/account_move_line.py:774
+#: code:addons/account/account_move_line.py:783
+#: code:addons/account/account_move_line.py:827
+#: code:addons/account/account_move_line.py:867
#: 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
@@ -152,7 +141,7 @@ msgid "Warning!"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3139
+#: code:addons/account/account.py:3149
#, python-format
msgid "Miscellaneous Journal"
msgstr ""
@@ -211,11 +200,6 @@ msgstr ""
msgid "Tax Templates"
msgstr ""
-#. module: account
-#: model:ir.model,name:account.model_account_tax
-msgid "account.tax"
-msgstr ""
-
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
@@ -231,6 +215,11 @@ msgstr ""
msgid "Belgian Reports"
msgstr ""
+#. module: account
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
#. module: account
#: model:account.account.type,name:account.account_type_income_view1
msgid "Income View"
@@ -345,11 +334,6 @@ msgstr ""
msgid "Salesperson"
msgstr ""
-#. module: account
-#: model:ir.model,name:account.model_account_tax_template
-msgid "account.tax.template"
-msgstr ""
-
#. module: account
#: view:account.bank.statement:0
#: view:account.invoice:0
@@ -401,6 +385,11 @@ 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
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
#. module: account
#. openerp-web
#: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
@@ -416,6 +405,11 @@ msgstr ""
msgid "Chart Template"
msgstr ""
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
#. module: account
#: help:account.config.settings,tax_calculation_rounding_method:0
msgid "If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."
@@ -569,11 +563,6 @@ msgstr ""
msgid "3 Monthly"
msgstr ""
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr ""
-
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
@@ -620,7 +609,7 @@ msgid "Profit Account"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1144
+#: code:addons/account/account_move_line.py:1157
#, python-format
msgid "No period found or more than one period found for the given date."
msgstr ""
@@ -631,13 +620,13 @@ msgid "Report of the Sales by Account Type"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3143
+#: code:addons/account/account.py:3153
#, python-format
msgid "SAJ"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1546
+#: code:addons/account/account.py:1551
#, python-format
msgid "Cannot create move with currency different from .."
msgstr ""
@@ -694,6 +683,11 @@ msgstr ""
msgid "Configure your company bank accounts"
msgstr ""
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
#. module: account
#: 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."
@@ -714,6 +708,12 @@ msgstr ""
msgid "Are you sure you want to create entries?"
msgstr ""
+#. module: account
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
#. module: account
#: view:account.invoice:0
msgid "Print Invoice"
@@ -732,6 +732,7 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
+#: selection:account.tax.template,type:0
msgid "Percent"
msgstr ""
@@ -774,7 +775,7 @@ msgid "Type"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:782
+#: code:addons/account/account_invoice.py:798
#, python-format
msgid "Taxes are missing!\n"
"Click on compute button."
@@ -796,24 +797,18 @@ msgid "Supplier Invoices And Refunds"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:847
+#: code:addons/account/account_move_line.py:854
#, python-format
msgid "Entry is already reconciled."
msgstr ""
#. module: account
#: view:account.move.line.unreconcile.select:0
-#: view:account.unreconcile:0
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
-msgstr ""
-
#. module: account
#: model:ir.model,name:account.model_account_analytic_journal_report
msgid "Account Analytic Journal"
@@ -842,11 +837,6 @@ msgstr ""
msgid "Account Code and Name"
msgstr ""
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_new
-msgid "created"
-msgstr ""
-
#. module: account
#: selection:account.entries.report,month:0
#: selection:account.invoice.report,month:0
@@ -875,7 +865,7 @@ msgid "<p>\n"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1632
+#: code:addons/account/account.py:1637
#, python-format
msgid "You cannot unreconcile journal items if they has been generated by the opening/closing fiscal year process."
msgstr ""
@@ -887,6 +877,7 @@ msgstr ""
#. module: account
#: view:account.payment.term:0
+#: field:account.payment.term.line,value:0
msgid "Computation"
msgstr ""
@@ -918,9 +909,8 @@ msgid "Purchase journal"
msgstr ""
#. module: account
-#: 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\"."
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
msgstr ""
#. module: account
@@ -956,7 +946,7 @@ msgid "Liability"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:855
+#: code:addons/account/account_invoice.py:871
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
@@ -1024,10 +1014,10 @@ msgid "Features"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2293
+#: code:addons/account/account.py:2298
#: 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_invoice.py:748
#: code:addons/account/account_move_line.py:195
#, python-format
msgid "No Analytic Journal !"
@@ -1096,8 +1086,9 @@ msgid "Refund "
msgstr ""
#. module: account
-#: help:account.config.settings,company_footer:0
-msgid "Bank accounts as printed in the footer of each printed document"
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
msgstr ""
#. module: account
@@ -1139,7 +1130,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:3034
+#: code:addons/account/account.py:3044
#, python-format
msgid "Bank"
msgstr ""
@@ -1429,9 +1420,9 @@ msgid "Account Receivable"
msgstr ""
#. module: account
-#: code:addons/account/account.py:611
-#: code:addons/account/account.py:766
+#: code:addons/account/account.py:612
#: code:addons/account/account.py:767
+#: code:addons/account/account.py:768
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -1445,7 +1436,7 @@ msgid "With balance is not equal to 0"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1440
+#: code:addons/account/account.py:1445
#, python-format
msgid "There is no default debit account defined \n"
"on journal \"%s\"."
@@ -1498,7 +1489,7 @@ msgstr ""
#. module: account
#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:164
#, python-format
msgid "Not implemented."
msgstr ""
@@ -1539,6 +1530,12 @@ msgstr ""
msgid "Supplier Refunds"
msgstr ""
+#. module: account
+#: field:account.tax.code,code:0
+#: field:account.tax.code.template,code:0
+msgid "Case Code"
+msgstr ""
+
#. module: account
#: field:account.config.settings,company_footer:0
msgid "Bank accounts footer preview"
@@ -1576,7 +1573,6 @@ msgid "Groups"
msgstr ""
#. module: account
-#: field:account.invoice,amount_untaxed:0
#: field:report.invoice.created,amount_untaxed:0
msgid "Untaxed"
msgstr ""
@@ -1697,6 +1693,12 @@ msgstr ""
msgid "Sales by Account Type"
msgstr ""
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
@@ -1715,91 +1717,11 @@ msgid "The journal must have centralized counterpart without the Skipping draft
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:850
+#: code:addons/account/account_move_line.py:857
#, python-format
msgid "Some entries are already reconciled."
msgstr ""
-#. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid "\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>\n"
-"\n"
-" <p>A new invoice is available for you: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" <strong>REFERENCES</strong><br />\n"
-" Invoice number: <strong>${object.number}</strong><br />\n"
-" Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
-" Invoice date: ${object.date_invoice}<br />\n"
-" % if object.origin:\n"
-" Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p> \n"
-" \n"
-" % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):\n"
-" <% \n"
-" comp_name = quote(object.company_id.name)\n"
-" inv_number = quote(object.number)\n"
-" paypal_account = quote(object.company_id.paypal_account)\n"
-" inv_amount = quote(str(object.residual))\n"
-" cur_name = quote(object.currency_id.name)\n"
-" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&\" \\\n"
-" \"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-" (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)\n"
-" %>\n"
-" <br/>\n"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-" </a>\n"
-" % endif\n"
-" \n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone: ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
#. module: account
#: field:account.tax.code,sum:0
msgid "Year Sum"
@@ -1905,6 +1827,11 @@ msgstr ""
msgid "Draft statement"
msgstr ""
+#. module: account
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
#. module: account
#: field:account.config.settings,module_account_check_writing:0
msgid "Pay your suppliers by check"
@@ -1927,26 +1854,25 @@ msgid "This menu prints a tax declaration based on invoices or payments. Select
msgstr ""
#. module: account
-#: code:addons/account/account.py:408
-#: code:addons/account/account.py:413
-#: code:addons/account/account.py:430
-#: code:addons/account/account.py:633
-#: code:addons/account/account.py:635
-#: 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.py:409
+#: code:addons/account/account.py:414
+#: code:addons/account/account.py:431
+#: code:addons/account/account.py:634
+#: code:addons/account/account.py:636
+#: code:addons/account/account.py:930
+#: code:addons/account/account.py:1062
+#: code:addons/account/account.py:1064
+#: code:addons/account/account.py:1103
+#: code:addons/account/account.py:1283
+#: code:addons/account/account.py:1297
+#: code:addons/account/account.py:1320
+#: code:addons/account/account.py:1327
+#: code:addons/account/account.py:1547
+#: code:addons/account/account.py:1551
+#: code:addons/account/account.py:1637
+#: code:addons/account/account.py:2310
+#: code:addons/account/account.py:2630
+#: code:addons/account/account.py:3417
#: code:addons/account/account_analytic_line.py:89
#: code:addons/account/account_analytic_line.py:98
#: code:addons/account/account_bank_statement.py:367
@@ -1954,16 +1880,16 @@ msgstr ""
#: code:addons/account/account_bank_statement.py:418
#: code:addons/account/account_cash_statement.py:256
#: 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:1090
+#: code:addons/account/account_invoice.py:871
+#: code:addons/account/account_invoice.py:905
+#: code:addons/account/account_invoice.py:1095
#: 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/account_move_line.py:831
+#: code:addons/account/account_move_line.py:854
+#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:1122
+#: code:addons/account/account_move_line.py:1124
+#: code:addons/account/account_move_line.py:1157
#: 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
@@ -1974,8 +1900,8 @@ msgstr ""
#: code:addons/account/wizard/account_invoice_refund.py:111
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
-#: code:addons/account/wizard/account_report_common.py:153
-#: code:addons/account/wizard/account_report_common.py:159
+#: code:addons/account/wizard/account_report_common.py:158
+#: code:addons/account/wizard/account_report_common.py:164
#: code:addons/account/wizard/account_use_model.py:44
#: code:addons/account/wizard/pos_box.py:32
#: code:addons/account/wizard/pos_box.py:36
@@ -2018,7 +1944,7 @@ msgid "period close"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1043
+#: code:addons/account/account.py:1049
#, python-format
msgid "This journal already contains items for this period, therefore you cannot modify its company field."
msgstr ""
@@ -2113,7 +2039,7 @@ msgid "Product Category"
msgstr ""
#. module: account
-#: code:addons/account/account.py:655
+#: code:addons/account/account.py:656
#, python-format
msgid "You cannot change the type of account to '%s' type as it contains journal items!"
msgstr ""
@@ -2456,7 +2382,7 @@ msgid "Keep empty for all open fiscal year"
msgstr ""
#. module: account
-#: code:addons/account/account.py:652
+#: code:addons/account/account.py:653
#, python-format
msgid "You cannot change the type of account from 'Closed' to any other type as it contains journal items!"
msgstr ""
@@ -2472,7 +2398,7 @@ msgid "Create an Account Based on this Template"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:889
+#: code:addons/account/account_invoice.py:905
#, 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'."
@@ -2490,20 +2416,18 @@ msgid "Main Sequence"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:476
+#: code:addons/account/account_bank_statement.py:477
#, python-format
msgid "In order to delete a bank statement, you must first cancel it to delete related journal items."
msgstr ""
#. module: account
-#: field:account.invoice,payment_term:0
#: field:account.invoice.report,payment_term:0
#: view:account.payment.term:0
#: field:account.payment.term,name:0
#: view:account.payment.term.line:0
#: field:account.payment.term.line,payment_id:0
#: model:ir.model,name:account.model_account_payment_term
-#: field:res.partner,property_payment_term:0
msgid "Payment Term"
msgstr ""
@@ -2529,18 +2453,6 @@ msgstr ""
msgid "Filters"
msgstr ""
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.fiscalyear:0
-#: selection:account.fiscalyear,state:0
-#: selection:account.invoice,state:0
-#: selection:account.invoice.report,state:0
-#: selection:account.period,state:0
-#: selection:report.invoice.created,state:0
-msgid "Open"
-msgstr ""
-
#. module: account
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2552,6 +2464,11 @@ msgstr ""
msgid "Account Properties"
msgstr ""
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Partner Reconciliation"
@@ -2629,24 +2546,19 @@ msgid "Account Model Entries"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3144
+#: code:addons/account/account.py:3154
#, python-format
msgid "EXJ"
msgstr ""
-#. module: account
-#: view:account.invoice.refund:0
-msgid "Create Credit Note"
-msgstr ""
-
#. module: account
#: field:product.template,supplier_taxes_id:0
msgid "Supplier Taxes"
msgstr ""
#. module: account
-#: view:account.entries.report:0
-msgid "entries"
+#: view:res.partner:0
+msgid "Bank Details"
msgstr ""
#. module: account
@@ -2666,15 +2578,13 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: account
-#: help:account.invoice,date_due:0
#: help:account.invoice,payment_term:0
msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_state_open.py:37
-#, python-format
-msgid "Invoice is already reconciled."
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
msgstr ""
#. module: account
@@ -2704,6 +2614,7 @@ msgstr ""
#: report:account.journal.period.print.sale.purchase:0
#: field:account.move.line,account_tax_id:0
#: view:account.tax:0
+#: model:ir.model,name:account.model_account_tax
msgid "Tax"
msgstr ""
@@ -2739,14 +2650,14 @@ msgid "Accounts"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
#: code:addons/account/account_bank_statement.py:404
-#: code:addons/account/account_invoice.py:367
-#: code:addons/account/account_invoice.py:473
-#: code:addons/account/account_invoice.py:570
-#: code:addons/account/account_invoice.py:585
-#: code:addons/account/account_invoice.py:593
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:386
+#: code:addons/account/account_invoice.py:488
+#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:601
+#: code:addons/account/account_invoice.py:609
+#: code:addons/account/account_invoice.py:631
#: code:addons/account/account_move_line.py:535
#, python-format
msgid "Configuration Error!"
@@ -2843,6 +2754,12 @@ msgstr ""
msgid "Refund Base Code"
msgstr ""
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
+
#. module: account
#: model:ir.actions.act_window,help:account.action_account_fiscalyear
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -2891,11 +2808,6 @@ msgstr ""
msgid "Accounting entries"
msgstr ""
-#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Communication Type"
-msgstr ""
-
#. module: account
#: constraint:account.move.line:0
msgid "Account and Period must belong to the same company."
@@ -2930,7 +2842,7 @@ msgid "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pr
msgstr ""
#. module: account
-#: code:addons/account/account.py:1056
+#: code:addons/account/account.py:1062
#, python-format
msgid "You should choose the periods that belong to the same company."
msgstr ""
@@ -2943,7 +2855,7 @@ msgid "Sales by Account"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1406
+#: code:addons/account/account.py:1411
#, python-format
msgid "You cannot delete a posted journal entry \"%s\"."
msgstr ""
@@ -2959,21 +2871,21 @@ msgid "Sale journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2293
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account.py:2298
+#: code:addons/account/account_invoice.py:748
#: 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:780
+#: code:addons/account/account.py:781
#, python-format
msgid "This journal already contains items, therefore you cannot modify its company field."
msgstr ""
#. module: account
-#: code:addons/account/account.py:408
+#: code:addons/account/account.py:409
#, python-format
msgid "You need an Opening journal with centralisation checked to set the initial balance."
msgstr ""
@@ -3031,8 +2943,9 @@ msgid "The optional quantity expressed by this line, eg: number of product sold.
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 2:"
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
msgstr ""
#. module: account
@@ -3078,12 +2991,6 @@ msgstr ""
msgid "Default Sale Tax"
msgstr ""
-#. module: account
-#: code:addons/account/account_invoice.py:1072
-#, python-format
-msgid "Invoice '%s' is validated."
-msgstr ""
-
#. module: account
#: help:account.model.line,date_maturity:0
msgid "The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."
@@ -3114,7 +3021,7 @@ msgid "Fiscal Position"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:779
+#: code:addons/account/account_invoice.py:795
#, python-format
msgid "Tax base different!\n"
"Click on compute to update the tax base."
@@ -3140,7 +3047,7 @@ msgid "Trial Balance"
msgstr ""
#. module: account
-#: code:addons/account/account.py:430
+#: code:addons/account/account.py:431
#, python-format
msgid "Unable to adapt the initial balance (negative value)."
msgstr ""
@@ -3201,7 +3108,7 @@ msgid "This will select how the current currency rate for outgoing transactions
msgstr ""
#. module: account
-#: code:addons/account/account.py:2620
+#: code:addons/account/account.py:2630
#, python-format
msgid "There is no parent code for the template account."
msgstr ""
@@ -3213,8 +3120,8 @@ msgid "No. of Digits to use for account code"
msgstr ""
#. module: account
-#: field:account.payment.term.line,name:0
-msgid "Line Name"
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
msgstr ""
#. module: account
@@ -3263,7 +3170,7 @@ msgid "View"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3387
+#: code:addons/account/account.py:3412
#: code:addons/account/account_bank.py:95
#, python-format
msgid "BNK"
@@ -3284,14 +3191,19 @@ msgstr ""
msgid "Electronic File"
msgstr ""
+#. module: account
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
#. module: account
#: field:account.config.settings,has_chart_of_accounts:0
msgid "Company has a chart of accounts"
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " Day of the Month: 0"
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
msgstr ""
#. module: account
@@ -3300,9 +3212,73 @@ msgid "Account Partner Ledger"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1330
-#, python-format
-msgid "%s <b>created</b>."
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+" <p>A new invoice is available for you: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.user_id:\n"
+" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" % endif\n"
+" </p> \n"
+" \n"
+" % if object.paypal_url:\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+" \n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
+" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: account
@@ -3422,12 +3398,12 @@ msgid "Account Tax Declaration"
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " Value amount: 0.02"
+#: help:account.bank.statement,name:0
+msgid "if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:976
+#: code:addons/account/account_invoice.py:988
#, 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 ""
@@ -3439,7 +3415,7 @@ msgid "Starting Balance"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
#, python-format
msgid "No Partner Defined !"
msgstr ""
@@ -3621,7 +3597,7 @@ msgid "Period Length (days)"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1322
+#: code:addons/account/account.py:1327
#, python-format
msgid "You cannot modify a posted entry of this journal.\n"
"First you should set the journal to allow cancelling entries."
@@ -3644,7 +3620,7 @@ msgid "Category of Product"
msgstr ""
#. module: account
-#: code:addons/account/account.py:929
+#: code:addons/account/account.py:930
#, python-format
msgid "There is no fiscal year defined for this date.\n"
"Please create one from the configuration of the accounting menu."
@@ -3779,7 +3755,7 @@ msgid "Chart of Accounts Template"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2305
+#: code:addons/account/account.py:2310
#, 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!"
@@ -3858,8 +3834,8 @@ msgid "Qty"
msgstr ""
#. module: account
-#: field:account.move.line,blocked:0
-msgid "Litigation"
+#: help:account.tax.code,sign:0
+msgid "You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it."
msgstr ""
#. module: account
@@ -3942,11 +3918,6 @@ msgstr ""
msgid "Expects a Chart of Accounts"
msgstr ""
-#. module: account
-#: model:mail.message.subtype,name:account.mt_invoice_paid
-msgid "paid"
-msgstr ""
-
#. module: account
#: field:account.move.line,date:0
msgid "Effective date"
@@ -3964,11 +3935,6 @@ msgstr ""
msgid "Setup your Bank Accounts"
msgstr ""
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create credit note, reconcile and create a new draft invoice"
-msgstr ""
-
#. module: account
#: xsl:account.transfer:0
msgid "Partner ID"
@@ -4009,8 +3975,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:1048
-#: code:addons/account/account_move_line.py:1131
+#: code:addons/account/account_move_line.py:1061
+#: code:addons/account/account_move_line.py:1144
#, python-format
msgid "You cannot use an inactive account."
msgstr ""
@@ -4040,7 +4006,7 @@ msgid "Consolidated Children"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
#: code:addons/account/wizard/account_invoice_refund.py:146
#, python-format
msgid "Insufficient Data!"
@@ -4066,11 +4032,6 @@ msgstr ""
msgid "title"
msgstr ""
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Create a draft credit note"
-msgstr ""
-
#. module: account
#: view:account.invoice:0
#: view:account.period:0
@@ -4160,6 +4121,11 @@ msgstr ""
msgid "Analytic Balance"
msgstr ""
+#. module: account
+#: help:res.partner,property_payment_term:0
+msgid "This payment term will be used instead of the default one for sale orders and customer invoices"
+msgstr ""
+
#. module: account
#: view:account.config.settings:0
msgid "If you put \"%(year)s\" in the prefix, it will be replaced by the current year."
@@ -4175,6 +4141,11 @@ msgstr ""
msgid "Posted Journal Items"
msgstr ""
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
#. module: account
#: view:account.tax.template:0
msgid "Search Tax Templates"
@@ -4185,21 +4156,11 @@ msgstr ""
msgid "Draft Entries"
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid " Day of the Month= -1"
-msgstr ""
-
#. module: account
#: help:account.config.settings,decimal_precision:0
msgid "As an example, a decimal precision of 2 will allow journal entries like: 9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: 0.0231 EUR."
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid " Number of Days: 30"
-msgstr ""
-
#. module: account
#: field:account.account,shortcut:0
#: field:account.account.template,shortcut:0
@@ -4223,17 +4184,8 @@ msgid "Account Type"
msgstr ""
#. module: account
-#: model:ir.actions.act_window,help:account.action_bank_tree
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to setup a new bank account. \n"
-" </p><p>\n"
-" Configure your company's bank account and select those that must\n"
-" appear on the report footer.\n"
-" </p><p>\n"
-" If you use the accounting application of OpenERP, journals and\n"
-" accounts will be created automatically based on these data.\n"
-" </p>\n"
-" "
+#: view:account.bank.statement:0
+msgid "Close CashBox"
msgstr ""
#. module: account
@@ -4253,8 +4205,17 @@ msgid "Analytic costs (timesheets, some purchased products, ...) come from analy
msgstr ""
#. module: account
-#: view:account.bank.statement:0
-msgid "Close CashBox"
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to setup a new bank account. \n"
+" </p><p>\n"
+" Configure your company's bank account and select those that must\n"
+" appear on the report footer.\n"
+" </p><p>\n"
+" If you use the accounting application of OpenERP, journals and\n"
+" accounts will be created automatically based on these data.\n"
+" </p>\n"
+" "
msgstr ""
#. module: account
@@ -4281,7 +4242,7 @@ msgid "Month"
msgstr ""
#. module: account
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:668
#, python-format
msgid "You cannot change the code of account which contains journal items!"
msgstr ""
@@ -4292,8 +4253,8 @@ msgid "Supplier invoice sequence"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:571
-#: code:addons/account/account_invoice.py:586
+#: code:addons/account/account_invoice.py:587
+#: code:addons/account/account_invoice.py:602
#, python-format
msgid "Cannot find a chart of account, you should create one from Settings\\Configuration\\Accounting menu."
msgstr ""
@@ -4315,6 +4276,11 @@ msgstr ""
msgid "Acc.Type"
msgstr ""
+#. module: account
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
#. module: account
#: field:account.account.template,note:0
msgid "Note"
@@ -4327,7 +4293,7 @@ msgstr ""
#. module: account
#: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:190
+#: code:addons/account/account.py:191
#, python-format
msgid "Balance Sheet (Liability account)"
msgstr ""
@@ -4349,7 +4315,7 @@ msgid "Account Base Code"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:855
+#: code:addons/account/account_move_line.py:867
#, python-format
msgid "You have to provide an account for the write off/exchange difference entry."
msgstr ""
@@ -4403,11 +4369,6 @@ msgstr ""
msgid "Last Reconciliation:"
msgstr ""
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
-msgid "Periodical Processing"
-msgstr ""
-
#. module: account
#: selection:account.move.line,state:0
msgid "Balanced"
@@ -4435,9 +4396,8 @@ msgid "Account chart"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1322
-#, python-format
-msgid "Supplier invoice"
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
msgstr ""
#. module: account
@@ -4506,10 +4466,14 @@ msgstr ""
#. module: account
#: view:account.move.line:0
#: model:ir.actions.act_window,name:account.action_account_manual_reconcile
-#: model:ir.ui.menu,name:account.menu_manual_reconcile_bank
msgid "Journal Items to Reconcile"
msgstr ""
+#. module: account
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
#. module: account
#: sql_constraint:account.period:0
msgid "The name of the period must be unique per company!"
@@ -4553,7 +4517,7 @@ msgid "Error!\n"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:615
+#: code:addons/account/account_invoice.py:631
#, python-format
msgid "Cannot find any account journal of %s type for this company.\n"
"\n"
@@ -4567,7 +4531,7 @@ msgid "Based On"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3146
+#: code:addons/account/account.py:3156
#, python-format
msgid "ECNJ"
msgstr ""
@@ -4592,11 +4556,6 @@ msgstr ""
msgid "Change"
msgstr ""
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr ""
-
#. module: account
#: field:account.journal,type_control_ids:0
msgid "Type Controls"
@@ -4619,11 +4578,6 @@ msgstr ""
msgid "Cancelled"
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Example"
-msgstr ""
-
#. module: account
#: help:account.config.settings,group_proforma_invoices:0
msgid "Allows you to put invoices in pro-forma state."
@@ -4634,11 +4588,6 @@ msgstr ""
msgid "Unit Of Currency Definition"
msgstr ""
-#. module: account
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr ""
-
#. module: account
#: help:account.partner.ledger,amount_currency:0
#: help:account.report.general.ledger,amount_currency:0
@@ -4646,7 +4595,7 @@ msgid "It adds the currency column on report if the currency differs from the co
msgstr ""
#. module: account
-#: code:addons/account/account.py:3336
+#: code:addons/account/account.py:3346
#, python-format
msgid "Purchase Tax %.2f%%"
msgstr ""
@@ -4717,16 +4666,11 @@ msgid "When journal period is created. The status is 'Draft'. If a report is pri
msgstr ""
#. module: account
-#: code:addons/account/account.py:3147
+#: code:addons/account/account.py:3157
#, python-format
msgid "MISC"
msgstr ""
-#. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
-
#. module: account
#: field:account.fiscalyear.close,fy2_id:0
msgid "New Fiscal Year"
@@ -4834,6 +4778,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,state:0
#: report:account.overdue:0
+#: model:mail.message.subtype,name:account.mt_invoice_paid
msgid "Paid"
msgstr ""
@@ -4858,7 +4803,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:889
+#: code:addons/account/account.py:890
#, python-format
msgid "Opening Period"
msgstr ""
@@ -4873,14 +4818,6 @@ msgstr ""
msgid "Round Globally"
msgstr ""
-#. module: account
-#: field:account.bank.statement,message_comment_ids:0
-#: help:account.bank.statement,message_comment_ids:0
-#: field:account.invoice,message_comment_ids:0
-#: help:account.invoice,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: account
#: view:account.bank.statement:0
#: view:account.subscription:0
@@ -4893,7 +4830,7 @@ msgid "Tax Application"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
#, python-format
msgid "Please verify the price of the invoice !\n"
"The encoded total does not match the computed total."
@@ -4925,8 +4862,8 @@ msgid "End of period"
msgstr ""
#. module: account
-#: view:res.partner:0
-msgid "Bank Details"
+#: model:process.node,note:account.process_node_supplierpaymentorder0
+msgid "Payment of invoices"
msgstr ""
#. module: account
@@ -5016,13 +4953,6 @@ msgstr ""
msgid "Child Tax Accounts"
msgstr ""
-#. module: account
-#: code:addons/account/account.py:1018
-#, python-format
-msgid "There is no period defined for this date: %s.\n"
-"Please create one."
-msgstr ""
-
#. module: account
#: help:account.tax,price_include:0
#: help:account.tax.template,price_include:0
@@ -5065,7 +4995,7 @@ msgid "Target Moves"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1411
+#: code:addons/account/account.py:1416
#, python-format
msgid "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
msgstr ""
@@ -5100,6 +5030,7 @@ msgid "Python Code (reverse)"
msgstr ""
#. module: account
+#: field:account.invoice,payment_term:0
#: model:ir.actions.act_window,name:account.action_payment_term_form
#: model:ir.ui.menu,name:account.menu_action_payment_term_form
msgid "Payment Terms"
@@ -5110,12 +5041,6 @@ msgstr ""
msgid "This boolean helps you to choose if you want to propose to the user to encode the sale and purchase rates or choose from list of taxes. This last choice assumes that the set of tax defined on this template is complete"
msgstr ""
-#. module: account
-#: code:addons/account/account_invoice.py:1335
-#, python-format
-msgid "%s <b>paid</b>."
-msgstr ""
-
#. module: account
#: view:account.financial.report:0
#: field:account.financial.report,children_ids:0
@@ -5141,18 +5066,13 @@ msgstr ""
msgid "It indicates that the invoice has been sent."
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Line 1:"
-msgstr ""
-
#. module: account
#: field:account.tax.template,description:0
msgid "Internal Name"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
#, 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."
@@ -5189,7 +5109,7 @@ msgstr ""
#. module: account
#: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:187
+#: code:addons/account/account.py:188
#, python-format
msgid "Profit & Loss (Income account)"
msgstr ""
@@ -5222,7 +5142,7 @@ msgid "Compute Code (if type=code)"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:474
+#: code:addons/account/account_invoice.py:489
#, python-format
msgid "Cannot find a chart of accounts for this company, you should create one."
msgstr ""
@@ -5248,6 +5168,7 @@ msgstr ""
#: view:account.analytic.line:0
#: field:account.bank.statement.line,amount:0
#: report:account.invoice:0
+#: field:account.invoice.line,price_subtotal:0
#: field:account.invoice.tax,amount:0
#: view:account.move:0
#: field:account.move,amount:0
@@ -5338,7 +5259,7 @@ msgid "Recompute taxes and total"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1103
#, python-format
msgid "You cannot modify/delete a journal with entries for this period."
msgstr ""
@@ -5364,7 +5285,7 @@ msgid "Amount Computation"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account_move_line.py:1108
#, python-format
msgid "You can not add/modify entries in a closed period %s of journal %s."
msgstr ""
@@ -5400,9 +5321,15 @@ msgid "Account Common Account Report"
msgstr ""
#. module: account
-#: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
-msgid "Communication"
+#: view:account.bank.statement:0
+#: selection:account.bank.statement,state:0
+#: view:account.fiscalyear:0
+#: selection:account.fiscalyear,state:0
+#: selection:account.invoice,state:0
+#: selection:account.invoice.report,state:0
+#: selection:account.period,state:0
+#: selection:report.invoice.created,state:0
+msgid "Open"
msgstr ""
#. module: account
@@ -5430,9 +5357,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1323
#: selection:report.invoice.created,type:0
-#, python-format
msgid "Customer Refund"
msgstr ""
@@ -5449,11 +5374,6 @@ msgstr ""
msgid "Report of Invoices Created within Last 15 days"
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid " Number of Days: 14"
-msgstr ""
-
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
@@ -5470,6 +5390,7 @@ msgid "Fill in this form if you put money in the cash register:"
msgstr ""
#. module: account
+#: view:account.payment.term.line:0
#: field:account.payment.term.line,value_amount:0
msgid "Amount To Pay"
msgstr ""
@@ -5555,8 +5476,6 @@ msgstr ""
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
-#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
@@ -5580,13 +5499,13 @@ msgid "Payment entries are the second input of the reconciliation."
msgstr ""
#. module: account
-#: help:account.automatic.reconcile,power:0
-msgid "Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation"
+#: help:res.partner,property_supplier_payment_term:0
+msgid "This payment term will be used instead of the default one for purchase orders and supplier invoices"
msgstr ""
#. module: account
-#: help:account.payment.term.line,sequence:0
-msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
+#: help:account.automatic.reconcile,power:0
+msgid "Number of partial amounts that can be combined to find a balance point can be chosen as the power of the automatic reconciliation"
msgstr ""
#. module: account
@@ -5646,12 +5565,11 @@ msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
msgid "Fixed Amount"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1059
#, python-format
msgid "You cannot change the tax, you should remove and recreate lines."
msgstr ""
@@ -5675,7 +5593,6 @@ msgstr ""
#. module: account
#: help:account.tax,type:0
-#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
msgstr ""
@@ -5703,18 +5620,23 @@ msgid "Child Accounts"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1107
+#: code:addons/account/account_move_line.py:1120
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:870
+#: code:addons/account/account_move_line.py:882
#, python-format
msgid "Write-Off"
msgstr ""
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
+
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
@@ -5731,7 +5653,7 @@ msgstr ""
#: view:account.config.settings:0
#: view:account.invoice:0
#: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:341
+#: code:addons/account/account_invoice.py:363
#, python-format
msgid "Supplier"
msgstr ""
@@ -5751,16 +5673,11 @@ msgid "Account n°"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
#, python-format
msgid "Free Reference"
msgstr ""
-#. module: account
-#: field:account.payment.term.line,value:0
-msgid "Valuation"
-msgstr ""
-
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
#: selection:account.common.partner.report,result_selection:0
@@ -5863,7 +5780,7 @@ msgid "Filter by"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
#, python-format
msgid "You have a wrong expression \"%(...)s\" in your model !"
msgstr ""
@@ -5905,6 +5822,12 @@ msgstr ""
msgid "Number of Days"
msgstr ""
+#. module: account
+#: code:addons/account/account.py:1321
+#, python-format
+msgid "You cannot validate this journal entry because account \"%s\" does not belong to chart of accounts \"%s\"."
+msgstr ""
+
#. module: account
#: view:account.financial.report:0
msgid "Report"
@@ -6040,7 +5963,7 @@ msgid "Models"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1090
+#: code:addons/account/account_invoice.py:1095
#, python-format
msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
msgstr ""
@@ -6206,7 +6129,7 @@ msgid "You cannot create journal items on closed account."
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:594
+#: code:addons/account/account_invoice.py:610
#, python-format
msgid "Invoice line account's company and invoice's compnay does not match."
msgstr ""
@@ -6237,12 +6160,6 @@ msgstr ""
msgid "Current"
msgstr ""
-#. module: account
-#: code:addons/account/account_invoice.py:1305
-#, python-format
-msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
-
#. module: account
#: field:account.journal,cashbox_line_ids:0
msgid "CashBox"
@@ -6267,7 +6184,6 @@ msgstr ""
#. module: account
#: selection:account.tax,type:0
-#: selection:account.tax.template,type:0
msgid "Percentage"
msgstr ""
@@ -6287,7 +6203,7 @@ msgid "Power"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3392
+#: code:addons/account/account.py:3417
#, python-format
msgid "Cannot generate an unused journal code."
msgstr ""
@@ -6330,12 +6246,12 @@ msgid "Applicable Type"
msgstr ""
#. module: account
-#: field:account.invoice.line,invoice_id:0
-msgid "Invoice Reference"
+#: help:account.invoice,date_due:0
+msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. The payment term may compute several due dates, for example 50% now and 50% in one month, but if you want to force a due date, make sure that the payment term is not set on the invoice. If you keep the payment term and the due date empty, it means direct payment."
msgstr ""
#. module: account
-#: code:addons/account/account.py:413
+#: code:addons/account/account.py:414
#, python-format
msgid "There is no opening/closing period defined, please create one to set the initial balance."
msgstr ""
@@ -6346,12 +6262,12 @@ msgid "The sequence field is used to order the taxes lines from lower sequences
msgstr ""
#. module: account
-#: 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/account.py:1415
+#: code:addons/account/account.py:1444
+#: code:addons/account/account.py:1451
+#: code:addons/account/account_invoice.py:987
+#: code:addons/account/account_move_line.py:1008
#: 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
@@ -6411,7 +6327,7 @@ msgid "Optional create"
msgstr ""
#. module: account
-#: code:addons/account/account.py:685
+#: code:addons/account/account.py:686
#, python-format
msgid "You cannot change the owner company of an account that already contains journal items."
msgstr ""
@@ -6420,9 +6336,7 @@ msgstr ""
#: report:account.invoice:0
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/account_invoice.py:1324
#: selection:report.invoice.created,type:0
-#, python-format
msgid "Supplier Refund"
msgstr ""
@@ -6460,8 +6374,10 @@ msgid "Group By..."
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " Valuation: Balance"
+#: code:addons/account/account.py:1024
+#, python-format
+msgid "There is no period defined for this date: %s.\n"
+"Please create one."
msgstr ""
#. module: account
@@ -6534,6 +6450,11 @@ msgstr ""
msgid "Cash Transactions"
msgstr ""
+#. module: account
+#: view:account.unreconcile:0
+msgid "If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disabled"
+msgstr ""
+
#. module: account
#: view:account.account.template:0
#: view:account.bank.statement:0
@@ -6551,7 +6472,7 @@ msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:142
-#: code:addons/account/account_move_line.py:946
+#: code:addons/account/account_move_line.py:958
#, python-format
msgid "Entries: "
msgstr ""
@@ -6567,14 +6488,13 @@ msgid "You cannot provide a secondary currency if it is the same than the compan
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1321
-#, python-format
-msgid "Customer invoice"
+#: selection:account.tax.template,applicable_type:0
+msgid "True"
msgstr ""
#. module: account
#: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:189
+#: code:addons/account/account.py:190
#, python-format
msgid "Balance Sheet (Asset account)"
msgstr ""
@@ -6590,9 +6510,8 @@ msgid "Total debit"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:825
-#, python-format
-msgid "Entry \"%s\" is not valid !"
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
msgstr ""
#. module: account
@@ -6638,7 +6557,7 @@ msgstr ""
#. module: account
#: selection:account.account.type,report_type:0
-#: code:addons/account/account.py:188
+#: code:addons/account/account.py:189
#, python-format
msgid "Profit & Loss (Expense account)"
msgstr ""
@@ -6649,13 +6568,14 @@ msgid "Total Transactions"
msgstr ""
#. module: account
-#: code:addons/account/account.py:635
+#: code:addons/account/account.py:636
#, python-format
msgid "You cannot remove an account that contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1095
+#: code:addons/account/account.py:1024
+#: code:addons/account/account_move_line.py:1108
#, python-format
msgid "Error !"
msgstr ""
@@ -6692,6 +6612,11 @@ msgstr ""
msgid "Manual"
msgstr ""
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
#. module: account
#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
@@ -6782,8 +6707,8 @@ msgstr ""
#. module: account
#: view:account.bank.statement:0
-#: code:addons/account/account.py:421
-#: code:addons/account/account.py:433
+#: code:addons/account/account.py:422
+#: code:addons/account/account.py:434
#, python-format
msgid "Opening Balance"
msgstr ""
@@ -6859,7 +6784,7 @@ msgid "Configuration error!\n"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2251
+#: code:addons/account/account.py:2256
#, python-format
msgid "You can specify year, month and date in the name of the model using the following labels:\n"
"\n"
@@ -6870,6 +6795,11 @@ msgid "You can specify year, month and date in the name of the model using the f
"e.g. My model on %(date)s"
msgstr ""
+#. module: account
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
#. module: account
#: field:account.config.settings,module_account_voucher:0
msgid "Manage customer payments"
@@ -6922,7 +6852,7 @@ msgid "Done"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1278
+#: code:addons/account/account.py:1283
#, python-format
msgid "You cannot validate a non-balanced entry.\n"
"Make sure you have configured payment terms properly.\n"
@@ -6947,9 +6877,8 @@ msgid "Source Document"
msgstr ""
#. module: account
-#: code:addons/account/account_analytic_line.py:90
-#, python-format
-msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
msgstr ""
#. module: account
@@ -6974,7 +6903,7 @@ msgid "Taxes:"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_invoice.py:458
#, python-format
msgid "You can not delete an invoice which is not cancelled. You should refund it instead."
msgstr ""
@@ -7159,6 +7088,12 @@ msgstr ""
msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
msgstr ""
+#. module: account
+#: field:account.invoice,reference:0
+#: field:account.invoice.line,invoice_id:0
+msgid "Invoice Reference"
+msgstr ""
+
#. module: account
#: field:account.fiscalyear.close,report_name:0
msgid "Name of new entries"
@@ -7242,7 +7177,7 @@ msgid "Use model"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1447
+#: code:addons/account/account.py:1452
#, python-format
msgid "There is no default credit account defined \n"
"on journal \"%s\"."
@@ -7289,7 +7224,7 @@ msgid "Root/View"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3148
+#: code:addons/account/account.py:3158
#, python-format
msgid "OPEJ"
msgstr ""
@@ -7354,7 +7289,7 @@ msgid "Maturity Date"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3135
+#: code:addons/account/account.py:3145
#, python-format
msgid "Sales Journal"
msgstr ""
@@ -7365,7 +7300,7 @@ msgid "Invoice Tax"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1173
+#: code:addons/account/account_move_line.py:1186
#, python-format
msgid "No piece number !"
msgstr ""
@@ -7397,7 +7332,7 @@ msgid "Sales Properties"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3468
+#: code:addons/account/account.py:3493
#, python-format
msgid "You have to set a code for the bank account defined on the selected chart of accounts."
msgstr ""
@@ -7420,7 +7355,7 @@ msgstr ""
#. module: account
#: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1497
+#: code:addons/account/account.py:1502
#, python-format
msgid "Currency Adjustment"
msgstr ""
@@ -7451,7 +7386,7 @@ msgid "May"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:776
+#: code:addons/account/account_invoice.py:792
#, python-format
msgid "Global taxes defined, but they are not in invoice lines !"
msgstr ""
@@ -7467,9 +7402,8 @@ msgid "The sequence field is used to order the resources from lower sequences to
msgstr ""
#. module: account
-#: field:account.tax.code,code:0
-#: field:account.tax.code.template,code:0
-msgid "Case Code"
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
msgstr ""
#. module: account
@@ -7486,17 +7420,12 @@ msgstr ""
msgid "Post Journal Entries"
msgstr ""
-#. module: account
-#: field:account.journal,centralisation:0
-msgid "Centralised Counterpart"
-msgstr ""
-
#. module: account
#: selection:account.bank.statement.line,type:0
#: view:account.config.settings:0
#: view:account.invoice:0
#: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:361
#, python-format
msgid "Customer"
msgstr ""
@@ -7512,7 +7441,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:3034
+#: code:addons/account/account.py:3044
#, python-format
msgid "Cash"
msgstr ""
@@ -7524,8 +7453,8 @@ msgid "Account Destination"
msgstr ""
#. module: account
-#: model:process.node,note:account.process_node_supplierpaymentorder0
-msgid "Payment of invoices"
+#: help:account.invoice.refund,filter_refund:0
+msgid "Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled"
msgstr ""
#. module: account
@@ -7534,7 +7463,6 @@ msgstr ""
#: field:account.invoice.line,sequence:0
#: field:account.invoice.tax,sequence:0
#: field:account.model.line,sequence:0
-#: field:account.payment.term.line,sequence:0
#: field:account.sequence.fiscalyear,sequence_id:0
#: field:account.tax,sequence:0
#: field:account.tax.code,sequence:0
@@ -7659,15 +7587,14 @@ msgid "Partner Ledger"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1340
-#, python-format
-msgid "%s <b>cancelled</b>."
+#: selection:account.tax.template,type:0
+msgid "Fixed"
msgstr ""
#. module: account
-#: code:addons/account/account.py:652
-#: code:addons/account/account.py:655
-#: code:addons/account/account.py:667
+#: code:addons/account/account.py:653
+#: code:addons/account/account.py:656
+#: code:addons/account/account.py:668
#, python-format
msgid "Warning !"
msgstr ""
@@ -7735,7 +7662,7 @@ msgid "Select a currency to apply on the invoice"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
#, python-format
msgid "No Invoice Lines !"
msgstr ""
@@ -7805,7 +7732,7 @@ msgid "Associated Partner"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1433
+#: code:addons/account/account_invoice.py:1428
#, python-format
msgid "You must first select a partner !"
msgstr ""
@@ -7883,13 +7810,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:3138
+#: code:addons/account/account.py:3148
#, python-format
msgid "Purchase Refund Journal"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1292
+#: code:addons/account/account.py:1297
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
@@ -7956,7 +7883,7 @@ msgid "Net Total:"
msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:153
+#: code:addons/account/wizard/account_report_common.py:158
#, python-format
msgid "Select a starting and an ending period."
msgstr ""
@@ -7976,11 +7903,6 @@ msgstr ""
msgid "Write-Off Journal"
msgstr ""
-#. module: account
-#: help:res.partner,property_payment_term:0
-msgid "This payment term will be used instead of the default one for the current partner"
-msgstr ""
-
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
@@ -8007,11 +7929,6 @@ msgstr ""
msgid "Tax/Base Amount"
msgstr ""
-#. module: account
-#: view:account.payment.term.line:0
-msgid " Valuation: Percent"
-msgstr ""
-
#. module: account
#: view:account.open.closed.fiscalyear:0
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."
@@ -8063,6 +7980,11 @@ msgstr ""
msgid "Ending Balance"
msgstr ""
+#. module: account
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
#. module: account
#: help:account.move.line,blocked:0
msgid "You can check this box to mark this journal item as a litigation with the associated partner"
@@ -8098,7 +8020,7 @@ msgid "Automatic import of the bank sta"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:389
#, python-format
msgid "Unknown Error!"
msgstr ""
@@ -8121,14 +8043,19 @@ msgid "Account Types"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1198
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
#, python-format
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " Value amount: n.a"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
msgstr ""
#. module: account
@@ -8146,9 +8073,8 @@ msgid "Reconciliation"
msgstr ""
#. module: account
-#: view:account.chart.template:0
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
msgstr ""
#. module: account
@@ -8210,7 +8136,7 @@ msgid "The partner account used for this invoice."
msgstr ""
#. module: account
-#: code:addons/account/account.py:3333
+#: code:addons/account/account.py:3343
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -8228,13 +8154,13 @@ msgid "Payment Term Line"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3136
+#: code:addons/account/account.py:3146
#, python-format
msgid "Purchase Journal"
msgstr ""
#. module: account
-#: field:account.invoice.line,price_subtotal:0
+#: field:account.invoice,amount_untaxed:0
msgid "Subtotal"
msgstr ""
@@ -8263,11 +8189,6 @@ msgstr ""
msgid "Suppliers"
msgstr ""
-#. module: account
-#: selection:account.tax.template,applicable_type:0
-msgid "True"
-msgstr ""
-
#. module: account
#: view:account.journal:0
msgid "Accounts Type Allowed (empty for no control)"
@@ -8393,8 +8314,9 @@ msgid "Journal Name"
msgstr ""
#. module: account
-#: view:account.move.line:0
-msgid "Next Partner Entries to reconcile"
+#: code:addons/account/account_move_line.py:832
+#, python-format
+msgid "Entry \"%s\" is not valid !"
msgstr ""
#. module: account
@@ -8435,7 +8357,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:996
+#: code:addons/account/account_move_line.py:1009
#, python-format
msgid "The account move (%s) for centralisation has been confirmed."
msgstr ""
@@ -8492,7 +8414,7 @@ msgid "Reconciled entries"
msgstr ""
#. module: account
-#: code:addons/account/account.py:2281
+#: code:addons/account/account.py:2286
#, python-format
msgid "Wrong model !"
msgstr ""
@@ -8514,7 +8436,7 @@ msgid "Print Account Partner Balance"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1111
+#: code:addons/account/account_move_line.py:1124
#, 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."
@@ -8541,7 +8463,7 @@ msgstr ""
#. module: account
#: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3140
+#: code:addons/account/account.py:3150
#, python-format
msgid "Opening Entries Journal"
msgstr ""
@@ -8582,7 +8504,7 @@ msgid "Set if the tax computation is based on the computation of child taxes rat
msgstr ""
#. module: account
-#: code:addons/account/account.py:633
+#: code:addons/account/account.py:634
#, python-format
msgid "You cannot deactivate an account that contains journal items."
msgstr ""
@@ -8597,15 +8519,9 @@ msgstr ""
msgid "Journal Code"
msgstr ""
-#. module: account
-#: help:account.tax.code,sign:0
-msgid "You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it."
-msgstr ""
-
#. module: account
#: view:account.invoice:0
#: field:account.move.line,amount_residual:0
-#: field:account.move.line,amount_residual_currency:0
msgid "Residual Amount"
msgstr ""
@@ -8638,7 +8554,7 @@ msgid "Unit of Currency"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3137
+#: code:addons/account/account.py:3147
#, python-format
msgid "Sales Refund Journal"
msgstr ""
@@ -8702,7 +8618,7 @@ msgid "Purchase Tax(%)"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:857
+#: code:addons/account/account_invoice.py:873
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -8719,7 +8635,7 @@ msgid "Display Detail"
msgstr ""
#. module: account
-#: code:addons/account/account.py:3145
+#: code:addons/account/account.py:3155
#, python-format
msgid "SCNJ"
msgstr ""
@@ -8827,21 +8743,11 @@ msgstr ""
msgid "Number of Periods"
msgstr ""
-#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr ""
-
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
msgstr ""
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr ""
-
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
@@ -8853,8 +8759,9 @@ msgid "Supplier credit note sequence"
msgstr ""
#. module: account
-#: field:account.config.settings,purchase_sequence_next:0
-msgid "Next supplier invoice number"
+#: code:addons/account/wizard/account_state_open.py:37
+#, python-format
+msgid "Invoice is already reconciled."
msgstr ""
#. module: account
@@ -8871,14 +8778,14 @@ 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
-msgid "Bank Statements"
+#: view:account.chart.template:0
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:767
-#: code:addons/account/account_move_line.py:820
+#: code:addons/account/account_move_line.py:774
+#: code:addons/account/account_move_line.py:827
#, python-format
msgid "To reconcile the entries company should be the same for all entries."
msgstr ""
@@ -8979,8 +8886,8 @@ msgid "Move"
msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:476
-#: code:addons/account/account_invoice.py:440
+#: code:addons/account/account_bank_statement.py:477
+#: code:addons/account/account_invoice.py:458
#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid Action!"
@@ -9049,11 +8956,6 @@ msgstr ""
msgid "Sent"
msgstr ""
-#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr ""
-
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
@@ -9071,11 +8973,16 @@ msgid "Balance :"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1542
+#: code:addons/account/account.py:1547
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
+#. module: account
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
#. module: account
#: view:account.invoice.report:0
msgid "Customer And Supplier Invoices"
@@ -9112,11 +9019,6 @@ msgstr ""
msgid "Account Analytic Balance"
msgstr ""
-#. module: account
-#: help:account.invoice.refund,filter_refund:0
-msgid "Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled"
-msgstr ""
-
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,period_to:0
@@ -9156,7 +9058,13 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1459
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
#, python-format
msgid " Centralisation"
msgstr ""
@@ -9238,7 +9146,7 @@ msgid "Unreconciled"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:878
+#: code:addons/account/account_invoice.py:894
#, python-format
msgid "Bad total !"
msgstr ""
@@ -9312,7 +9220,7 @@ msgid "Comparison"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1109
+#: code:addons/account/account_move_line.py:1122
#, 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."
@@ -9326,6 +9234,11 @@ msgid "This allows accountants to manage analytic and crossovered budgets.\n"
" This installs the module account_budget."
msgstr ""
+#. module: account
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
#. module: account
#: help:res.partner,property_account_payable:0
msgid "This account will be used instead of the default one as the payable account for the current partner"
@@ -9377,11 +9290,6 @@ msgstr ""
msgid "Draft Invoice "
msgstr ""
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Cancel: create credit note and reconcile"
-msgstr ""
-
#. module: account
#: model:ir.ui.menu,name:account.menu_account_general_journal
msgid "General Journals"
@@ -9393,7 +9301,7 @@ msgid "Journal Entry Model"
msgstr ""
#. module: account
-#: code:addons/account/account.py:1058
+#: code:addons/account/account.py:1064
#, python-format
msgid "Start period should precede then end period."
msgstr ""
@@ -9478,7 +9386,7 @@ msgid "Profit (Loss) to report"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:368
+#: code:addons/account/account_invoice.py:387
#, python-format
msgid "There is no Sale/Purchase Journal(s) defined."
msgstr ""
@@ -9794,7 +9702,12 @@ msgid "Empty Accounts ? "
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1046
+#: view:account.unreconcile.reconcile:0
+msgid "If you unreconcile transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
#, python-format
msgid "Unable to change tax!"
msgstr ""
@@ -9916,7 +9829,7 @@ msgid "Receivable accounts"
msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:783
#, python-format
msgid "Already reconciled."
msgstr ""
@@ -10036,7 +9949,7 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:1520
+#: code:addons/account/account_invoice.py:1510
#, python-format
msgid "The selected unit of measure is not compatible with the unit of measure of the product."
msgstr ""
@@ -10133,7 +10046,7 @@ msgid "Accounting Documents"
msgstr ""
#. module: account
-#: code:addons/account/account.py:640
+#: code:addons/account/account.py:641
#, python-format
msgid "You cannot remove/deactivate an account which is set on a customer or supplier."
msgstr ""
@@ -10175,7 +10088,7 @@ msgid "Manual Invoice Taxes"
msgstr ""
#. module: account
-#: code:addons/account/account_invoice.py:538
+#: code:addons/account/account_invoice.py:554
#, python-format
msgid "The payment term of supplier does not have a payment term line."
msgstr ""
@@ -10252,11 +10165,6 @@ msgstr ""
msgid "February"
msgstr ""
-#. module: account
-#: help:account.bank.statement,name:0
-msgid "if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself"
-msgstr ""
-
#. module: account
#: view:account.bank.statement:0
#: help:account.cashbox.line,number_closing:0
@@ -10315,6 +10223,11 @@ msgstr ""
msgid "Expense Account on Product Template"
msgstr ""
+#. module: account
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
#. module: account
#: help:accounting.report,label_filter:0
msgid "This label will be displayed on report to show the balance computed for the given comparison filter."
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index 829ec3bb82747de598bb184fc5e6f5e98e70d9b0..4b3cbf354ae345a35de374da1ef8c033bcb0259e 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index d9d5af287a7f25b0893acb888134348638e214f6..873827362c98c01e399688358c432efa6ee7091c 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -93,6 +93,12 @@ msgstr ""
msgid "Sum of timesheet lines invoiced for this contract."
msgstr ""
+#. module: account_analytic_analysis
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:462
+#, python-format
+msgid "Sales Order Lines of %s"
+msgstr ""
+
#. module: account_analytic_analysis
#: help:account.analytic.account,revenue_per_hour:0
msgid "Computed using the formula: Invoiced Amount / Total Time"
@@ -100,7 +106,10 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
-msgid "Contracts not assigned"
+#: field:account_analytic_analysis.summary.month,account_id:0
+#: field:account_analytic_analysis.summary.user,account_id:0
+#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
+msgid "Analytic Account"
msgstr ""
#. module: account_analytic_analysis
@@ -135,8 +144,8 @@ msgid "End Date"
msgstr ""
#. module: account_analytic_analysis
-#: help:account.analytic.account,hours_qtt_non_invoiced:0
-msgid "Number of time (hours/days) (from journal of type 'general') that can be invoiced if you invoice based on analytic account."
+#: view:account.analytic.account:0
+msgid "Account Manager"
msgstr ""
#. module: account_analytic_analysis
@@ -151,10 +160,7 @@ msgstr ""
#. module: account_analytic_analysis
#: view:account.analytic.account:0
-#: field:account_analytic_analysis.summary.month,account_id:0
-#: field:account_analytic_analysis.summary.user,account_id:0
-#: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
-msgid "Analytic Account"
+msgid "Contracts not assigned"
msgstr ""
#. module: account_analytic_analysis
@@ -200,12 +206,6 @@ msgstr ""
msgid "Nothing to invoice, create"
msgstr ""
-#. module: account_analytic_analysis
-#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
-#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
-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"
@@ -236,6 +236,11 @@ msgstr ""
msgid "or view"
msgstr ""
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Customer Contracts"
+msgstr ""
+
#. module: account_analytic_analysis
#: view:account.analytic.account:0
msgid "Parent"
@@ -285,9 +290,8 @@ msgid "Timesheets"
msgstr ""
#. module: account_analytic_analysis
-#: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
-#, python-format
-msgid "Sale Order Lines of %s"
+#: help:account.analytic.account,hours_qtt_non_invoiced:0
+msgid "Number of time (hours/days) (from journal of type 'general') that can be invoiced if you invoice based on analytic account."
msgstr ""
#. module: account_analytic_analysis
@@ -416,13 +420,13 @@ msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
msgstr ""
#. module: account_analytic_analysis
-#: view:account.analytic.account:0
-msgid "Responsible"
+#: field:account.analytic.account,last_invoice_date:0
+msgid "Last Invoice Date"
msgstr ""
#. module: account_analytic_analysis
-#: field:account.analytic.account,last_invoice_date:0
-msgid "Last Invoice Date"
+#: view:account.analytic.account:0
+msgid "Units Remaining"
msgstr ""
#. module: account_analytic_analysis
@@ -507,9 +511,15 @@ msgstr ""
msgid "Mandatory use of templates."
msgstr ""
+#. module: account_analytic_analysis
+#: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
+msgid "Contract Template"
+msgstr ""
+
#. module: account_analytic_analysis
#: view:account.analytic.account:0
-msgid "Contracts Having a Partner"
+msgid "Units Done"
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 be15a31806a66d1bb9d722dd59130a04965f5c2b..3d7d0ba40e9f7f6bdd1580aa3c595ab57c60e699 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -32,6 +32,11 @@ msgstr ""
msgid "Default end date for this Analytic Account."
msgstr ""
+#. module: account_analytic_default
+#: help:account.analytic.default,product_id:0
+msgid "Select a product which will use analytic account specified in analytic default (e.g. create new customer invoice or Sales order if we select this product, it will automatically take this as an analytic account)"
+msgstr ""
+
#. module: account_analytic_default
#: model:ir.model,name:account_analytic_default.model_stock_picking
msgid "Picking List"
@@ -42,11 +47,6 @@ msgstr ""
msgid "Conditions"
msgstr ""
-#. module: account_analytic_default
-#: help:account.analytic.default,partner_id:0
-msgid "Select a partner which will use analytic account specified in analytic default (e.g. create new customer invoice or Sale order if we select this partner, it will automatically take this as an analytic account)"
-msgstr ""
-
#. module: account_analytic_default
#: view:account.analytic.default:0
#: field:account.analytic.default,product_id:0
@@ -54,8 +54,8 @@ msgid "Product"
msgstr ""
#. module: account_analytic_default
-#: model:ir.model,name:account_analytic_default.model_account_analytic_default
-msgid "Analytic Distribution"
+#: help:account.analytic.default,partner_id:0
+msgid "Select a partner which will use analytic account specified in analytic default (e.g. create new customer invoice or Sales order if we select this partner, it will automatically take this as an analytic account)"
msgstr ""
#. module: account_analytic_default
@@ -75,11 +75,6 @@ msgstr ""
msgid "Entries"
msgstr ""
-#. module: account_analytic_default
-#: help:account.analytic.default,product_id:0
-msgid "Select a product which will use analytic account specified in analytic default (e.g. create new customer invoice or Sale order if we select this product, it will automatically take this as an analytic account)"
-msgstr ""
-
#. module: account_analytic_default
#: field:account.analytic.default,date_stop:0
msgid "End Date"
@@ -97,11 +92,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: account_analytic_default
-#: help:account.analytic.default,company_id:0
-msgid "Select a company which will use analytic account specified in analytic default (e.g. create new customer invoice or Sale order if we select this company, it will automatically take this as an analytic account)"
-msgstr ""
-
#. module: account_analytic_default
#: help:account.analytic.default,user_id:0
msgid "Select a user which will use analytic account specified in analytic default."
@@ -112,12 +102,22 @@ msgstr ""
msgid "Invoice Line"
msgstr ""
+#. module: account_analytic_default
+#: help:account.analytic.default,company_id:0
+msgid "Select a company which will use analytic account specified in analytic default (e.g. create new customer invoice or Sales order if we select this company, it will automatically take this as an analytic account)"
+msgstr ""
+
#. module: account_analytic_default
#: view:account.analytic.default:0
#: field:account.analytic.default,analytic_id:0
msgid "Analytic Account"
msgstr ""
+#. module: account_analytic_default
+#: model:ir.model,name:account_analytic_default.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr ""
+
#. module: account_analytic_default
#: help:account.analytic.default,date_start:0
msgid "Default start date for this Analytic Account."
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index 1e0b672eac7721eca8391b04871400acbb557518..a120088fe2c171b2bfd40a2b1e1d2844e2e7d9d8 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
index b2be72c3ec762202a1e4bfe1c43430b15ded832d..1aaf71f4d046a8e42a6561ab2bdc58ee62b55185 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_asset/i18n/account_asset.pot b/addons/account_asset/i18n/account_asset.pot
index 14109f6974ceac6525e1867ebcb0eb5697490f6e..52e2e1f465fb9bf4f2292a2861089367b62f7b5a 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -91,8 +91,8 @@ msgid "Running"
msgstr ""
#. module: account_asset
-#: field:account.asset.depreciation.line,amount:0
-msgid "Depreciation Amount"
+#: view:account.asset.asset:0
+msgid "Set to Draft"
msgstr ""
#. module: account_asset
@@ -139,6 +139,11 @@ msgstr ""
msgid "It is the amount you plan to have that you cannot depreciate."
msgstr ""
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "The amount of time between two depreciations, in months"
+msgstr ""
+
#. module: account_asset
#: field:account.asset.depreciation.line,depreciation_date:0
#: view:asset.asset.report:0
@@ -245,18 +250,15 @@ msgid "Date of asset purchase"
msgstr ""
#. module: account_asset
-#: help:account.asset.asset,method_number:0
-msgid "Calculates Depreciation within specified interval"
-msgstr ""
-
-#. module: account_asset
-#: field:account.asset.asset,active:0
-msgid "Active"
+#: view:account.asset.asset:0
+msgid "Change Duration"
msgstr ""
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Change Duration"
+#: help:account.asset.asset,method_number:0
+#: help:account.asset.category,method_number:0
+#: help:account.asset.history,method_number:0
+msgid "The number of depreciations needed to depreciate your asset"
msgstr ""
#. module: account_asset
@@ -275,21 +277,14 @@ msgstr ""
msgid "Computation Method"
msgstr ""
-#. module: account_asset
-#: help:account.asset.asset,method_period:0
-msgid "State here the time during 2 depreciations, in months"
-msgstr ""
-
#. module: account_asset
#: constraint:account.asset.asset:0
msgid "Prorata temporis can be applied only for time method \"number of depreciations\"."
msgstr ""
#. module: account_asset
-#: help:account.asset.history,method_time:0
-msgid "The method to use to compute the dates and number of depreciation lines.\n"
-"Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n"
-"Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Next Period Depreciation"
msgstr ""
#. module: account_asset
@@ -338,6 +333,11 @@ msgstr ""
msgid "Search Asset Category"
msgstr ""
+#. module: account_asset
+#: view:asset.modify:0
+msgid "months"
+msgstr ""
+
#. module: account_asset
#: model:ir.model,name:account_asset.model_account_invoice_line
msgid "Invoice Line"
@@ -348,11 +348,6 @@ msgstr ""
msgid "Depreciation Board"
msgstr ""
-#. module: account_asset
-#: model:ir.model,name:account_asset.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
#. module: account_asset
#: field:asset.asset.report,unposted_value:0
msgid "Unposted Amount"
@@ -379,11 +374,10 @@ msgid "Note"
msgstr ""
#. module: account_asset
-#: help:account.asset.asset,method:0
-#: help:account.asset.category,method:0
-msgid "Choose the method to use to compute the amount of depreciation lines.\n"
-" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
-" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+#: help:account.asset.history,method_time:0
+msgid "The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."
msgstr ""
#. module: account_asset
@@ -444,8 +438,8 @@ msgid "User"
msgstr ""
#. module: account_asset
-#: field:account.asset.history,date:0
-msgid "Date"
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
msgstr ""
#. module: account_asset
@@ -464,19 +458,14 @@ msgstr ""
msgid "Asset History"
msgstr ""
-#. module: account_asset
-#: field:asset.asset.report,name:0
-msgid "Year"
-msgstr ""
-
#. module: account_asset
#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
msgid "asset.depreciation.confirmation.wizard"
msgstr ""
#. module: account_asset
-#: field:account.asset.category,account_asset_id:0
-msgid "Asset Account"
+#: field:account.asset.asset,active:0
+msgid "Active"
msgstr ""
#. module: account_asset
@@ -539,8 +528,8 @@ msgid "Close"
msgstr ""
#. module: account_asset
-#: view:account.asset.category:0
-msgid "Depreciation Method"
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
msgstr ""
#. module: account_asset
@@ -572,8 +561,13 @@ msgid "Current"
msgstr ""
#. module: account_asset
-#: field:account.asset.depreciation.line,remaining_value:0
-msgid "Amount to Depreciate"
+#: view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr ""
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Current Depreciation"
msgstr ""
#. module: account_asset
@@ -611,6 +605,14 @@ msgstr ""
msgid "Amount Already Depreciated"
msgstr ""
+#. module: account_asset
+#: help:account.asset.asset,method:0
+#: help:account.asset.category,method:0
+msgid "Choose the method to use to compute the amount of depreciation lines.\n"
+" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+" * Degressive: Calculated on basis of: Residual Value * Degressive Factor"
+msgstr ""
+
#. module: account_asset
#: field:account.asset.depreciation.line,move_check:0
#: view:asset.asset.report:0
@@ -644,8 +646,8 @@ msgid "Check this if you want to automatically confirm the assets of this catego
msgstr ""
#. module: account_asset
-#: view:account.asset.asset:0
-msgid "Set to Draft"
+#: field:asset.asset.report,name:0
+msgid "Year"
msgstr ""
#. module: account_asset
@@ -682,6 +684,11 @@ msgstr ""
msgid "State here the time between 2 depreciations, in months"
msgstr ""
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr ""
+
#. module: account_asset
#: field:account.asset.asset,method_number:0
#: selection:account.asset.asset,method_time:0
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 552ba93613510ee505b28ded70a4213574c28e7d..547823aabdb76d99b5d729b0e65e5b52cecc3742 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_bank_statement_extensions
-#: view:account.bank.statement.line:0
-msgid "Search Bank Transactions"
+#: help:account.bank.statement.line.global,name:0
+msgid "Originator to Beneficiary Information"
msgstr ""
#. module: account_bank_statement_extensions
@@ -197,6 +197,11 @@ msgstr ""
msgid "Name"
msgstr ""
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "OBI"
+msgstr ""
+
#. module: account_bank_statement_extensions
#: selection:account.bank.statement.line.global,type:0
msgid "ISO 20022"
@@ -247,6 +252,11 @@ msgstr ""
msgid "Child Codes"
msgstr ""
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
#. module: account_bank_statement_extensions
#: view:confirm.statement.line:0
msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
@@ -282,11 +292,6 @@ msgstr ""
msgid "Counterparty Name"
msgstr ""
-#. module: account_bank_statement_extensions
-#: field:account.bank.statement.line.global,name:0
-msgid "Communication"
-msgstr ""
-
#. module: account_bank_statement_extensions
#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
msgid "Bank Accounts"
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index 3bcac6f887fcaac899ec5bff8b181536e58f0d16..95b038a624b85684a9c4ce60ef4a0dfd299ab544 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index 203ee9545ab9ea5927c03bcaece3a883cd57c345..0b49af104545caf70441c5f3083d88804f276e9d 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_check_writing/i18n/account_check_writing.pot b/addons/account_check_writing/i18n/account_check_writing.pot
index 804f04a531b27730e56fd97438add6cb9250fad9..9673f1fb41b1ba6a60a0184a7d52e14ade0a6b68 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,12 @@ msgid "Check on Top"
msgstr ""
#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
#: view:account.voucher:0
msgid "Print Check"
msgstr ""
@@ -40,6 +46,17 @@ msgstr ""
msgid "Check on bottom"
msgstr ""
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_account_check_write
+msgid "Print Check in Batch"
+msgstr ""
+
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "One of the printed check already got a number."
+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."
@@ -83,17 +100,8 @@ msgid "Original Amount"
msgstr ""
#. module: account_check_writing
-#: model:ir.actions.act_window,help:account_check_writing.action_write_check
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a new check. \n"
-" </p><p>\n"
-" The check payment form allows you to track the payment you do\n"
-" to your suppliers using checks. When you select a supplier, the\n"
-" payment method and an amount for the payment, OpenERP will\n"
-" propose to reconcile your payment with the open supplier\n"
-" invoices or bills.\n"
-" </p>\n"
-" "
+#: field:res.company,check_layout:0
+msgid "Check Layout"
msgstr ""
#. module: account_check_writing
@@ -118,6 +126,20 @@ msgstr ""
msgid "Print Check (Bottom)"
msgstr ""
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a new check. \n"
+" </p><p>\n"
+" The check payment form allows you to track the payment you do\n"
+" to your suppliers using checks. When you select a supplier, the\n"
+" payment method and an amount for the payment, OpenERP will\n"
+" propose to reconcile your payment with the open supplier\n"
+" invoices or bills.\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
@@ -135,6 +157,17 @@ msgstr ""
msgid "Companies"
msgstr ""
+#. module: account_check_writing
+#: code:addons/account_check_writing/wizard/account_check_batch_printing.py:59
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.check.write,check_number:0
+msgid "The number of the next check number to be printed."
+msgstr ""
+
#. module: account_check_writing
#: report:account.print.check.bottom:0
#: report:account.print.check.middle:0
@@ -158,18 +191,33 @@ msgstr ""
msgid "Accounting Voucher"
msgstr ""
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "or"
+msgstr ""
+
#. module: account_check_writing
#: field:account.voucher,amount_in_word:0
msgid "Amount in Word"
msgstr ""
#. module: account_check_writing
-#: report:account.print.check.top:0
-msgid "Open Balance"
+#: model:ir.model,name:account_check_writing.model_account_check_write
+msgid "Prin Check in Batch"
msgstr ""
#. module: account_check_writing
-#: field:res.company,check_layout:0
-msgid "Choose Check layout"
+#: view:account.check.write:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.check.write,check_number:0
+msgid "Next Check Number"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.check.write:0
+msgid "Check"
msgstr ""
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index 69064e36e0127cabb186d8ee49cf4749d6923577..5d4a25b6c0bbc9551ecac4e2c7371a1a4cdcd89b 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,9 +16,11 @@ msgstr ""
"Plural-Forms: \n"
#. module: account_followup
-#: view:account_followup.followup.line:0
-#: field:account_followup.followup.line,manual_action:0
-msgid "Manual Action"
+#: 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 Reminder"
msgstr ""
#. module: account_followup
@@ -26,11 +28,6 @@ msgstr ""
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
@@ -52,6 +49,12 @@ msgstr ""
msgid "Next Action Date"
msgstr ""
+#. module: account_followup
+#: view:account_followup.followup.line:0
+#: field:account_followup.followup.line,manual_action:0
+msgid "Manual Action"
+msgstr ""
+
#. module: account_followup
#: field:account_followup.sending.results,needprinting:0
msgid "Needs Printing"
@@ -67,76 +70,6 @@ msgstr ""
msgid "Action To Do"
msgstr ""
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level0
-msgid "\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Dear ${object.name},</p>\n"
-" <p>\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"
-"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"
-" </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"\n"
-" <br/>\n"
-"${user.name}\n"
-"\n"
-"<br/>\n"
-"<br/>\n"
-"<%\n"
-" from openerp.addons.account_followup.report import account_followup_print\n"
-" rml_parse = account_followup_print.report_rappel(object._cr, user.id, \"followup_rml_parser\")\n"
-" final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)\n"
-" followup_table = ''\n"
-" for currency_dict in final_res:\n"
-" currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-" followup_table += '''\n"
-" <table border=\"2\" width=100%%>\n"
-" <tr>\n"
-" <td>Invoice date</td>\n"
-" <td>Reference</td>\n"
-" <td>Due date</td>\n"
-" <td>Amount (%s)</td>\n"
-" <td>Lit.</td>\n"
-" </tr>\n"
-" ''' % (currency_symbol)\n"
-" total = 0\n"
-" for aml in currency_dict['line']:\n"
-" block = aml['blocked'] and 'X' or ' '\n"
-" total += aml['balance']\n"
-" strbegin = \"<TD> \"\n"
-" strend = \"</TD> \"\n"
-" date = aml['date_maturity'] or aml['date']\n"
-" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-" strbegin = \"<TD><B>\"\n"
-" strend = \"</B></TD>\"\n"
-" followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-" total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)\n"
-" followup_table += '''<tr> </tr>\n"
-" </table>\n"
-" <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-" <br/>\n"
-"\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Follow-ups to do"
-msgstr ""
-
#. module: account_followup
#: field:account_followup.followup,company_id:0
#: view:account_followup.stat:0
@@ -156,20 +89,8 @@ msgid "Email Subject"
msgstr ""
#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid "\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments is printed below.\n"
-"\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"
-"Best Regards,\n"
-" "
+#: view:account_followup.followup.line:0
+msgid "%(user_signature)s"
msgstr ""
#. module: account_followup
@@ -187,16 +108,6 @@ msgstr ""
msgid "Email Body"
msgstr ""
-#. module: account_followup
-#: help:res.partner,payment_responsible_id:0
-msgid "Responsible for making sure the action happens."
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Overdue amount"
-msgstr ""
-
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.action_account_followup_print
msgid "Send Follow-Ups"
@@ -207,11 +118,66 @@ msgstr ""
msgid "Amount"
msgstr ""
+#. module: account_followup
+#: help:res.partner,payment_next_action:0
+msgid "This is the next action to be taken. It will automatically be set when the partner gets a follow-up level that requires a manual action. "
+msgstr ""
+
#. module: account_followup
#: view:res.partner:0
msgid "No Responsible"
msgstr ""
+#. module: account_followup
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
+msgid "\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.\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, so that we can resolve the matter quickly.\n"
+"\n"
+"Details of due payments is printed below.\n"
+"\n"
+"Best Regards,\n"
+""
+msgstr ""
+
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level0
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
+"\n"
+" <p>Dear ${object.name},</p>\n"
+" <p>\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"
+"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. \n"
+"\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+" <br/>\n"
+"${user.name}\n"
+"\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
+msgstr ""
+
#. module: account_followup
#: view:account_followup.stat.by.partner:0
msgid "Balance > 0"
@@ -232,6 +198,11 @@ msgstr ""
msgid ": Partner Name"
msgstr ""
+#. module: account_followup
+#: field:account_followup.followup.line,manual_action_responsible_id:0
+msgid "Assign a Responsible"
+msgstr ""
+
#. module: account_followup
#: view:account_followup.followup:0
#: field:account_followup.followup,followup_line:0
@@ -253,8 +224,15 @@ msgid "Partner"
msgstr ""
#. module: account_followup
-#: field:account_followup.print,partner_ids:0
-msgid "Partners"
+#: view:account_followup.followup:0
+msgid "To remind customers of paying their invoices, you can\n"
+" define different actions depending on how severely\n"
+" overdue the customer is. These actions are bundled\n"
+" into follow-up levels that are triggered when the due\n"
+" date of an invoice has passed a certain\n"
+" number of days. If there are other overdue invoices for the \n"
+" same customer, the actions of the most \n"
+" overdue invoice will be executed."
msgstr ""
#. module: account_followup
@@ -263,8 +241,8 @@ msgid "Date :"
msgstr ""
#. module: account_followup
-#: view:res.partner:0
-msgid "I am responsible"
+#: field:account_followup.print,partner_ids:0
+msgid "Partners"
msgstr ""
#. module: account_followup
@@ -273,21 +251,9 @@ msgid "Only one follow-up per company is allowed"
msgstr ""
#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
-msgid "\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Despite several reminders, your account is still not settled.\n"
-"\n"
-"Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.\n"
-"\n"
-"I trust that this action will prove unnecessary and details of due payments is printed below.\n"
-"\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"
-"Best Regards,\n"
-" "
+#: code:addons/account_followup/wizard/account_followup_print.py:254
+#, python-format
+msgid "Invoices Reminder"
msgstr ""
#. module: account_followup
@@ -296,13 +262,13 @@ msgid "When processing, it will print a letter"
msgstr ""
#. module: account_followup
-#: view:account_followup.stat:0
-msgid "Not Litigation"
+#: field:res.partner,payment_earliest_due_date:0
+msgid "Worst Due Date"
msgstr ""
#. module: account_followup
-#: view:res.partner:0
-msgid "Without responsible"
+#: view:account_followup.stat:0
+msgid "Not Litigation"
msgstr ""
#. module: account_followup
@@ -320,6 +286,39 @@ msgstr ""
msgid "%(partner_name)s"
msgstr ""
+#. module: account_followup
+#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
+" \n"
+" <p>Dear ${object.name},</p>\n"
+" <p>\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. so that we can resolve the matter quickly.\n"
+"Details of due payments is printed below.\n"
+" </p>\n"
+"<br/>\n"
+"Best Regards,\n"
+" \n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+" \n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
+msgstr ""
+
#. module: account_followup
#: field:account_followup.stat,debit:0
msgid "Debit"
@@ -372,12 +371,6 @@ msgstr ""
msgid "Due Days"
msgstr ""
-#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:155
-#, python-format
-msgid "Nobody"
-msgstr ""
-
#. module: account_followup
#: field:account.move.line,followup_line_id:0
#: view:account_followup.stat:0
@@ -411,8 +404,8 @@ msgid "Send Email Confirmation"
msgstr ""
#. module: account_followup
-#: view:res.partner:0
-msgid "Print Overdue Payments"
+#: view:account_followup.stat:0
+msgid "Follow-up Entries with period in current year"
msgstr ""
#. module: account_followup
@@ -433,36 +426,18 @@ msgstr ""
#. module: account_followup
#: model:ir.model,name:account_followup.model_account_followup_print
-#: model:ir.model,name:account_followup.model_account_followup_print_all
msgid "Print Follow-up & Send Mail to Customers"
msgstr ""
-#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid "\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
-"\n"
-"Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department at (+32).10.68.94.39.\n"
-"\n"
-"Best Regards,\n"
-""
-msgstr ""
-
#. module: account_followup
#: field:account_followup.followup.line,description:0
msgid "Printed Message"
msgstr ""
#. module: account_followup
-#: field:res.partner,latest_followup_level_id_without_lit:0
-msgid "Latest Follow-up Level without litigation"
-msgstr ""
-
-#. module: account_followup
-#: view:res.partner:0
-msgid "Partners with Credits"
+#: code:addons/account_followup/wizard/account_followup_print.py:155
+#, python-format
+msgid "Anybody"
msgstr ""
#. module: account_followup
@@ -477,7 +452,7 @@ msgstr ""
#. module: account_followup
#: view:res.partner:0
-msgid "Print overdue payments report independent of follow-up line"
+msgid "Print Overdue Payments"
msgstr ""
#. module: account_followup
@@ -487,7 +462,7 @@ msgid "Follow Ups"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/account_followup.py:227
+#: code:addons/account_followup/account_followup.py:219
#, python-format
msgid "Email not sent because of email address of partner not filled in"
msgstr ""
@@ -498,8 +473,8 @@ msgid "Account Follow-up"
msgstr ""
#. module: account_followup
-#: help:res.partner,payment_next_action_date:0
-msgid "This is when further follow-up is needed. The date will have been set to the current date if the action fields are empty and the partner gets a follow-up level that requires a manual action. "
+#: help:res.partner,payment_responsible_id:0
+msgid "Optionally you can assign a user to this field, which will make him responsible for the action."
msgstr ""
#. module: account_followup
@@ -523,14 +498,6 @@ msgstr ""
msgid "Search Partner"
msgstr ""
-#. module: account_followup
-#: view:res.partner:0
-msgid "Below is the history of the transactions of this\n"
-" customer. You can set an invoice in litigation in\n"
-" order to not include it in the next payment\n"
-" follow-ups."
-msgstr ""
-
#. module: account_followup
#: model:ir.ui.menu,name:account_followup.account_followup_print_menu
msgid "Send Letters and Emails"
@@ -547,7 +514,7 @@ msgid "Account Move line"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:240
+#: code:addons/account_followup/wizard/account_followup_print.py:237
#, python-format
msgid "Send Letters and Emails: Actions Summary"
msgstr ""
@@ -558,8 +525,8 @@ msgid "or"
msgstr ""
#. module: account_followup
-#: field:account_followup.stat,blocked:0
-msgid "Blocked"
+#: view:res.partner:0
+msgid "If not specified by the latest follow-up level, it will send from the default email template"
msgstr ""
#. module: account_followup
@@ -577,6 +544,16 @@ msgstr ""
msgid "Follow-Ups Analysis"
msgstr ""
+#. module: account_followup
+#: help:res.partner,payment_next_action_date:0
+msgid "This is when the manual follow-up is needed. The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to see if he keeps his promises."
+msgstr ""
+
+#. module: account_followup
+#: view:res.partner:0
+msgid "Print overdue payments report independent of follow-up line"
+msgstr ""
+
#. module: account_followup
#: help:account_followup.print,date:0
msgid "This field allow you to select a forecast date to plan your follow-ups"
@@ -593,14 +570,38 @@ msgid "Follow-up Responsible"
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"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
+" \n"
+" <p>Dear ${object.name},</p>\n"
+" <p>\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.\n"
+"</p>\n"
+"<br/>\n"
+"Best Regards,\n"
+"<br/>\n"
+"<br/>\n"
+"${user.name}\n"
+"<br/>\n"
+"<br/>\n"
+"\n"
+"\n"
+"${object.get_followup_table_html() | safe}\n"
+"\n"
+" <br/>\n"
+"\n"
+"</div>\n"
+" "
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:257
-#, python-format
-msgid "Invoices Reminder"
+#: report:account_followup.followup.print:0
+msgid "Document : Customer account statement"
msgstr ""
#. module: account_followup
@@ -609,23 +610,26 @@ msgid "Follow-up Levels"
msgstr ""
#. module: account_followup
-#: view:res.partner:0
-msgid "Future Follow-ups"
-msgstr ""
-
-#. module: account_followup
-#: view:account_followup.followup:0
-msgid "To remind customers of paying their invoices, you can\n"
-" define different actions depending on how severely\n"
-" overdue the customer is. These actions are bundled\n"
-" into folow-up levels that are triggered when the due\n"
-" date of the most overdue invoice has passed a certain\n"
-" amount of days."
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line4
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line5
+msgid "\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact our accounting department.\n"
+"\n"
+"Best Regards,\n"
+" "
msgstr ""
#. module: account_followup
-#: view:account_followup.stat:0
-msgid "Follow-up Entries with period in current year"
+#: field:res.partner,payment_amount_due:0
+msgid "Amount Due"
msgstr ""
#. module: account_followup
@@ -645,19 +649,21 @@ msgid "unknown"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/account_followup.py:245
+#: code:addons/account_followup/account_followup.py:283
#, python-format
msgid "Printed overdue payments report"
msgstr ""
#. module: account_followup
-#: model:ir.model,name:account_followup.model_email_template
-msgid "Email Templates"
+#: help:account_followup.followup.line,manual_action:0
+msgid "When processing, it will set the manual action to be taken for that customer. "
msgstr ""
#. module: account_followup
-#: help:account_followup.followup.line,manual_action:0
-msgid "When processing, it will set the manual action to be taken for that customer. "
+#: view:res.partner:0
+msgid "Below is the history of the transactions of this\n"
+" customer. You can check \"No Follow-up\" in\n"
+" order to exclude it from the next follow-up actions."
msgstr ""
#. module: account_followup
@@ -686,16 +692,6 @@ msgstr ""
msgid "Email Template"
msgstr ""
-#. module: account_followup
-#: view:account_followup.followup.line:0
-msgid "%(user_signature)s"
-msgstr ""
-
-#. module: account_followup
-#: model:ir.model,name:account_followup.model_res_company
-msgid "Companies"
-msgstr ""
-
#. module: account_followup
#: field:account_followup.print,summary:0
msgid "Summary"
@@ -708,93 +704,13 @@ msgid "Send an Email"
msgstr ""
#. module: account_followup
-#: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid "\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.\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"
-"\n"
-"Best Regards,\n"
-" "
+#: field:account_followup.stat,credit:0
+msgid "Credit"
msgstr ""
#. module: account_followup
-#: report:account_followup.followup.print:0
-msgid "Maturity Date"
-msgstr ""
-
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_default
-msgid "\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-" \n"
-" <p>Dear ${object.name},</p>\n"
-" <p>\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"
-" </p>\n"
-"<br/>\n"
-"Best Regards,\n"
-"</br>\n"
-"</br>\n"
-"<br/>\n"
-"${user.name}\n"
-" \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-" \n"
-"\n"
-"<%\n"
-" from openerp.addons.account_followup.report import account_followup_print\n"
-" rml_parse = account_followup_print.report_rappel(object._cr, user.id, \"followup_rml_parser\")\n"
-" final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)\n"
-" followup_table = ''\n"
-" for currency_dict in final_res:\n"
-" currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-" followup_table += '''\n"
-" <table border=\"2\" width=100%%>\n"
-" <tr>\n"
-" <td>Invoice date</td>\n"
-" <td>Reference</td>\n"
-" <td>Due date</td>\n"
-" <td>Amount (%s)</td>\n"
-" <td>Lit.</td>\n"
-" </tr>\n"
-" ''' % (currency_symbol)\n"
-" total = 0\n"
-" for aml in currency_dict['line']:\n"
-" block = aml['blocked'] and 'X' or ' '\n"
-" total += aml['balance']\n"
-" strbegin = \"<TD> \"\n"
-" strend = \"</TD> \"\n"
-" date = aml['date_maturity'] or aml['date']\n"
-" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-" strbegin = \"<TD><B>\"\n"
-" strend = \"</B></TD>\"\n"
-" followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-" total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)\n"
-" followup_table += '''<tr> </tr>\n"
-" </table>\n"
-" <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-" <br/>\n"
-"\n"
-"</div>\n"
-" "
+#: field:res.partner,payment_amount_overdue:0
+msgid "Amount Overdue"
msgstr ""
#. module: account_followup
@@ -809,69 +725,28 @@ msgid "Latest Follow-up Date"
msgstr ""
#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level1
+#: model:email.template,body_html:account_followup.email_template_account_followup_default
msgid "\n"
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
" \n"
" <p>Dear ${object.name},</p>\n"
-" <p>\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"
-" </p>\n"
+" <p>\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.\n"
+" </p>\n"
"<br/>\n"
"Best Regards,\n"
-" \n"
+"<br/>\n"
"<br/>\n"
"${user.name}\n"
-" \n"
"<br/>\n"
"<br/>\n"
"\n"
-" \n"
-"<%\n"
-" from openerp.addons.account_followup.report import account_followup_print\n"
-" rml_parse = account_followup_print.report_rappel(object._cr, user.id, \"followup_rml_parser\")\n"
-" final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)\n"
-" followup_table = ''\n"
-" for currency_dict in final_res:\n"
-" currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-" followup_table += '''\n"
-" <table border=\"2\" width=100%%>\n"
-" <tr>\n"
-" <td>Invoice date</td>\n"
-" <td>Reference</td>\n"
-" <td>Due date</td>\n"
-" <td>Amount (%s)</td>\n"
-" <td>Lit.</td>\n"
-" </tr>\n"
-" ''' % (currency_symbol)\n"
-" total = 0\n"
-" for aml in currency_dict['line']:\n"
-" block = aml['blocked'] and 'X' or ' '\n"
-" total += aml['balance']\n"
-" strbegin = \"<TD> \"\n"
-" strend = \"</TD> \"\n"
-" date = aml['date_maturity'] or aml['date']\n"
-" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-" strbegin = \"<TD><B>\"\n"
-" strend = \"</B></TD>\"\n"
-" followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-" total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)\n"
-" followup_table += '''<tr> </tr>\n"
-" </table>\n"
-" <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-" <br/>\n"
+"${object.get_followup_table_html() | safe}\n"
"\n"
+"<br/>\n"
"</div>\n"
" "
msgstr ""
@@ -900,14 +775,22 @@ msgid "%(company_name)s"
msgstr ""
#. module: account_followup
-#: field:account_followup.stat,date_move_last:0
-#: field:account_followup.stat.by.partner,date_move_last:0
-msgid "Last move"
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line1
+msgid "\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department. \n"
+"\n"
+"Best Regards,\n"
+""
msgstr ""
#. module: account_followup
-#: field:account_followup.followup.line,sequence:0
-msgid "Sequence"
+#: field:account_followup.stat,date_move_last:0
+#: field:account_followup.stat.by.partner,date_move_last:0
+msgid "Last move"
msgstr ""
#. module: account_followup
@@ -916,7 +799,7 @@ msgid "Period"
msgstr ""
#. module: account_followup
-#: code:addons/account_followup/wizard/account_followup_print.py:231
+#: code:addons/account_followup/wizard/account_followup_print.py:228
#, python-format
msgid "%s partners have no credits and as such the action is cleared"
msgstr ""
@@ -944,7 +827,6 @@ msgstr ""
#. module: account_followup
#: view:account_followup.stat:0
-#: view:res.partner:0
msgid "Litigation"
msgstr ""
@@ -976,8 +858,9 @@ msgid ": Current Date"
msgstr ""
#. module: account_followup
-#: field:res.partner,payment_amount_due:0
-msgid "Total amount due"
+#: view:account_followup.print:0
+msgid "This action will send follow-up emails, print the letters and\n"
+" set the manual actions per customer, according to the follow-up levels defined."
msgstr ""
#. module: account_followup
@@ -996,14 +879,6 @@ msgstr ""
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"
@@ -1025,8 +900,8 @@ 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"
+#: field:res.partner,latest_followup_level_id_without_lit:0
+msgid "Latest Follow-up Level without litigation"
msgstr ""
#. module: account_followup
@@ -1048,14 +923,20 @@ msgid "Follow-up lines"
msgstr ""
#. module: account_followup
-#: 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."
+#: model:account_followup.followup.line,description:account_followup.demo_followup_line3
+msgid "\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Despite several reminders, your account is still not settled.\n"
+"\n"
+"Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.\n"
+"\n"
+"I trust that this action will prove unnecessary and details of due payments is printed below.\n"
+"\n"
+"In case of any queries concerning this matter, do not hesitate to contact our accounting department.\n"
+"\n"
+"Best Regards,\n"
+""
msgstr ""
#. module: account_followup
@@ -1105,6 +986,11 @@ msgstr ""
msgid " letter(s) in report"
msgstr ""
+#. module: account_followup
+#: view:res.partner:0
+msgid "Partners with Overdue Credits"
+msgstr ""
+
#. module: account_followup
#: view:res.partner:0
msgid "Customer Followup"
@@ -1122,78 +1008,6 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
" "
msgstr ""
-#. module: account_followup
-#: model:email.template,body_html:account_followup.email_template_account_followup_level2
-msgid "\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-" \n"
-" <p>Dear ${object.name},</p>\n"
-" <p>\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"
-"</p>\n"
-"<br/>\n"
-"Best Regards,\n"
-" \n"
-"<br/>\n"
-"${user.name}\n"
-" \n"
-"<br/>\n"
-"<br/>\n"
-"\n"
-" \n"
-"\n"
-"<%\n"
-" from openerp.addons.account_followup.report import account_followup_print\n"
-" rml_parse = account_followup_print.report_rappel(object._cr, user.id, \"followup_rml_parser\")\n"
-" final_res = rml_parse._lines_get_with_partner(object, user.company_id.id)\n"
-" followup_table = ''\n"
-" for currency_dict in final_res:\n"
-" currency_symbol = currency_dict.get('line', [{'currency_id': user.company_id.currency_id}])[0]['currency_id'].symbol\n"
-" followup_table += '''\n"
-" <table border=\"2\" width=100%%>\n"
-" <tr>\n"
-" <td>Invoice date</td>\n"
-" <td>Reference</td>\n"
-" <td>Due date</td>\n"
-" <td>Amount (%s)</td>\n"
-" <td>Lit.</td>\n"
-" </tr>\n"
-" ''' % (currency_symbol)\n"
-" total = 0\n"
-" for aml in currency_dict['line']:\n"
-" block = aml['blocked'] and 'X' or ' '\n"
-" total += aml['balance']\n"
-" strbegin = \"<TD> \"\n"
-" strend = \"</TD> \"\n"
-" date = aml['date_maturity'] or aml['date']\n"
-" if date <= ctx['current_date'] and aml['balance'] > 0:\n"
-" strbegin = \"<TD><B>\"\n"
-" strend = \"</B></TD>\"\n"
-" followup_table +=\"<TR>\" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + \"</TR>\"\n"
-" total = rml_parse.formatLang(total, dp='Account', currency_obj=object.company_id.currency_id)\n"
-" followup_table += '''<tr> </tr>\n"
-" </table>\n"
-" <center>Amount due: %s </center>''' % (total)\n"
-"\n"
-"%>\n"
-"\n"
-"${followup_table}\n"
-"\n"
-" <br/>\n"
-"\n"
-"</div>\n"
-" "
-msgstr ""
-
-#. module: account_followup
-#: help:res.partner,payment_next_action:0
-msgid "This is the next action to be taken by the user. It will automatically be set when the action fields are empty and the partner gets a follow-up level that requires a manual action. "
-msgstr ""
-
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:166
#, python-format
@@ -1216,8 +1030,8 @@ msgid "Total credit"
msgstr ""
#. module: account_followup
-#: field:account_followup.stat,credit:0
-msgid "Credit"
+#: field:account_followup.followup.line,sequence:0
+msgid "Sequence"
msgstr ""
#. module: account_followup
@@ -1230,6 +1044,11 @@ msgstr ""
msgid "Customer Ref :"
msgstr ""
+#. module: account_followup
+#: report:account_followup.followup.print:0
+msgid "Maturity Date"
+msgstr ""
+
#. module: account_followup
#: help:account_followup.followup.line,delay:0
msgid "The number of days after the due date of the invoice to wait before sending the reminder. Could be negative if you want to send a polite alert beforehand."
@@ -1245,11 +1064,6 @@ msgstr ""
msgid "Test Print"
msgstr ""
-#. module: account_followup
-#: view:res.partner:0
-msgid "Search view"
-msgstr ""
-
#. module: account_followup
#: view:account_followup.followup.line:0
msgid ": User Name"
@@ -1260,6 +1074,11 @@ msgstr ""
msgid "Accounting"
msgstr ""
+#. module: account_followup
+#: field:account_followup.stat,blocked:0
+msgid "Blocked"
+msgstr ""
+
#. module: account_followup
#: field:res.partner,payment_note:0
msgid "Customer Payment Promise"
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index cc768d9a20d63f166956df32ed5b4088a19482be..6119ff10ea65827f5c72483a409b49a9923f130d 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot
index 6ee126deda32ea5e747419354ccc0e29042f40da..df0dae09f16dd6ffb946d9feca5d62c2101e962d 100644
--- a/addons/account_sequence/i18n/account_sequence.pot
+++ b/addons/account_sequence/i18n/account_sequence.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/account_test/i18n/account_test.pot b/addons/account_test/i18n/account_test.pot
new file mode 100644
index 0000000000000000000000000000000000000000..c14a0dc666b23c3c822320677b391d398ebd921f
--- /dev/null
+++ b/addons/account_test/i18n/account_test.pot
@@ -0,0 +1,222 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * account_test
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code should always set a variable named `result` with the result of your test, that can be a list or\n"
+"a dictionary. If `result` is an empty list, it means that the test was succesful. Otherwise it will\n"
+"try to translate and print what is inside `result`.\n"
+"\n"
+"If the result of your test is a dictionary, you can set a variable named `column_order` to choose in\n"
+"what order you want to print `result`'s content.\n"
+"\n"
+"Should you need them, you can also use the following variables into your code:\n"
+" * cr: cursor to the database\n"
+" * uid: ID of the current user\n"
+"\n"
+"In any ways, the code must be legal python statements with correct indentation (if needed).\n"
+"\n"
+"Example: \n"
+" sql = '''SELECT id, name, ref, date\n"
+" FROM account_move_line \n"
+" WHERE account_id IN (SELECT id FROM account_account WHERE type = 'view')\n"
+" '''\n"
+" cr.execute(sql)\n"
+" result = cr.dictfetchall()"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_02
+msgid "Test 2: Opening a fiscal year"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05
+msgid "Check that reconciled invoice for Sales/Purchases has reconciled entries for Payable and Receivable Accounts"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_03
+msgid "Check if movement lines are balanced and have the same date and period"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,name:0
+msgid "Test Name"
+msgstr ""
+
+#. module: account_test
+#: report:account.test.assert.print:0
+msgid "Accouting tests on"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_01
+msgid "Test 1: General balance"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06
+msgid "Check that paid/reconciled invoices are not in 'Open' state"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_05_2
+msgid "Check that reconciled account moves, that define Payable and Receivable accounts, are belonging to reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Tests"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,desc:0
+msgid "Test Description"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Description"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_06_1
+msgid "Check that there's no move for any account with « View » account type"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_08
+msgid "Test 9 : Accounts and partners on account moves"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,name:account_test.action_accounting_assert
+#: model:ir.actions.report.xml,name:account_test.account_assert_test_report
+#: model:ir.ui.menu,name:account_test.menu_action_license
+msgid "Accounting Tests"
+msgstr ""
+
+#. module: account_test
+#: code:addons/account_test/report/account_test_report.py:74
+#, python-format
+msgid "The test was passed successfully"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06
+msgid "Test 6Â : Invoices status"
+msgstr ""
+
+#. module: account_test
+#: model:ir.model,name:account_test.model_accounting_assert_test
+msgid "accounting.assert.test"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05
+msgid "Test 5.1Â : Payable and Receivable accountant lines of reconciled invoices"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,code_exec:0
+msgid "Python code"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_07
+msgid "Check on bank statement that the Closing Balance = Starting Balance + sum of statement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_07
+msgid "Test 8 : Closing balance on bank statements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_03
+msgid "Test 3: Movement lines"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_05_2
+msgid "Test 5.2Â : Reconcilied invoices and Payable/Receivable accounts"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Expression"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_04
+msgid "Test 4: Totally reconciled mouvements"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_04
+msgid "Check if the totally reconciled movements are balanced"
+msgstr ""
+
+#. module: account_test
+#: field:accounting.assert.test,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_02
+msgid "Check if the balance of the new opened fiscal year matches with last year's balance"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Python Code"
+msgstr ""
+
+#. module: account_test
+#: model:ir.actions.act_window,help:account_test.action_accounting_assert
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create Accounting Test.\n"
+" </p>\n"
+" "
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_01
+msgid "Check the balance: Debit sum = Credit sum"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,desc:account_test.account_test_08
+msgid "Check that general accounts and partners on account moves are active"
+msgstr ""
+
+#. module: account_test
+#: model:accounting.assert.test,name:account_test.account_test_06_1
+msgid "Test 7: « View  » account type"
+msgstr ""
+
+#. module: account_test
+#: view:accounting.assert.test:0
+msgid "Code Help"
+msgstr ""
+
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index afd3545a4c61b260c8bdc0eebfb5d95e2a79ea69..84e22e0215e5e51f7e9a8e75fd6f1f0818351435 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@ msgid "account.config.settings"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:348
+#: code:addons/account_voucher/account_voucher.py:357
#, python-format
msgid "Write-Off"
msgstr ""
@@ -62,12 +62,6 @@ msgstr ""
msgid "(Update)"
msgstr ""
-#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "You have to delete the bank statement line which the payment was reconciled to manually. Please check the payment of the partner %s by the amount of %s."
-msgstr ""
-
#. module: account_voucher
#: view:account.voucher:0
#: model:ir.actions.act_window,name:account_voucher.act_pay_bills
@@ -132,7 +126,7 @@ msgid "Voucher Statistics"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
#, python-format
msgid "You can not change the journal as you already reconciled some statement lines!"
msgstr ""
@@ -142,6 +136,12 @@ msgstr ""
msgid "Validate"
msgstr ""
+#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
+msgid "Supplier Payments"
+msgstr ""
+
#. module: account_voucher
#: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -204,9 +204,9 @@ msgid "Messages"
msgstr ""
#. module: account_voucher
-#: selection:account.voucher,type:0
-#: selection:sale.receipt.report,type:0
-msgid "Sale"
+#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
+msgid "Purchase Receipts"
msgstr ""
#. module: account_voucher
@@ -215,8 +215,8 @@ msgid "Journal Item"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
-#: code:addons/account_voucher/account_voucher.py:964
+#: code:addons/account_voucher/account_voucher.py:496
+#: code:addons/account_voucher/account_voucher.py:967
#, python-format
msgid "Error!"
msgstr ""
@@ -243,7 +243,7 @@ msgid "Cancelled"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
#, python-format
msgid "You have to configure account base code and account tax code on the '%s' tax!"
msgstr ""
@@ -281,7 +281,7 @@ msgid "Tax"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -301,6 +301,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: account_voucher
+#: view:account.voucher:0
+msgid "Total Allocation"
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Payment Information"
@@ -324,6 +329,12 @@ msgstr ""
msgid "Import Invoices"
msgstr ""
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "Wrong voucher line"
+msgstr ""
+
#. module: account_voucher
#: selection:account.voucher,pay_now:0
#: selection:sale.receipt.report,pay_now:0
@@ -338,7 +349,7 @@ msgid "Receipt"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1001
+#: code:addons/account_voucher/account_voucher.py:1004
#, python-format
msgid "You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
@@ -356,6 +367,8 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
+#: code:addons/account_voucher/account_voucher.py:199
+#, python-format
msgid "Supplier"
msgstr ""
@@ -375,7 +388,7 @@ msgid "Debit"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1558
+#: code:addons/account_voucher/account_voucher.py:1533
#, python-format
msgid "Unable to change journal !"
msgstr ""
@@ -403,6 +416,16 @@ msgstr ""
msgid "Voucher Entries"
msgstr ""
+#. module: account_voucher
+#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a new supplier payment.\n"
+" </p><p>\n"
+" OpenERP helps you easily track payments you make and the remaining balances you need to pay your suppliers.\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: account_voucher
#: view:account.voucher:0
msgid "Open Supplier Journal Entries"
@@ -423,13 +446,6 @@ msgstr ""
msgid "Are you sure to unreconcile and cancel this record ?"
msgstr ""
-#. module: account_voucher
-#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
-msgid "Sales Receipt"
-msgstr ""
-
#. module: account_voucher
#: field:account.voucher,is_multi_currency:0
msgid "Multi Currency Voucher"
@@ -465,13 +481,13 @@ msgid "Avg. Due Delay"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/invoice.py:33
+#: code:addons/account_voucher/invoice.py:34
#, python-format
msgid "Pay Invoice"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1134
+#: code:addons/account_voucher/account_voucher.py:1139
#, python-format
msgid "No Account Base Code and Account Tax Code!"
msgstr ""
@@ -522,15 +538,15 @@ msgid "To Review"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1008
-#: code:addons/account_voucher/account_voucher.py:1022
-#: code:addons/account_voucher/account_voucher.py:1175
+#: code:addons/account_voucher/account_voucher.py:1011
+#: code:addons/account_voucher/account_voucher.py:1025
+#: code:addons/account_voucher/account_voucher.py:1180
#, python-format
msgid "change"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
+#: code:addons/account_voucher/account_voucher.py:1000
#, python-format
msgid "You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
@@ -622,7 +638,7 @@ msgid "Reconcile Payment Balance"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:960
+#: code:addons/account_voucher/account_voucher.py:963
#, python-format
msgid "Configuration Error !"
msgstr ""
@@ -667,6 +683,11 @@ msgstr ""
msgid "August"
msgstr ""
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Validate Payment"
+msgstr ""
+
#. module: account_voucher
#: help:account.voucher,audit:0
msgid "Check this box if you are unsure of that journal entry and if you want to note it as 'to be reviewed' by an accounting expert."
@@ -678,7 +699,7 @@ msgid "October"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:961
+#: code:addons/account_voucher/account_voucher.py:964
#, python-format
msgid "Please activate the sequence of selected journal !"
msgstr ""
@@ -698,6 +719,13 @@ msgstr ""
msgid "Paid"
msgstr ""
+#. module: account_voucher
+#: view:account.voucher:0
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
+msgid "Sales Receipts"
+msgstr ""
+
#. module: account_voucher
#: field:account.voucher,message_is_follower:0
msgid "Is a Follower"
@@ -735,23 +763,6 @@ msgstr ""
msgid "Amount reconciled"
msgstr ""
-#. module: account_voucher
-#: field:account.voucher,message_comment_ids:0
-#: help:account.voucher,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: account_voucher
-#: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a new supplier payment.\n"
-" </p><p>\n"
-" OpenERP helps you easily track payments you do and remining\n"
-" balance to pay to your supplier.\n"
-" </p>\n"
-" "
-msgstr ""
-
#. module: account_voucher
#: selection:account.voucher,pay_now:0
#: selection:sale.receipt.report,pay_now:0
@@ -768,6 +779,12 @@ msgstr ""
msgid "Previous Payments ?"
msgstr ""
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1098
+#, python-format
+msgid "The invoice you are willing to pay is not valid anymore."
+msgstr ""
+
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "January"
@@ -795,25 +812,28 @@ msgid "Active"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:965
+#: code:addons/account_voucher/account_voucher.py:968
#, python-format
msgid "Please define a sequence on the journal."
msgstr ""
#. module: account_voucher
-#: view:account.voucher:0
-msgid "Total Allocation"
+#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
+#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
+msgid "Customer Payments"
msgstr ""
#. module: account_voucher
+#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
+#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
#: view:sale.receipt.report:0
-msgid "Group by Invoice Date"
+msgid "Sales Receipts Analysis"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:1093
-#, python-format
-msgid "Wrong bank statement line"
+#: view:sale.receipt.report:0
+msgid "Group by Invoice Date"
msgstr ""
#. module: account_voucher
@@ -878,13 +898,6 @@ msgstr ""
msgid "Sales Information"
msgstr ""
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
-#: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
-#: view:sale.receipt.report:0
-msgid "Sales Receipt Analysis"
-msgstr ""
-
#. module: account_voucher
#: view:account.voucher:0
#: field:account.voucher.line,voucher_id:0
@@ -927,18 +940,11 @@ msgid "Journal Items"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:492
+#: code:addons/account_voucher/account_voucher.py:496
#, python-format
msgid "Please define default credit/debit accounts on the journal \"%s\"."
msgstr ""
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
-msgid "Customer Payment"
-msgstr ""
-
#. module: account_voucher
#: selection:account.voucher,type:0
#: selection:sale.receipt.report,type:0
@@ -1010,12 +1016,6 @@ msgstr ""
msgid "Journal"
msgstr ""
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
-#: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
-msgid "Supplier Payment"
-msgstr ""
-
#. module: account_voucher
#: view:account.voucher:0
msgid "Internal Notes"
@@ -1034,8 +1034,6 @@ msgstr ""
#. module: account_voucher
#: view:account.voucher:0
-#: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
-#: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
msgid "Purchase Receipt"
msgstr ""
@@ -1093,6 +1091,12 @@ msgstr ""
msgid "Gain Exchange Rate Account"
msgstr ""
+#. module: account_voucher
+#: selection:account.voucher,type:0
+#: selection:sale.receipt.report,type:0
+msgid "Sale"
+msgstr ""
+
#. module: account_voucher
#: selection:sale.receipt.report,month:0
msgid "April"
@@ -1135,7 +1139,7 @@ msgid "The amount of the voucher must be the same amount as the one on the state
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:864
+#: code:addons/account_voucher/account_voucher.py:867
#, python-format
msgid "Cannot delete voucher(s) which are already opened or paid."
msgstr ""
@@ -1146,7 +1150,7 @@ msgid "Effective date for accounting entries"
msgstr ""
#. module: account_voucher
-#: model:mail.message.subtype,name:account_voucher.mt_voucher
+#: model:mail.message.subtype,name:account_voucher.mt_voucher_state_change
msgid "Status Change"
msgstr ""
@@ -1193,8 +1197,13 @@ msgid "Open Balance"
msgstr ""
#. module: account_voucher
-#: code:addons/account_voucher/account_voucher.py:997
-#: code:addons/account_voucher/account_voucher.py:1001
+#: model:mail.message.subtype,description:account_voucher.mt_voucher_state_change
+msgid "Status <b>changed</b>"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:1000
+#: code:addons/account_voucher/account_voucher.py:1004
#, python-format
msgid "Insufficient Configuration!"
msgstr ""
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index 65c5640e1e985f6cee71325966893448577fb37a..8ad0654898def5dadd9ab3802d59438f59a9bbd5 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,9 @@ msgid "In Progress"
msgstr ""
#. module: analytic
-#: model:mail.message.subtype,name:analytic.mt_account_status
-msgid "Status Change"
+#: code:addons/analytic/analytic.py:229
+#, python-format
+msgid "Contract: "
msgstr ""
#. module: analytic
@@ -45,6 +46,19 @@ msgstr ""
msgid "Specifies the amount of quantity to count."
msgstr ""
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid "If you select the View Type, it means you won't allow to create journal entries using that account.\n"
+"The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"
+"If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"
+"The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."
+msgstr ""
+
#. module: analytic
#: view:account.analytic.account:0
msgid "Once the end date of the contract is\n"
@@ -56,9 +70,13 @@ msgid "Once the end date of the contract is\n"
msgstr ""
#. module: analytic
-#: code:addons/analytic/analytic.py:222
-#, python-format
-msgid "Contract: "
+#: selection:account.analytic.account,type:0
+msgid "Contract or Project"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account/Contract Name"
msgstr ""
#. module: analytic
@@ -71,20 +89,14 @@ msgstr ""
msgid "Followers"
msgstr ""
-#. module: analytic
-#: code:addons/analytic/analytic.py:319
-#, python-format
-msgid "Contract <b>created</b>."
-msgstr ""
-
#. module: analytic
#: selection:account.analytic.account,state:0
msgid "Closed"
msgstr ""
#. module: analytic
-#: field:account.analytic.account,debit:0
-msgid "Debit"
+#: model:mail.message.subtype,name:analytic.mt_account_pending
+msgid "Contract to Renew"
msgstr ""
#. module: analytic
@@ -103,7 +115,7 @@ msgid "Status"
msgstr ""
#. module: analytic
-#: code:addons/analytic/analytic.py:261
+#: code:addons/analytic/analytic.py:268
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -119,11 +131,6 @@ msgstr ""
msgid "Description"
msgstr ""
-#. module: analytic
-#: field:account.analytic.account,name:0
-msgid "Account/Contract Name"
-msgstr ""
-
#. module: analytic
#: field:account.analytic.account,message_unread:0
msgid "Unread Messages"
@@ -150,13 +157,18 @@ msgstr ""
msgid "Messages and communication history"
msgstr ""
+#. module: analytic
+#: model:mail.message.subtype,description:analytic.mt_account_opened
+msgid "Stage <b>opened</b>"
+msgstr ""
+
#. module: analytic
#: help:account.analytic.account,quantity_max:0
msgid "Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)"
msgstr ""
#. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
#, python-format
msgid "If you set a company, the currency selected has to be the same as it's currency. \n"
"You can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."
@@ -173,8 +185,8 @@ msgid "User"
msgstr ""
#. module: analytic
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: model:mail.message.subtype,description:analytic.mt_account_pending
+msgid "Contract <b>pending</b>"
msgstr ""
#. module: analytic
@@ -183,17 +195,18 @@ msgid "Date"
msgstr ""
#. module: analytic
-#: help:account.analytic.account,type:0
-msgid "If you select the View Type, it means you won't allow to create journal entries using that account.\n"
-"The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"
-"If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"
-"The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."
+#: model:mail.message.subtype,name:analytic.mt_account_closed
+msgid "Contract Finished"
msgstr ""
#. module: analytic
-#: field:account.analytic.account,message_comment_ids:0
-#: help:account.analytic.account,message_comment_ids:0
-msgid "Comments and emails"
+#: view:account.analytic.account:0
+msgid "Terms and Conditions"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid "Calculated by multiplying the quantity and the price given in the Product's cost price. Always expressed in the company main currency."
msgstr ""
#. module: analytic
@@ -212,8 +225,8 @@ msgid "Messages"
msgstr ""
#. module: analytic
-#: constraint:account.analytic.line:0
-msgid "You cannot create analytic line on view account."
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
msgstr ""
#. module: analytic
@@ -243,19 +256,13 @@ msgid "Credit"
msgstr ""
#. module: analytic
-#: field:account.analytic.line,amount:0
-msgid "Amount"
+#: model:mail.message.subtype,name:analytic.mt_account_opened
+msgid "Contract Opened"
msgstr ""
#. module: analytic
-#: code:addons/analytic/analytic.py:321
-#, python-format
-msgid "Contract for <em>%s</em> has been <b>created</b>."
-msgstr ""
-
-#. module: analytic
-#: view:account.analytic.account:0
-msgid "Terms and Conditions"
+#: model:mail.message.subtype,description:analytic.mt_account_closed
+msgid "Contract <b>closed</b>"
msgstr ""
#. module: analytic
@@ -300,7 +307,7 @@ msgid "Reference"
msgstr ""
#. module: analytic
-#: code:addons/analytic/analytic.py:153
+#: code:addons/analytic/analytic.py:160
#, python-format
msgid "Error!"
msgstr ""
@@ -311,8 +318,8 @@ msgid "Analytic Accounting"
msgstr ""
#. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Contract or Project"
+#: field:account.analytic.line,amount:0
+msgid "Amount"
msgstr ""
#. module: analytic
@@ -349,8 +356,8 @@ msgid "Start Date"
msgstr ""
#. module: analytic
-#: help:account.analytic.line,amount:0
-msgid "Calculated by multiplying the quantity and the price given in the Product's cost price. Always expressed in the company main currency."
+#: constraint:account.analytic.line:0
+msgid "You cannot create analytic line on view account."
msgstr ""
#. module: analytic
diff --git a/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot b/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot
index 937ff0a71729911f21415a7c864f811a4c69aeaa..2ac57971716309de1541f77047ff401b1bc09fc9 100644
--- a/addons/analytic_contract_hr_expense/i18n/analytic_contract_hr_expense.pot
+++ b/addons/analytic_contract_hr_expense/i18n/analytic_contract_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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -36,13 +36,13 @@ msgid "Analytic Account"
msgstr ""
#. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:129
#, python-format
msgid "Expenses to Invoice of %s"
msgstr ""
#. module: analytic_contract_hr_expense
-#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119
+#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:121
#, python-format
msgid "Expenses of %s"
msgstr ""
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index b75fdf6df4f7d4fdd10ca29c0d569e02adfa0db0..f0c0671d4d6fe00d9716f713e2ca35b8c0cd0d4f 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/anonymization/i18n/anonymization.pot b/addons/anonymization/i18n/anonymization.pot
index de0b34d8a67f2dd3d45ab4803243a54ad3600080..cafebb554b45295982361b8e00ca35b2d44620e7 100644
--- a/addons/anonymization/i18n/anonymization.pot
+++ b/addons/anonymization/i18n/anonymization.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
msgid "ir.model.fields.anonymize.wizard"
msgstr ""
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
#. module: anonymization
#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_migration_fix
msgid "ir.model.fields.anonymization.migration.fix"
@@ -35,6 +40,12 @@ msgstr ""
msgid "sql"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:91
+#, python-format
+msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to create, write or delete fields."
+msgstr ""
+
#. module: anonymization
#: field:ir.model.fields.anonymization,field_name:0
msgid "Field Name"
@@ -46,6 +57,11 @@ msgstr ""
msgid "Field"
msgstr ""
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+msgid "New"
+msgstr ""
+
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,file_import:0
msgid "Import"
@@ -56,6 +72,12 @@ msgstr ""
msgid "ir.model.fields.anonymization"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:300
+#, python-format
+msgid "Before executing the anonymization process, you should make a backup of your database."
+msgstr ""
+
#. module: anonymization
#: field:ir.model.fields.anonymization.history,state:0
#: field:ir.model.fields.anonymize.wizard,state:0
@@ -96,8 +118,9 @@ msgid "unknown"
msgstr ""
#. module: anonymization
-#: field:ir.model.fields.anonymization,model_id:0
-msgid "Object"
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Anonymized value is None. This cannot happens."
msgstr ""
#. module: anonymization
@@ -105,6 +128,11 @@ msgstr ""
msgid "File path"
msgstr ""
+#. module: anonymization
+#: help:ir.model.fields.anonymize.wizard,file_import:0
+msgid "This is the file created by the anonymization process. It should have the '.pickle' extention."
+msgstr ""
+
#. module: anonymization
#: field:ir.model.fields.anonymization.history,date:0
msgid "Date"
@@ -120,6 +148,12 @@ msgstr ""
msgid "Reverse the Database Anonymization"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:444
+#, python-format
+msgid "Cannot anonymize fields of these types: binary, many2many, many2one, one2many, reference."
+msgstr ""
+
#. module: anonymization
#: view:ir.model.fields.anonymize.wizard:0
msgid "Database Anonymization"
@@ -147,6 +181,12 @@ msgstr ""
msgid "Clear"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:533
+#, python-format
+msgid "It is not possible to reverse the anonymization process without supplying the anonymization export file."
+msgstr ""
+
#. module: anonymization
#: field:ir.model.fields.anonymize.wizard,summary:0
msgid "Summary"
@@ -157,6 +197,13 @@ msgstr ""
msgid "Anonymized Field"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:391
+#: code:addons/anonymization/anonymization.py:526
+#, python-format
+msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to do anything."
+msgstr ""
+
#. module: anonymization
#: selection:ir.model.fields.anonymize.wizard,state:0
msgid "Unstable"
@@ -195,8 +242,16 @@ msgid "ir.model.fields.anonymization.history"
msgstr ""
#. module: anonymization
-#: help:ir.model.fields.anonymize.wizard,file_import:0
-msgid "This is the file created by the anonymization process. It should have the '.pickle' extention."
+#: code:addons/anonymization/anonymization.py:358
+#, python-format
+msgid "The database anonymization is currently in an unstable state. Some fields are anonymized, while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#: code:addons/anonymization/anonymization.py:448
+#, python-format
+msgid "Error !"
msgstr ""
#. module: anonymization
@@ -225,6 +280,12 @@ msgstr ""
msgid "Started"
msgstr ""
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:389
+#, python-format
+msgid "The database is currently anonymized, you cannot anonymize it again."
+msgstr ""
+
#. module: anonymization
#: selection:ir.model.fields.anonymization.history,state:0
msgid "Done"
diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot
index e93abf2fd419ac5927662718c360a28ecff89772..c24f9a22ff26def3ca25689f0db6590c140274a9 100644
--- a/addons/audittrail/i18n/audittrail.pot
+++ b/addons/audittrail/i18n/audittrail.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_crypt/i18n/auth_crypt.pot b/addons/auth_crypt/i18n/auth_crypt.pot
new file mode 100644
index 0000000000000000000000000000000000000000..268674c8ddbc1c88c8918b47cf469cee7161f37a
--- /dev/null
+++ b/addons/auth_crypt/i18n/auth_crypt.pot
@@ -0,0 +1,27 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * auth_crypt
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr ""
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
+msgid "Users"
+msgstr ""
+
diff --git a/addons/auth_ldap/i18n/auth_ldap.pot b/addons/auth_ldap/i18n/auth_ldap.pot
index e6c135ce4a4018ae2f8e6b9befd0ea7a715adfb0..e47120b689cb826702db400d9f3c3018d3253059 100644
--- a/addons/auth_ldap/i18n/auth_ldap.pot
+++ b/addons/auth_ldap/i18n/auth_ldap.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_oauth/i18n/auth_oauth.pot b/addons/auth_oauth/i18n/auth_oauth.pot
index 87e19da34032f17115788e4d8187e930465c7e47..e6219eba41ff8cbef3f88aa7032f961b10686c6a 100644
--- a/addons/auth_oauth/i18n/auth_oauth.pot
+++ b/addons/auth_oauth/i18n/auth_oauth.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot b/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot
new file mode 100644
index 0000000000000000000000000000000000000000..d4c0a829a7bbf07f2a5174921294aaf75dfba086
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/auth_oauth_signup.pot
@@ -0,0 +1,22 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * auth_oauth_signup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr ""
+
diff --git a/addons/auth_openid/i18n/auth_openid.pot b/addons/auth_openid/i18n/auth_openid.pot
index 5083faea0455897b3a0d560b747d9511031e5f31..74148eaee95766ce2ae652a8b81bc6d680b7c52c 100644
--- a/addons/auth_openid/i18n/auth_openid.pot
+++ b/addons/auth_openid/i18n/auth_openid.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot
index bde3b33684e9f085e51094c9f33d85686688b20a..31d884383730a12b71a684013a15badefd791852 100644
--- a/addons/auth_signup/i18n/auth_signup.pot
+++ b/addons/auth_signup/i18n/auth_signup.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-04 14:41+0000\n"
-"PO-Revision-Date: 2012-12-04 14:41+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,6 +15,11 @@ msgstr ""
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
+#. module: auth_signup
+#: field:res.partner,signup_type:0
+msgid "Signup Token Type"
+msgstr ""
+
#. module: auth_signup
#: field:base.config.settings,auth_signup_uninvited:0
msgid "Allow external users to sign up"
@@ -38,7 +43,7 @@ msgid "base.config.settings"
msgstr ""
#. module: auth_signup
-#: code:addons/auth_signup/res_users.py:248
+#: code:addons/auth_signup/res_users.py:252
#, python-format
msgid "Cannot send email: user has no email address."
msgstr ""
@@ -62,7 +67,7 @@ msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
#, python-format
msgid "Please enter a password and confirm it."
msgstr ""
@@ -84,6 +89,12 @@ msgstr ""
msgid "New"
msgstr ""
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:258
+#, python-format
+msgid "Mail sent to:"
+msgstr ""
+
#. module: auth_signup
#: field:res.users,state:0
msgid "Status"
@@ -101,7 +112,7 @@ msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
#, python-format
msgid "Please enter a name."
msgstr ""
@@ -118,7 +129,7 @@ msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
#, python-format
msgid "Please enter a username."
msgstr ""
@@ -128,6 +139,13 @@ msgstr ""
msgid "Active"
msgstr ""
+#. module: auth_signup
+#: code:addons/auth_signup/res_users.py:256
+#, python-format
+msgid "Cannot send email: no outgoing email server configured.\n"
+"You can configure it under Settings/General Settings."
+msgstr ""
+
#. module: auth_signup
#. openerp-web
#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
@@ -144,7 +162,7 @@ msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
#, python-format
msgid "Please enter a username or email address."
msgstr ""
@@ -185,35 +203,35 @@ msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:114
-#: code:addons/auth_signup/static/src/js/auth_signup.js:117
-#: code:addons/auth_signup/static/src/js/auth_signup.js:120
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
-#: code:addons/auth_signup/static/src/js/auth_signup.js:160
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:119
+#: code:addons/auth_signup/static/src/js/auth_signup.js:122
+#: code:addons/auth_signup/static/src/js/auth_signup.js:125
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
+#: code:addons/auth_signup/static/src/js/auth_signup.js:165
#, python-format
msgid "Login"
msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:94
+#: code:addons/auth_signup/static/src/js/auth_signup.js:99
#, python-format
msgid "Invalid signup token"
msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:123
+#: code:addons/auth_signup/static/src/js/auth_signup.js:128
#, python-format
msgid "Passwords do not match; please retype them."
msgstr ""
#. module: auth_signup
#. openerp-web
-#: code:addons/auth_signup/static/src/js/auth_signup.js:111
-#: code:addons/auth_signup/static/src/js/auth_signup.js:157
+#: code:addons/auth_signup/static/src/js/auth_signup.js:116
+#: code:addons/auth_signup/static/src/js/auth_signup.js:162
#, python-format
msgid "No database selected !"
msgstr ""
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index 871fc453be0a5d819d43d2d6bf9cce407262a15b..1970e2bf814f95e467b9a7c5501a03b15635cec8 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: base_action_rule
-#: field:base.action.rule,act_followers:0
-msgid "Set Followers"
+#: selection:base.action.rule.lead.test,state:0
+msgid "In Progress"
msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
-msgid "The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab."
+msgid "- In this same \"Search\" view, select the menu \"Save Current Filter\", enter the name (Ex: Create the 01/01/2012) and add the option \"Share with all users\""
msgstr ""
#. module: base_action_rule
@@ -31,105 +31,114 @@ msgid "Action Rules"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_user_id:0
+#: view:base.action.rule:0
+msgid "Select a filter or a timer as condition."
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,user_id:0
msgid "Responsible"
msgstr ""
#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_actions_server
-msgid "ir.actions.server"
+#: help:base.action.rule,server_action_ids:0
+msgid "Examples: email reminders, call object service, etc."
msgstr ""
#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Note"
+#: field:base.action.rule,act_followers:0
+msgid "Add Followers"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_partner_categ_id:0
-msgid "Partner Category"
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible"
msgstr ""
#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Server Actions to be Triggered (eg. Email Reminder, Call Object Method, etc...)"
+#: help:base.action.rule,trg_date_range:0
+msgid "Delay after the trigger date.You can put a negative number if you need a delay before thetrigger date, like sending a reminder 15 minutes before a meeting."
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_date_range:0
-msgid "Delay after trigger date"
+#: model:ir.model,name:base_action_rule.model_base_action_rule_lead_test
+msgid "base.action.rule.lead.test"
msgstr ""
#. module: base_action_rule
-#: help:base.action.rule,active:0
-msgid "If the active field is set to False, it will allow you to hide the rule without removing it."
+#: selection:base.action.rule.lead.test,state:0
+msgid "Closed"
msgstr ""
#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions"
+#: selection:base.action.rule.lead.test,state:0
+msgid "New"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_state_from:0
-msgid "Status"
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
-#: field:ir.actions.server,action_rule_id:0
-msgid "Action Rule"
+msgid "Conditions"
msgstr ""
#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Fields to Change"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Pending"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_state_to:0
-msgid "Button Pressed"
+#: field:base.action.rule.lead.test,state:0
+msgid "Status"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_pre_id:0
+msgid "Before Update Filter"
msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
-msgid "Conditions on Status"
+msgid "Action Rule"
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Action Date"
+#: help:base.action.rule,filter_id:0
+msgid "If present, this condition must be satisfied after the update of the record."
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Hours"
+#: view:base.action.rule:0
+msgid "Fields to Change"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,act_state:0
-msgid "Set State to"
+#: view:base.action.rule:0
+msgid "The filter must therefore be available in this page."
msgstr ""
#. module: base_action_rule
-#: help:base.action.rule,server_action_ids:0
-msgid "Define Server actions.\n"
-"eg:Email Reminders, Call Object Service, etc.."
+#: field:base.action.rule,filter_id:0
+msgid "After Update Filter"
msgstr ""
#. module: base_action_rule
-#: help:base.action.rule,trg_date_range:0
-msgid "Delay After Trigger Date,specifies you can put a negative number. If you need a delay before the trigger date, like sending a reminder 15 minutes before a meeting."
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
msgstr ""
#. module: base_action_rule
-#: model:ir.model,name:base_action_rule.model_ir_cron
-msgid "ir.cron"
+#: view:base.action.rule:0
+msgid "To create a new filter:"
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Date"
+#: field:base.action.rule,active:0
+#: field:base.action.rule.lead.test,active:0
+msgid "Active"
msgstr ""
#. module: base_action_rule
@@ -138,29 +147,29 @@ msgid "Delay After Trigger Date"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,act_user_id:0
-msgid "Set Responsible to"
+#: view:base.action.rule:0
+msgid "An action rule is checked when you create or modify the \"Related Document Model\". The precondition filter is checked right before the modification while the postcondition filter is checked after the modification. A precondition filter will therefore not work during a creation."
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "None"
+#: view:base.action.rule:0
+msgid "Filter Condition"
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_range_type:0
-msgid "Months"
+#: view:base.action.rule:0
+msgid "- Go to your \"Related Document Model\" page and set the filter parameters in the \"Search\" view (Example of filter based on Leads/Opportunities: Creation Date \"is equal to\" 01/01/2012)"
msgstr ""
#. module: base_action_rule
-#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
-#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
-msgid "Automated Actions"
+#: field:base.action.rule,name:0
+msgid "Rule Name"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,model_id:0
-msgid "Related Document Model"
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
msgstr ""
#. module: base_action_rule
@@ -169,13 +178,8 @@ msgid "Gives the sequence order when displaying a list of rules."
msgstr ""
#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Fields"
-msgstr ""
-
-#. module: base_action_rule
-#: field:base.action.rule,server_action_ids:0
-msgid "Server Action"
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
msgstr ""
#. module: base_action_rule
@@ -184,28 +188,28 @@ msgid "Days"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_date_range_type:0
-msgid "Delay type"
+#: view:base.action.rule:0
+msgid "Timer"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,filter_id:0
-msgid "Filter"
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,active:0
-msgid "Active"
+#: view:base.action.rule:0
+msgid "Server actions to run"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,regex_name:0
-msgid "Regex on Resource Name"
+#: help:base.action.rule,active:0
+msgid "When unchecked, the rule is hidden and will not be executed."
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Last Modified Date"
+#: selection:base.action.rule.lead.test,state:0
+msgid "Cancelled"
msgstr ""
#. module: base_action_rule
@@ -224,20 +228,13 @@ msgid "Minutes"
msgstr ""
#. module: base_action_rule
-#: help:base.action.rule,regex_name:0
-msgid "Regular expression for matching name of the resource\n"
-"e.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\n"
-"Note: This is case sensitive search."
-msgstr ""
-
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Timing"
+#: field:base.action.rule,model_id:0
+msgid "Related Document Model"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,name:0
-msgid "Rule Name"
+#: help:base.action.rule,filter_pre_id:0
+msgid "If present, this condition must be satisfied before the update of the record."
msgstr ""
#. module: base_action_rule
@@ -245,11 +242,6 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Conditions on Model Partner"
-msgstr ""
-
#. module: base_action_rule
#: view:base.action.rule:0
msgid "Actions"
@@ -269,33 +261,34 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
" "
msgstr ""
-#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Creation Date"
-msgstr ""
-
#. module: base_action_rule
#: field:base.action.rule,create_date:0
msgid "Create Date"
msgstr ""
#. module: base_action_rule
-#: selection:base.action.rule,trg_date_type:0
-msgid "Deadline"
+#: field:base.action.rule.lead.test,date_action_last:0
+msgid "Last Action"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_partner_id:0
+#: field:base.action.rule.lead.test,partner_id:0
msgid "Partner"
msgstr ""
#. module: base_action_rule
-#: field:base.action.rule,trg_date_type:0
+#: field:base.action.rule,trg_date_id:0
msgid "Trigger Date"
msgstr ""
#. module: base_action_rule
#: view:base.action.rule:0
+#: field:base.action.rule,server_action_ids:0
msgid "Server Actions"
msgstr ""
+#. module: base_action_rule
+#: field:base.action.rule.lead.test,name:0
+msgid "Subject"
+msgstr ""
+
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index e06e4cdcea0809f0e2bb507e6fbffc796e3c6283..8e9433af7d0d7b2cbaeff8ea5832ef7f02423d92 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -64,12 +64,6 @@ msgstr ""
msgid "Feedback Meeting"
msgstr ""
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:117
-#, python-format
-msgid "Meeting <b>completed</b>."
-msgstr ""
-
#. module: base_calendar
#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
@@ -251,7 +245,7 @@ msgid "To"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1225
+#: code:addons/base_calendar/base_calendar.py:1255
#, python-format
msgid "Error!"
msgstr ""
@@ -271,6 +265,13 @@ msgstr ""
msgid "Procedure"
msgstr ""
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+#: field:crm.meeting,recurrent_id:0
+msgid "Recurrent ID"
+msgstr ""
+
#. module: base_calendar
#: selection:calendar.event,state:0
#: selection:calendar.todo,state:0
@@ -330,14 +331,9 @@ msgid "Meetings"
msgstr ""
#. module: base_calendar
-#: selection:calendar.attendee,cutype:0
-msgid "Room"
-msgstr ""
-
-#. module: base_calendar
-#: field:calendar.event,recurrent_id:0
-#: field:calendar.todo,recurrent_id:0
-#: field:crm.meeting,recurrent_id:0
+#: field:calendar.event,recurrent_id_date:0
+#: field:calendar.todo,recurrent_id_date:0
+#: field:crm.meeting,recurrent_id_date:0
msgid "Recurrent ID date"
msgstr ""
@@ -358,11 +354,11 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
-#: code:addons/base_calendar/base_calendar.py:417
-#: code:addons/base_calendar/base_calendar.py:980
-#: code:addons/base_calendar/base_calendar.py:982
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:399
+#: code:addons/base_calendar/base_calendar.py:444
+#: code:addons/base_calendar/base_calendar.py:1008
+#: code:addons/base_calendar/base_calendar.py:1010
+#: code:addons/base_calendar/base_calendar.py:1455
#, python-format
msgid "Warning!"
msgstr ""
@@ -504,8 +500,8 @@ msgid "Email"
msgstr ""
#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_unread
-msgid "CRM Meeting: Mark unread"
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
msgstr ""
#. module: base_calendar
@@ -519,7 +515,7 @@ msgid "Event alarm information"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:982
+#: code:addons/base_calendar/base_calendar.py:1010
#, python-format
msgid "Count cannot be negative or 0."
msgstr ""
@@ -530,11 +526,9 @@ msgid "Creation Date"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:111
#: view:crm.meeting:0
#: model:ir.model,name:base_calendar.model_crm_meeting
#: model:res.request.link,name:base_calendar.request_link_meeting
-#, python-format
msgid "Meeting"
msgstr ""
@@ -563,10 +557,8 @@ msgid "Caldav URL"
msgstr ""
#. module: base_calendar
-#: field:calendar.event,recurrent_uid:0
-#: field:calendar.todo,recurrent_uid:0
-#: field:crm.meeting,recurrent_uid:0
-msgid "Recurrent ID"
+#: model:ir.model,name:base_calendar.model_mail_wizard_invite
+msgid "Invite wizard"
msgstr ""
#. module: base_calendar
@@ -599,7 +591,7 @@ msgid "Delegrated To"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:94
+#: code:addons/base_calendar/crm_meeting.py:102
#, python-format
msgid "The following contacts have no email address :"
msgstr ""
@@ -707,12 +699,6 @@ msgstr ""
msgid "Individual"
msgstr ""
-#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:114
-#, python-format
-msgid "Meeting <b>confirmed</b>."
-msgstr ""
-
#. module: base_calendar
#: help:calendar.event,count:0
#: help:calendar.todo,count:0
@@ -748,7 +734,7 @@ msgid "Declined"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1430
+#: code:addons/base_calendar/base_calendar.py:1455
#, python-format
msgid "Group by date is not supported, use the calendar view instead."
msgstr ""
@@ -784,13 +770,6 @@ msgstr ""
msgid "Basic Alarm Information"
msgstr ""
-#. module: base_calendar
-#: field:calendar.event,mo:0
-#: field:calendar.todo,mo:0
-#: field:crm.meeting,mo:0
-msgid "Mon"
-msgstr ""
-
#. module: base_calendar
#: field:calendar.event,fr:0
#: field:calendar.todo,fr:0
@@ -988,9 +967,10 @@ msgid "Indicate the groups that the attendee belongs to"
msgstr ""
#. module: base_calendar
-#: field:crm.meeting,message_comment_ids:0
-#: help:crm.meeting,message_comment_ids:0
-msgid "Comments and emails"
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+#: field:crm.meeting,mo:0
+msgid "Mon"
msgstr ""
#. module: base_calendar
@@ -1041,11 +1021,6 @@ msgstr ""
msgid "Interval"
msgstr ""
-#. module: base_calendar
-#: model:ir.actions.server,name:base_calendar.actions_server_crm_meeting_read
-msgid "CRM Meeting: Mark read"
-msgstr ""
-
#. module: base_calendar
#: selection:calendar.event,week_list:0
#: selection:calendar.todo,week_list:0
@@ -1070,7 +1045,7 @@ msgid "Active"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:388
+#: code:addons/base_calendar/base_calendar.py:399
#, python-format
msgid "You cannot duplicate a calendar attendee."
msgstr ""
@@ -1206,7 +1181,7 @@ msgid "Select Weekdays"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:1489
+#: code:addons/base_calendar/base_calendar.py:1514
#: selection:calendar.attendee,availability:0
#: selection:calendar.event,show_as:0
#: selection:calendar.todo,show_as:0
@@ -1329,6 +1304,11 @@ msgstr ""
msgid "Search Meetings"
msgstr ""
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
#. module: base_calendar
#: model:ir.model,name:base_calendar.model_crm_meeting_type
msgid "Meeting Type"
@@ -1405,6 +1385,11 @@ msgstr ""
msgid "Contains the text to be used as the message subject for email or contains the text to be used for display"
msgstr ""
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_mail_message
+msgid "Message"
+msgstr ""
+
#. module: base_calendar
#: field:calendar.event,base_calendar_alarm_id:0
#: field:calendar.todo,base_calendar_alarm_id:0
@@ -1425,7 +1410,7 @@ msgid "April"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/crm_meeting.py:98
+#: code:addons/base_calendar/crm_meeting.py:106
#, python-format
msgid "Email addresses not found"
msgstr ""
@@ -1443,7 +1428,7 @@ msgid "Weekday"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:980
+#: code:addons/base_calendar/base_calendar.py:1008
#, python-format
msgid "Interval cannot be negative."
msgstr ""
@@ -1456,7 +1441,7 @@ msgid "By day"
msgstr ""
#. module: base_calendar
-#: code:addons/base_calendar/base_calendar.py:417
+#: code:addons/base_calendar/base_calendar.py:444
#, python-format
msgid "First you have to specify the date of the invitation."
msgstr ""
diff --git a/addons/base_gengo/i18n/base_gengo.pot b/addons/base_gengo/i18n/base_gengo.pot
index 5ab1781fa3d7caa702c77defa95ecf88bb6949b5..7fe77c3f8aeaabb219ca4876583d271115e4c727 100644
--- a/addons/base_gengo/i18n/base_gengo.pot
+++ b/addons/base_gengo/i18n/base_gengo.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index 43efca13ebccf6a2042373e7dbbcb9dbd71d8397..5976e3d15243e3e2f2bd3944d593eb2d0ae9d664 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index 29a4118655331f46ef7329939272c79ab3e28548..027911b59ff28092b7e615f97597ef865662a18c 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -421,14 +421,6 @@ msgstr ""
msgid "base_import.tests.models.m2o.required"
msgstr ""
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/xml/import.xml:212
-#, python-format
-msgid "How can I import a one2many relationship (e.g. several \n"
-" Order Lines of a Sale Order)?"
-msgstr ""
-
#. module: base_import
#: model:ir.model,name:base_import.model_base_import_tests_models_char_noreadonly
msgid "base_import.tests.models.char.noreadonly"
@@ -749,6 +741,14 @@ msgid "We will first export all companies and their \n"
" \"External ID\". In PSQL, write the following command:"
msgstr ""
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/xml/import.xml:212
+#, python-format
+msgid "How can I import a one2many relationship (e.g. several \n"
+" Order Lines of a Sales Order)?"
+msgstr ""
+
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/js/import.js:373
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
index 27157b284f6b399dca6a75d42df6ee87afc15711..ded37bedeb8d895a426e43e5c503838598d23c3c 100644
--- a/addons/base_report_designer/i18n/base_report_designer.pot
+++ b/addons/base_report_designer/i18n/base_report_designer.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index d27f600b154a468947b3cb8d3762c575158999b6..7ff08d99ea1363d252429287db59a00fde2b9e9d 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -49,6 +49,11 @@ msgid "OpenERP allows to automatically create leads (or others documents)\n"
" plugins for your preferred email application."
msgstr ""
+#. module: base_setup
+#: field:sale.config.settings,module_sale:0
+msgid "SALE"
+msgstr ""
+
#. module: base_setup
#: selection:base.setup.terminology,partner:0
msgid "Member"
@@ -107,13 +112,13 @@ msgid "Manage multiple companies"
msgstr ""
#. module: base_setup
-#: help:base.config.settings,module_portal:0
-msgid "Give access your customers and suppliers to their documents."
+#: view:sale.config.settings:0
+msgid "On Mail Client"
msgstr ""
#. module: base_setup
-#: view:sale.config.settings:0
-msgid "On Mail Client"
+#: view:base.config.settings:0
+msgid "--db-filter=YOUR_DATABAE"
msgstr ""
#. module: base_setup
@@ -182,6 +187,12 @@ msgid "Work in multi-company environments, with appropriate security access betw
" This installs the module multi_company."
msgstr ""
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "The public portal is accessible only if you are in a single database mode. You can\n"
+" launch the OpenERP Server with the option"
+msgstr ""
+
#. module: base_setup
#: view:base.config.settings:0
msgid "You will find more options in your company details: address for the header and footer, overdue payments texts, etc."
@@ -197,6 +208,15 @@ msgstr ""
msgid "How do you call a Customer"
msgstr ""
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "When you send a document to a customer\n"
+" (quotation, invoice), your customer will be\n"
+" able to signup to get all his documents,\n"
+" read your company news, check his projects,\n"
+" etc."
+msgstr ""
+
#. module: base_setup
#: model:ir.model,name:base_setup.model_base_setup_terminology
msgid "base.setup.terminology"
@@ -208,7 +228,7 @@ msgid "Client"
msgstr ""
#. module: base_setup
-#: help:base.config.settings,module_auth_anonymous:0
+#: help:base.config.settings,module_portal_anonymous:0
msgid "Enable the public part of openerp, openerp becomes a public website."
msgstr ""
@@ -254,7 +274,13 @@ msgstr ""
#. module: base_setup
#: field:base.config.settings,module_portal:0
-msgid "Activate the customer/supplier portal"
+msgid "Activate the customer portal"
+msgstr ""
+
+#. module: base_setup
+#: view:base.config.settings:0
+msgid "to do so.\n"
+" Once activated, the login page will be replaced by the public website."
msgstr ""
#. module: base_setup
@@ -263,7 +289,12 @@ msgid "Allow documents sharing"
msgstr ""
#. module: base_setup
-#: field:base.config.settings,module_auth_anonymous:0
+#: view:base.config.settings:0
+msgid "(company news, jobs, contact form, etc.)"
+msgstr ""
+
+#. module: base_setup
+#: field:base.config.settings,module_portal_anonymous:0
msgid "Activate the public portal"
msgstr ""
@@ -277,6 +308,11 @@ msgstr ""
msgid "Social Network Integration"
msgstr ""
+#. module: base_setup
+#: help:base.config.settings,module_portal:0
+msgid "Give your customers access to their documents."
+msgstr ""
+
#. module: base_setup
#: view:base.config.settings:0
#: view:sale.config.settings:0
diff --git a/addons/base_status/i18n/base_status.pot b/addons/base_status/i18n/base_status.pot
index 8f7a191533afc5b02c8c52122a00736440f88d7b..3805dd46ce939d8cb16074b34154c434cda64420 100644
--- a/addons/base_status/i18n/base_status.pot
+++ b/addons/base_status/i18n/base_status.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,21 +22,19 @@ msgid "Error !"
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:326
-#: code:addons/base_status/base_state.py:187
+#: code:addons/base_status/base_state.py:166
#, python-format
msgid "%s has been <b>opened</b>."
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:350
-#: code:addons/base_status/base_state.py:220
+#: code:addons/base_status/base_state.py:199
#, python-format
msgid "%s has been <b>renewed</b>."
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
#, python-format
msgid "Error!"
msgstr ""
@@ -48,34 +46,26 @@ msgid "You can not escalate, you are already at the top level regarding your sal
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:344
-#: code:addons/base_status/base_state.py:214
+#: code:addons/base_status/base_state.py:193
#, python-format
msgid "%s is now <b>pending</b>."
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:338
-#, python-format
-msgid "%s has been <b>cancelled</b>."
-msgstr ""
-
-#. module: base_status
-#: code:addons/base_status/base_state.py:208
+#: code:addons/base_status/base_state.py:187
#, python-format
msgid "%s has been <b>canceled</b>."
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:211
+#: code:addons/base_status/base_stage.py:210
#, python-format
msgid "You are already at the top level of your sales-team category.\n"
"Therefore you cannot escalate furthermore."
msgstr ""
#. module: base_status
-#: code:addons/base_status/base_stage.py:332
-#: code:addons/base_status/base_state.py:202
+#: code:addons/base_status/base_state.py:181
#, python-format
msgid "%s has been <b>closed</b>."
msgstr ""
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index 1ffcfe68f4814d2b22159f41765e67fc4081d881..d4fdf471d05c4d6b47391875ac021ebef0dcd0db 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index b1a0fef54c68e38b2e48d3c2f7cf7e43d65982d3..3293c8193fc2b0f396cb7eb051db625be32b5489 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index 4df180d6787c1b12dd3b136d2ab5c93789d7d50f..6a219f815df0e34da21a20e8f5cf74f448bf49f3 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/contacts/i18n/contacts.pot b/addons/contacts/i18n/contacts.pot
index bb34937dc265c59b35c039928ace5d43a3ba1dd1..7072b564e36c1fc48374dbde65e6fd3cc8d7dcd9 100644
--- a/addons/contacts/i18n/contacts.pot
+++ b/addons/contacts/i18n/contacts.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index 1657899a8ea1a873c3e6278aa21343542a779307..2baf466ad6a6b69faaa3039d07f0fbc395b5e42d 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,13 @@ msgid "Allows you to configure your incoming mail server, and create leads from
msgstr ""
#. module: crm
+#: code:addons/crm/crm_lead.py:880
#: selection:crm.case.stage,type:0
#: view:crm.lead:0
#: selection:crm.lead,type:0
#: view:crm.lead.report:0
#: selection:crm.lead.report,type:0
+#, python-format
msgid "Lead"
msgstr ""
@@ -40,28 +42,34 @@ msgid "Title"
msgstr ""
#. module: crm
-#: field:crm.lead2partner,action:0
+#: model:ir.actions.server,message:crm.action_email_reminder_lead
+msgid "Warning unprocessed incoming lead is more than 5 day old.\n"
+"Name: [[object.name ]]\n"
+"ID: [[object.id ]]\n"
+"Description: [[object.description]]\n"
+" "
+msgstr ""
+
+#. module: crm
#: field:crm.opportunity2phonecall,action:0
-#: field:crm.phonecall2partner,action:0
#: field:crm.phonecall2phonecall,action:0
msgid "Action"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_phonecall.py:282
-#, python-format
-msgid "Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>."
+#: model:ir.actions.server,name:crm.action_set_team_sales_department
+msgid "Set team to Sales Department"
msgstr ""
#. module: crm
-#: model:res.groups,name:crm.group_fund_raising
-#: field:sale.config.settings,group_fund_raising:0
-msgid "Manage Fund Raising"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Select Opportunities"
msgstr ""
#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Convert to Opportunities"
+#: model:res.groups,name:crm.group_fund_raising
+#: field:sale.config.settings,group_fund_raising:0
+msgid "Manage Fund Raising"
msgstr ""
#. module: crm
@@ -71,9 +79,9 @@ msgid "Delay to close"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:888
-#, python-format
-msgid "Lead has been <b>converted to an opportunity</b>."
+#: view:crm.case.stage:0
+#: field:crm.case.stage,name:0
+msgid "Stage Name"
msgstr ""
#. module: crm
@@ -89,11 +97,6 @@ msgstr ""
msgid "CRM Lead Analysis"
msgstr ""
-#. module: crm
-#: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
-msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
-
#. module: crm
#: view:crm.lead.report:0
#: view:crm.phonecall.report:0
@@ -139,6 +142,12 @@ msgstr ""
msgid "Rule Name"
msgstr ""
+#. module: crm
+#: code:addons/crm/crm_phonecall.py:280
+#, python-format
+msgid "It's only possible to convert one phonecall at a time."
+msgstr ""
+
#. module: crm
#: view:crm.case.resource.type:0
#: view:crm.lead:0
@@ -167,8 +176,8 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#: code:addons/crm/wizard/crm_lead_to_partner.py:47
+#: code:addons/crm/crm_lead.py:632
+#: code:addons/crm/crm_phonecall.py:280
#, python-format
msgid "Warning!"
msgstr ""
@@ -195,7 +204,7 @@ msgid "Schedule Other Call"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_phonecall.py:199
+#: code:addons/crm/crm_phonecall.py:209
#: view:crm.phonecall:0
#, python-format
msgid "Phone Call"
@@ -207,8 +216,13 @@ msgid "Opt-Out"
msgstr ""
#. module: crm
-#: field:crm.case.stage,fold:0
-msgid "Hide in Views when Empty"
+#: field:crm.lead,state_id:0
+msgid "State"
+msgstr ""
+
+#. module: crm
+#: field:res.partner,meeting_count:0
+msgid "# Meetings"
msgstr ""
#. module: crm
@@ -227,8 +241,8 @@ msgid "Excluded Answers :"
msgstr ""
#. module: crm
-#: field:crm.case.stage,section_ids:0
-msgid "Sections"
+#: model:ir.model,name:crm.model_crm_merge_opportunity
+msgid "Merge opportunities"
msgstr ""
#. module: crm
@@ -239,7 +253,7 @@ msgid "Leads Analysis"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:878
+#: code:addons/crm/crm_lead.py:1010
#, python-format
msgid "<b>%s a call</b> for the <em>%s</em>."
msgstr ""
@@ -250,16 +264,6 @@ msgstr ""
msgid "Campaigns"
msgstr ""
-#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Select Opportunities"
-msgstr ""
-
-#. module: crm
-#: field:crm.lead,state_id:0
-msgid "State"
-msgstr ""
-
#. module: crm
#: view:crm.lead:0
#: field:crm.lead,categ_ids:0
@@ -278,7 +282,7 @@ msgid "Prospect Partner"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:811
+#: code:addons/crm/crm_lead.py:967
#, python-format
msgid "No Subject"
msgstr ""
@@ -367,11 +371,17 @@ msgstr ""
msgid "Unread Messages"
msgstr ""
+#. module: crm
+#: view:crm.segmentation:0
+#: field:crm.segmentation.line,segmentation_id:0
+#: model:ir.actions.act_window,name:crm.crm_segmentation-act
+msgid "Segmentation"
+msgstr ""
+
#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
+#: selection:crm.partner.binding,action:0
msgid "Link to an existing customer"
msgstr ""
@@ -391,7 +401,6 @@ msgid "This percentage depicts the default/average probability of the Case for t
msgstr ""
#. module: crm
-#: field:base.action.rule,trg_categ_id:0
#: view:crm.lead:0
#: field:crm.opportunity2phonecall,categ_id:0
#: field:crm.phonecall,categ_id:0
@@ -406,15 +415,20 @@ msgstr ""
msgid "#Opportunities"
msgstr ""
+#. module: crm
+#: code:addons/crm/crm_lead.py:632
+#, python-format
+msgid "Please select more than one element (lead or opportunity) from the list view."
+msgstr ""
+
#. module: crm
#: view:crm.lead:0
msgid "Leads that are assigned to one of the sale teams I manage, or to me"
msgstr ""
#. module: crm
-#: field:crm.lead2opportunity.partner,name:0
-#: field:crm.lead2opportunity.partner.mass,name:0
-msgid "Conversion Action"
+#: field:crm.lead,partner_address_email:0
+msgid "Partner Contact Email"
msgstr ""
#. module: crm
@@ -445,21 +459,12 @@ msgstr ""
#. module: crm
#: view:crm.lead2opportunity.partner:0
-#: view:crm.partner2opportunity:0
msgid "Create Opportunity"
msgstr ""
#. module: crm
-#: selection:crm.lead.report,creation_month:0
-#: selection:crm.lead.report,deadline_month:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: crm
-#: view:crm.case.stage:0
-#: field:crm.case.stage,name:0
-msgid "Stage Name"
+#: view:sale.config.settings:0
+msgid "Configure"
msgstr ""
#. module: crm
@@ -473,8 +478,8 @@ msgid "Mailings"
msgstr ""
#. module: crm
-#: view:crm.phonecall:0
-msgid "To Do"
+#: model:mail.message.subtype,description:crm.mt_lead_stage
+msgid "Stage changed"
msgstr ""
#. module: crm
@@ -495,8 +500,8 @@ msgid "Planned Revenue"
msgstr ""
#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
-msgid "CRM Phonecall: Mark read"
+#: field:crm.lead,planned_revenue:0
+msgid "Expected Revenue"
msgstr ""
#. module: crm
@@ -528,6 +533,11 @@ msgstr ""
msgid "Merge"
msgstr ""
+#. module: crm
+#: model:email.template,subject:crm.email_template_opportunity_mail
+msgid "Opportunity ${object.name | h})"
+msgstr ""
+
#. module: crm
#: view:crm.case.categ:0
msgid "Case Category"
@@ -538,11 +548,6 @@ msgstr ""
msgid "Partner Contact Name"
msgstr ""
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
-msgid "CRM Phonecall: Mark unread"
-msgstr ""
-
#. module: crm
#: model:ir.actions.server,subject:crm.action_email_reminder_lead
msgid "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']]"
@@ -563,6 +568,11 @@ msgstr ""
msgid "The code of the sales team must be unique !"
msgstr ""
+#. module: crm
+#: help:crm.lead,email_from:0
+msgid "Email address of the contact"
+msgstr ""
+
#. module: crm
#: selection:crm.case.stage,state:0
#: view:crm.lead:0
@@ -620,8 +630,8 @@ msgid "Partner Segmentation"
msgstr ""
#. module: crm
-#: help:crm.phonecall,duration:0
-msgid "Duration in Minutes"
+#: field:crm.lead,company_currency:0
+msgid "Currency"
msgstr ""
#. module: crm
@@ -640,8 +650,8 @@ msgid "The name of the segmentation."
msgstr ""
#. module: crm
-#: model:ir.filters,name:crm.filter_usa_lead
-msgid "Leads from USA"
+#: field:crm.case.stage,probability:0
+msgid "Probability (%)"
msgstr ""
#. module: crm
@@ -660,13 +670,7 @@ msgid "Statistics Dashboard"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:853
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
-#. module: crm
-#: code:addons/crm/crm_lead.py:755
+#: code:addons/crm/crm_lead.py:860
#: model:crm.case.stage,name:crm.stage_lead2
#: selection:crm.case.stage,type:0
#: view:crm.lead:0
@@ -679,12 +683,6 @@ msgstr ""
msgid "Opportunity"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_meeting.py:62
-#, python-format
-msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
#. module: crm
#: model:crm.case.resource.type,name:crm.type_lead7
msgid "Television"
@@ -720,17 +718,6 @@ msgstr ""
msgid "Leads/Opportunities that are assigned to one of the sale teams I manage"
msgstr ""
-#. module: crm
-#: field:crm.partner2opportunity,name:0
-#: field:crm.phonecall2opportunity,name:0
-msgid "Opportunity Name"
-msgstr ""
-
-#. module: crm
-#: field:base.action.rule,act_section_id:0
-msgid "Set Team to"
-msgstr ""
-
#. module: crm
#: field:calendar.attendee,categ_id:0
msgid "Event Type"
@@ -742,25 +729,21 @@ msgid "Exclusive"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:512
+#: code:addons/crm/crm_lead.py:591
#, python-format
msgid "From %s : %s"
msgstr ""
#. module: crm
-#: field:crm.lead.report,creation_year:0
-msgid "Creation Year"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Convert to Opportunities"
msgstr ""
#. module: crm
#: view:crm.lead2opportunity.partner:0
#: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
#: view:crm.merge.opportunity:0
#: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
#: view:crm.phonecall2phonecall:0
msgid "or"
msgstr ""
@@ -781,20 +764,6 @@ msgstr ""
msgid "Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."
msgstr ""
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_lead
-msgid "Hello [[object.user_id.name]], \n"
-"can you check following lead, it's not open since 5 days ?\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-" [[object.description]]\n"
-"\n"
-"Thanks,\n"
-" "
-msgstr ""
-
#. module: crm
#: view:crm.case.stage:0
#: field:crm.case.stage,requirements:0
@@ -802,8 +771,8 @@ msgid "Requirements"
msgstr ""
#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "Convert To Opportunity "
+#: field:crm.lead,zip:0
+msgid "Zip"
msgstr ""
#. module: crm
@@ -849,8 +818,8 @@ msgid "Mark Won"
msgstr ""
#. module: crm
-#: field:crm.case.stage,probability:0
-msgid "Probability (%)"
+#: model:ir.filters,name:crm.filter_usa_lead
+msgid "Leads from USA"
msgstr ""
#. module: crm
@@ -876,7 +845,7 @@ msgid "Send Email"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
#, python-format
msgid "Warning !"
msgstr ""
@@ -886,23 +855,12 @@ msgstr ""
msgid "Days to Open"
msgstr ""
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Create Partner"
-msgstr ""
-
#. module: crm
#: field:crm.lead,mobile:0
#: field:crm.phonecall,partner_mobile:0
msgid "Mobile"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_phonecall.py:270
-#, python-format
-msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
-
#. module: crm
#: field:crm.lead,ref:0
msgid "Reference"
@@ -926,11 +884,6 @@ msgstr ""
msgid "Meetings"
msgstr ""
-#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Case Fields"
-msgstr ""
-
#. module: crm
#: field:crm.lead,date_action_next:0
#: field:crm.lead,title_action:0
@@ -938,6 +891,19 @@ msgstr ""
msgid "Next Action"
msgstr ""
+#. module: crm
+#: code:addons/crm/crm_lead.py:762
+#, python-format
+msgid "<b>Partner</b> set to <em>%s</em>."
+msgstr ""
+
+#. module: crm
+#: selection:crm.lead.report,state:0
+#: selection:crm.phonecall,state:0
+#: selection:crm.phonecall.report,state:0
+msgid "Draft"
+msgstr ""
+
#. module: crm
#: view:crm.segmentation:0
msgid "Partner Segmentations"
@@ -1005,12 +971,6 @@ msgstr ""
msgid "Lowest"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_meeting.py:59
-#, python-format
-msgid "Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>."
-msgstr ""
-
#. module: crm
#: field:crm.lead,create_date:0
#: view:crm.phonecall:0
@@ -1020,9 +980,9 @@ msgid "Creation Date"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:862
+#: code:addons/crm/crm_lead.py:703
#, python-format
-msgid "%s has been <b>created</b>."
+msgid "Lead <b>converted into an Opportunity</b>"
msgstr ""
#. module: crm
@@ -1080,10 +1040,8 @@ msgid "Delete"
msgstr ""
#. module: crm
-#: field:crm.lead,planned_revenue:0
-#: field:crm.partner2opportunity,planned_revenue:0
-#: field:crm.phonecall2opportunity,planned_revenue:0
-msgid "Expected Revenue"
+#: model:mail.message.subtype,description:crm.mt_lead_create
+msgid "Opportunity created"
msgstr ""
#. module: crm
@@ -1091,12 +1049,6 @@ msgstr ""
msgid "Ã"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_lead.py:867
-#, python-format
-msgid "Opportunity has been <b>lost</b>."
-msgstr ""
-
#. module: crm
#: selection:crm.lead.report,creation_month:0
#: selection:crm.lead.report,deadline_month:0
@@ -1105,8 +1057,18 @@ msgid "September"
msgstr ""
#. module: crm
-#: help:crm.lead,email_from:0
-msgid "Email address of the contact"
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a new opportunity.\n"
+" </p><p>\n"
+" OpenERP helps you keep track of your sales pipeline to follow\n"
+" up potential sales and better forecast your future revenues.\n"
+" </p><p>\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"
+" </p>\n"
+" "
msgstr ""
#. module: crm
@@ -1136,8 +1098,8 @@ msgid "Opening Date"
msgstr ""
#. module: crm
-#: field:crm.lead,company_currency:0
-msgid "Currency"
+#: help:crm.phonecall,duration:0
+msgid "Duration in Minutes"
msgstr ""
#. module: crm
@@ -1145,12 +1107,6 @@ msgstr ""
msgid "Channel Name"
msgstr ""
-#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-msgid "Continue"
-msgstr ""
-
#. module: crm
#: help:crm.lead.report,deadline_day:0
msgid "Expected closing day"
@@ -1172,16 +1128,14 @@ msgid "This field is used to distinguish stages related to Leads from stages rel
msgstr ""
#. module: crm
-#: help:crm.segmentation,sales_purchase_active:0
-msgid "Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
+#: model:mail.message.subtype,name:crm.mt_lead_create
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead
+msgid "Lead Created"
msgstr ""
#. module: crm
-#: view:crm.lead2partner:0
-#: view:crm.phonecall2partner:0
-#: model:ir.actions.act_window,name:crm.action_crm_lead2partner
-#: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
-msgid "Create a Partner"
+#: help:crm.segmentation,sales_purchase_active:0
+msgid "Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
msgstr ""
#. module: crm
@@ -1205,13 +1159,10 @@ msgid "unknown"
msgstr ""
#. module: crm
-#: view:crm.case.section:0
-msgid "Followers of this salesteam follow automatically all opportunities related to this salesteam."
-msgstr ""
-
-#. module: crm
-#: model:ir.model,name:crm.model_crm_partner2opportunity
-msgid "Partner To Opportunity"
+#: field:crm.case.section,message_is_follower:0
+#: field:crm.lead,message_is_follower:0
+#: field:crm.phonecall,message_is_follower:0
+msgid "Is a Follower"
msgstr ""
#. module: crm
@@ -1222,13 +1173,6 @@ msgstr ""
msgid "Date"
msgstr ""
-#. module: crm
-#: field:crm.case.section,message_is_follower:0
-#: field:crm.lead,message_is_follower:0
-#: field:crm.phonecall,message_is_follower:0
-msgid "Is a Follower"
-msgstr ""
-
#. module: crm
#: model:crm.case.section,name:crm.crm_case_section_4
msgid "Online Support"
@@ -1270,6 +1214,11 @@ msgstr ""
msgid "When sending mails, the default email address is taken from the sales team."
msgstr ""
+#. module: crm
+#: view:crm.phonecall:0
+msgid "Phone Calls Assigned to the current user or with a team having the current user as team leader"
+msgstr ""
+
#. module: crm
#: view:crm.segmentation:0
msgid "Segmentation Description"
@@ -1281,7 +1230,7 @@ msgid "Lead Description"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_lead.py:491
+#: code:addons/crm/crm_lead.py:573
#, python-format
msgid "Merged opportunities"
msgstr ""
@@ -1325,13 +1274,9 @@ msgstr ""
#: view:crm.lead:0
#: view:crm.lead2opportunity.partner:0
#: view:crm.lead2opportunity.partner.mass:0
-#: view:crm.lead2partner:0
#: view:crm.merge.opportunity:0
#: view:crm.opportunity2phonecall:0
-#: view:crm.partner2opportunity:0
#: view:crm.phonecall:0
-#: view:crm.phonecall2opportunity:0
-#: view:crm.phonecall2partner:0
#: view:crm.phonecall2phonecall:0
msgid "Cancel"
msgstr ""
@@ -1352,13 +1297,20 @@ msgid "Leads/Opportunities which are in pending state"
msgstr ""
#. module: crm
-#: model:ir.model,name:crm.model_crm_merge_opportunity
-msgid "Merge two Opportunities"
+#: view:crm.phonecall:0
+msgid "To Do"
msgstr ""
#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2partner
-msgid "Phonecall to Partner"
+#: model:mail.message.subtype,description:crm.mt_lead_lost
+msgid "Opportunity lost"
+msgstr ""
+
+#. module: crm
+#: field:crm.lead2opportunity.partner,action:0
+#: field:crm.lead2opportunity.partner.mass,action:0
+#: field:crm.partner.binding,action:0
+msgid "Related Customer"
msgstr ""
#. module: crm
@@ -1398,6 +1350,16 @@ msgstr ""
msgid "Users"
msgstr ""
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_stage
+msgid "Stage Changed"
+msgstr ""
+
+#. module: crm
+#: field:crm.case.stage,section_ids:0
+msgid "Sections"
+msgstr ""
+
#. module: crm
#: constraint:crm.case.section:0
msgid "Error ! You cannot create recursive Sales team."
@@ -1437,6 +1399,12 @@ msgstr ""
msgid "Leads/Opportunities that are assigned to me"
msgstr ""
+#. module: crm
+#: field:crm.lead.report,date_closed:0
+#: field:crm.phonecall.report,date_closed:0
+msgid "Close Date"
+msgstr ""
+
#. module: crm
#: view:crm.lead.report:0
msgid "My Case(s)"
@@ -1473,17 +1441,6 @@ msgstr ""
msgid "Convert to prospect to business partner"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_lead.py:871
-#, python-format
-msgid "Opportunity has been <b>won</b>."
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall:0
-msgid "Phone Calls that are assigned to me or to my team(s)"
-msgstr ""
-
#. module: crm
#: model:ir.model,name:crm.model_crm_payment_mode
msgid "CRM Payment Mode"
@@ -1520,6 +1477,7 @@ msgstr ""
#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
msgid "Do not link to a customer"
msgstr ""
@@ -1528,11 +1486,6 @@ msgstr ""
msgid "Next Action Date"
msgstr ""
-#. module: crm
-#: selection:crm.segmentation,state:0
-msgid "Running"
-msgstr ""
-
#. module: crm
#: help:crm.case.stage,state:0
msgid "The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."
@@ -1543,11 +1496,6 @@ msgstr ""
msgid "Assign opportunities to"
msgstr ""
-#. module: crm
-#: field:crm.lead,zip:0
-msgid "Zip"
-msgstr ""
-
#. module: crm
#: model:crm.case.categ,name:crm.categ_phone1
msgid "Inbound"
@@ -1559,7 +1507,7 @@ msgid "Month of call"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_phonecall.py:289
+#: code:addons/crm/crm_phonecall.py:290
#, python-format
msgid "Partner has been <b>created</b>."
msgstr ""
@@ -1609,11 +1557,6 @@ msgstr ""
msgid "Customer Name"
msgstr ""
-#. module: crm
-#: model:ir.model,name:crm.model_crm_phonecall2opportunity
-msgid "Phonecall To Opportunity"
-msgstr ""
-
#. module: crm
#: field:crm.case.section,reply_to:0
msgid "Reply-To"
@@ -1634,11 +1577,6 @@ msgstr ""
msgid "Prospect is converting to business partner"
msgstr ""
-#. module: crm
-#: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
-msgid "CRM Lead: Mark unread"
-msgstr ""
-
#. module: crm
#: view:crm.case.channel:0
#: model:ir.actions.act_window,name:crm.crm_case_channel_action
@@ -1772,11 +1710,6 @@ msgstr ""
msgid "Type is used to separate Leads and Opportunities"
msgstr ""
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
-
#. module: crm
#: selection:crm.lead.report,creation_month:0
#: selection:crm.lead.report,deadline_month:0
@@ -1807,15 +1740,8 @@ msgid "Sales Teams"
msgstr ""
#. module: crm
-#: model:ir.model,name:crm.model_crm_lead2partner
-msgid "Lead to Partner"
-msgstr ""
-
-#. module: crm
-#: view:crm.segmentation:0
-#: field:crm.segmentation.line,segmentation_id:0
-#: model:ir.actions.act_window,name:crm.crm_segmentation-act
-msgid "Segmentation"
+#: field:crm.case.stage,case_default:0
+msgid "Default to New Sales Team"
msgstr ""
#. module: crm
@@ -1828,12 +1754,6 @@ msgstr ""
msgid "Leads/Opportunities which are in New state"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_lead.py:883
-#, python-format
-msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
-
#. module: crm
#: selection:crm.phonecall,state:0
#: view:crm.phonecall.report:0
@@ -1845,12 +1765,6 @@ msgstr ""
msgid "Probability"
msgstr ""
-#. module: crm
-#: code:addons/crm/crm_lead.py:552
-#, python-format
-msgid "Please select more than one opportunity from the list view."
-msgstr ""
-
#. module: crm
#: view:crm.lead.report:0
#: view:crm.phonecall.report:0
@@ -1866,6 +1780,12 @@ msgstr ""
msgid "Leads"
msgstr ""
+#. module: crm
+#: code:addons/crm/crm_lead.py:571
+#, python-format
+msgid "Merged leads"
+msgstr ""
+
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor5
msgid "Design"
@@ -1877,27 +1797,18 @@ msgstr ""
msgid "Merge with existing opportunities"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a new opportunity.\n"
-" </p><p>\n"
-" OpenERP helps you keep track of your sales pipeline to follow\n"
-" up potential sales and better forecast your future revenues.\n"
-" </p><p>\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"
-" </p>\n"
-" "
-msgstr ""
-
#. module: crm
#: view:crm.phonecall.report:0
#: selection:crm.phonecall.report,state:0
msgid "Todo"
msgstr ""
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
+msgid "Lead to Opportunity"
+msgstr ""
+
#. module: crm
#: field:crm.lead,user_email:0
msgid "User Email"
@@ -1956,22 +1867,6 @@ msgstr ""
msgid "Prospect Opportunity"
msgstr ""
-#. module: crm
-#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create an unqualified lead. \n"
-" </p><p>\n"
-" Use leads if you need a qualification step before creating an\n"
-" opportunity or a customer. It can be a business card you received,\n"
-" a contact form filled in your website, or a file of unqualified\n"
-" prospects you import, etc.\n"
-" </p><p>\n"
-" Once qualified, the lead can be converted into a business\n"
-" opportunity and/or a new customer in your address book.\n"
-" </p>\n"
-" "
-msgstr ""
-
#. module: crm
#: field:crm.lead,email_cc:0
msgid "Global CC"
@@ -2020,17 +1915,15 @@ msgid "Mandatory Expression"
msgstr ""
#. module: crm
-#: selection:crm.lead2opportunity.partner,action:0
-#: selection:crm.lead2opportunity.partner.mass,action:0
-#: selection:crm.lead2partner,action:0
-#: selection:crm.phonecall2partner,action:0
-msgid "Create a new customer"
+#: view:crm.lead:0
+msgid "Send Mail"
msgstr ""
#. module: crm
-#: field:crm.lead2opportunity.partner,action:0
-#: field:crm.lead2opportunity.partner.mass,action:0
-msgid "Related Customer"
+#: selection:crm.lead2opportunity.partner,action:0
+#: selection:crm.lead2opportunity.partner.mass,action:0
+#: selection:crm.partner.binding,action:0
+msgid "Create a new customer"
msgstr ""
#. module: crm
@@ -2060,11 +1953,6 @@ msgstr ""
msgid "Misc"
msgstr ""
-#. module: crm
-#: field:base.action.rule,regex_history:0
-msgid "Regular Expression on Case History"
-msgstr ""
-
#. module: crm
#: view:crm.lead.report:0
#: selection:crm.lead.report,state:0
@@ -2092,11 +1980,6 @@ msgstr ""
msgid "Responsible"
msgstr ""
-#. module: crm
-#: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
-msgid "Reminder to Customer"
-msgstr ""
-
#. module: crm
#: model:crm.case.section,name:crm.crm_case_section_3
msgid "Direct Marketing"
@@ -2108,19 +1991,18 @@ msgid "Product"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_phonecall.py:284
-#, python-format
-msgid "Phonecall has been <b>created and opened</b>."
+#: field:crm.lead.report,creation_year:0
+msgid "Creation Year"
msgstr ""
#. module: crm
-#: field:base.action.rule,trg_max_history:0
-msgid "Maximum Communication History"
+#: view:crm.lead2opportunity.partner.mass:0
+msgid "Conversion Options"
msgstr ""
#. module: crm
-#: view:crm.lead2opportunity.partner.mass:0
-msgid "Conversion Options"
+#: view:crm.case.section:0
+msgid "Follow this salesteam to automatically track the events associated to users of this team."
msgstr ""
#. module: crm
@@ -2185,7 +2067,6 @@ msgstr ""
#: selection:crm.lead2opportunity.partner,name:0
#: selection:crm.lead2opportunity.partner.mass,name:0
#: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
-#: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
msgid "Convert to opportunity"
msgstr ""
@@ -2263,8 +2144,13 @@ msgid "Company"
msgstr ""
#. module: crm
-#: view:base.action.rule:0
-msgid "Conditions on Communication History"
+#: selection:crm.segmentation,state:0
+msgid "Running"
+msgstr ""
+
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
+msgid "Lead converted into an opportunity"
msgstr ""
#. module: crm
@@ -2272,6 +2158,11 @@ msgstr ""
msgid "Unassigned Leads"
msgstr ""
+#. module: crm
+#: model:mail.message.subtype,description:crm.mt_lead_won
+msgid "Opportunity won"
+msgstr ""
+
#. module: crm
#: field:crm.case.categ,object_id:0
msgid "Object Name"
@@ -2292,25 +2183,6 @@ msgstr ""
msgid "After-Sale Services"
msgstr ""
-#. module: crm
-#: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
-msgid "Hello [[object.partner_id and object.partner_id.name or '']], \n"
-"your following lead is not open since 5 days.\n"
-"\n"
-"Lead: [[object.id ]]\n"
-"Description:\n"
-"\n"
-" [[object.description]]\n"
-"\n"
-"Thanks,\n"
-" "
-msgstr ""
-
-#. module: crm
-#: view:crm.phonecall2opportunity:0
-msgid "_Convert"
-msgstr ""
-
#. module: crm
#: field:crm.case.section,message_ids:0
#: field:crm.lead,message_ids:0
@@ -2348,6 +2220,11 @@ msgstr ""
msgid "From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report."
msgstr ""
+#. module: crm
+#: field:crm.case.stage,fold:0
+msgid "Fold by Default"
+msgstr ""
+
#. module: crm
#: field:crm.case.stage,state:0
msgid "Related Status"
@@ -2379,6 +2256,11 @@ msgstr ""
msgid "Confirmed"
msgstr ""
+#. module: crm
+#: model:ir.model,name:crm.model_crm_partner_binding
+msgid "Handle partner binding or generation in CRM wizards."
+msgstr ""
+
#. module: crm
#: model:ir.actions.act_window,name:crm.act_oppor_stage_user
msgid "Planned Revenue By User and Stage"
@@ -2411,6 +2293,22 @@ msgstr ""
msgid "Followers"
msgstr ""
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create an unqualified lead.\n"
+" </p><p>\n"
+" Use leads if you need a qualification step before creating an\n"
+" opportunity or a customer. It can be a business card you received,\n"
+" a contact form filled in your website, or a file of unqualified\n"
+" prospects you import, etc.\n"
+" </p><p>\n"
+" Once qualified, the lead can be converted into a business\n"
+" opportunity and/or a new customer in your address book.\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: crm
#: field:sale.config.settings,fetchmail_lead:0
msgid "Create leads from incoming mails"
@@ -2460,11 +2358,6 @@ msgstr ""
msgid "Email Campaign - Products"
msgstr ""
-#. module: crm
-#: field:base.action.rule,act_categ_id:0
-msgid "Set Category to"
-msgstr ""
-
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -2506,8 +2399,9 @@ msgid "Qualification"
msgstr ""
#. module: crm
-#: field:crm.lead,partner_address_email:0
-msgid "Partner Contact Email"
+#: field:crm.lead2opportunity.partner,name:0
+#: field:crm.lead2opportunity.partner.mass,name:0
+msgid "Conversion Action"
msgstr ""
#. module: crm
@@ -2524,14 +2418,16 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_partner.py:48
-#, python-format
-msgid "A partner is already defined."
+#: selection:crm.lead.report,creation_month:0
+#: selection:crm.lead.report,deadline_month:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
msgstr ""
#. module: crm
-#: view:sale.config.settings:0
-msgid "Configure"
+#: model:mail.message.subtype,name:crm.mt_lead_lost
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
+msgid "Opportunity Lost"
msgstr ""
#. module: crm
@@ -2622,16 +2518,9 @@ msgid "Logged Calls"
msgstr ""
#. module: crm
-#: field:crm.partner2opportunity,probability:0
-#: field:crm.phonecall2opportunity,probability:0
-msgid "Success Probability"
-msgstr ""
-
-#. module: crm
-#: selection:crm.lead.report,state:0
-#: selection:crm.phonecall,state:0
-#: selection:crm.phonecall.report,state:0
-msgid "Draft"
+#: model:mail.message.subtype,name:crm.mt_lead_won
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
+msgid "Opportunity Won"
msgstr ""
#. module: crm
@@ -2644,7 +2533,6 @@ msgstr ""
#: view:crm.phonecall:0
#: model:ir.model,name:crm.model_crm_meeting
#: model:process.node,name:crm.process_node_meeting0
-#: field:res.partner,meeting_count:0
msgid "Meeting"
msgstr ""
@@ -2653,11 +2541,6 @@ msgstr ""
msgid "Category of Case"
msgstr ""
-#. module: crm
-#: view:crm.lead:0
-msgid "Opportunity / Customer"
-msgstr ""
-
#. module: crm
#: view:board.board:0
msgid "Planned Revenue by Stage and User"
@@ -2681,11 +2564,6 @@ msgstr ""
msgid "Manage Helpdesk and Support"
msgstr ""
-#. module: crm
-#: view:crm.phonecall2partner:0
-msgid "You may have to verify that this partner does not exist already."
-msgstr ""
-
#. module: crm
#: field:crm.lead.report,delay_open:0
msgid "Delay to Open"
@@ -2704,21 +2582,6 @@ msgstr ""
msgid "November"
msgstr ""
-#. module: crm
-#: field:crm.case.section,message_comment_ids:0
-#: help:crm.case.section,message_comment_ids:0
-#: field:crm.lead,message_comment_ids:0
-#: help:crm.lead,message_comment_ids:0
-#: field:crm.phonecall,message_comment_ids:0
-#: help:crm.phonecall,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: crm
-#: model:crm.case.stage,name:crm.stage_lead5
-msgid "Negotiation"
-msgstr ""
-
#. module: crm
#: view:crm.lead.report:0
#: model:ir.actions.act_window,name:crm.act_opportunity_stage
@@ -2742,11 +2605,6 @@ msgstr ""
msgid "Twitter Ads"
msgstr ""
-#. module: crm
-#: field:crm.case.stage,case_default:0
-msgid "Common to All Teams"
-msgstr ""
-
#. module: crm
#: field:crm.lead.report,creation_day:0
msgid "Creation Day"
@@ -2758,13 +2616,8 @@ msgid "Planned Revenues"
msgstr ""
#. module: crm
-#: 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"
+#: view:crm.lead:0
+msgid "Exp.Closing"
msgstr ""
#. module: crm
@@ -2789,16 +2642,10 @@ msgid "Categorization"
msgstr ""
#. module: crm
-#: view:crm.lead:0
#: view:crm.phonecall2phonecall:0
msgid "Log Call"
msgstr ""
-#. module: crm
-#: model:ir.model,name:crm.model_base_action_rule
-msgid "Action Rules"
-msgstr ""
-
#. module: crm
#: help:sale.config.settings,group_fund_raising:0
msgid "Allows you to trace and manage your activities for fund raising."
@@ -2822,7 +2669,6 @@ msgstr ""
#. module: crm
#: view:crm.lead:0
-#: view:crm.phonecall2opportunity:0
msgid "at"
msgstr ""
@@ -2848,7 +2694,6 @@ msgid "Description"
msgstr ""
#. module: crm
-#: field:base.action.rule,trg_section_id:0
#: field:crm.case.categ,section_id:0
#: field:crm.case.resource.type,section_id:0
#: view:crm.case.section:0
@@ -2925,20 +2770,11 @@ msgstr ""
msgid "Working Hours"
msgstr ""
-#. module: crm
-#: view:crm.phonecall:0
-#: field:res.partner,phonecall_ids:0
-msgid "Phonecalls"
-msgstr ""
-
#. module: crm
#: view:crm.lead:0
#: field:crm.lead2opportunity.partner,partner_id:0
#: field:crm.lead2opportunity.partner.mass,partner_id:0
-#: field:crm.lead2partner,partner_id:0
-#: field:crm.partner2opportunity,partner_id:0
-#: field:crm.phonecall2opportunity,partner_id:0
-#: field:crm.phonecall2partner,partner_id:0
+#: field:crm.partner.binding,partner_id:0
msgid "Customer"
msgstr ""
@@ -2960,7 +2796,7 @@ msgid "Lost"
msgstr ""
#. module: crm
-#: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
+#: code:addons/crm/wizard/crm_lead_to_opportunity.py:97
#, python-format
msgid "Closed/Cancelled leads cannot be converted into opportunities."
msgstr ""
@@ -3008,14 +2844,13 @@ msgid "Phone calls by user and section"
msgstr ""
#. module: crm
-#: code:addons/crm/crm_meeting.py:55
-#, python-format
-msgid "Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>."
+#: model:crm.case.stage,name:crm.stage_lead5
+msgid "Negotiation"
msgstr ""
#. module: crm
-#: view:crm.lead:0
-msgid "Exp.Closing"
+#: model:ir.model,name:crm.model_crm_phonecall2phonecall
+msgid "Phonecall To Phonecall"
msgstr ""
#. module: crm
@@ -3034,9 +2869,9 @@ msgid "Proposition"
msgstr ""
#. module: crm
-#: field:crm.lead.report,date_closed:0
-#: field:crm.phonecall.report,date_closed:0
-msgid "Close Date"
+#: view:crm.phonecall:0
+#: field:res.partner,phonecall_ids:0
+msgid "Phonecalls"
msgstr ""
#. module: crm
@@ -3051,6 +2886,11 @@ msgstr ""
msgid "Newsletter"
msgstr ""
+#. module: crm
+#: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
+msgid "Opportunity Stage Changed"
+msgstr ""
+
#. module: crm
#: model:ir.actions.act_window,help:crm.crm_lead_stage_act
msgid "<p class=\"oe_view_nocontent_create\">\n"
diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot
index d05188c17f0036571129c3d800d2a776ad506283..e7f19d854270adeff4f5806660b2b2ce9cf4a962 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -95,11 +95,6 @@ msgstr ""
msgid "Stage Name"
msgstr ""
-#. module: crm_claim
-#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
-msgid "Have a general overview of all claims processed in the system by sorting them with specific criteria."
-msgstr ""
-
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Salesperson"
@@ -206,11 +201,6 @@ msgstr ""
msgid "Preventive Action"
msgstr ""
-#. module: crm_claim
-#: field:crm.claim.report,delay_expected:0
-msgid "Overpassed Deadline"
-msgstr ""
-
#. module: crm_claim
#: field:crm.claim.report,section_id:0
msgid "Section"
@@ -299,9 +289,8 @@ msgid "Next Action Date"
msgstr ""
#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:243
-#, python-format
-msgid "Claim has been <b>created</b>."
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid "Have a general overview of all claims processed in the system by sorting them with specific criteria."
msgstr ""
#. module: crm_claim
@@ -339,7 +328,7 @@ msgid "Destination email for email gateway."
msgstr ""
#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:199
+#: code:addons/crm_claim/crm_claim.py:194
#, python-format
msgid "No Subject"
msgstr ""
@@ -575,12 +564,6 @@ msgstr ""
msgid "Extended Filters..."
msgstr ""
-#. module: crm_claim
-#: field:crm.claim,message_comment_ids:0
-#: help:crm.claim,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: crm_claim
#: view:crm.claim:0
msgid "Closure"
@@ -712,9 +695,8 @@ msgid "Unassigned Claims"
msgstr ""
#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:247
-#, python-format
-msgid "Claim has been <b>refused</b>."
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
msgstr ""
#. module: crm_claim
@@ -768,12 +750,6 @@ msgstr ""
msgid "# Emails"
msgstr ""
-#. module: crm_claim
-#: code:addons/crm_claim/crm_claim.py:253
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
#. module: crm_claim
#: view:crm.claim.report:0
msgid "Month of claim"
diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
index c742a06a5b6f86351a775b8270e9a48bdbc0661e..775034d1c2eac17aa4c00b8895cd69c156d9d4ed 100644
--- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot
+++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,12 +25,6 @@ msgstr ""
msgid "# of Cases"
msgstr ""
-#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:152
-#, python-format
-msgid "Case has been <b>created</b>."
-msgstr ""
-
#. module: crm_helpdesk
#: view:crm.helpdesk:0
#: view:crm.helpdesk.report:0
@@ -269,7 +263,7 @@ msgid "Month of helpdesk requests"
msgstr ""
#. module: crm_helpdesk
-#: code:addons/crm_helpdesk/crm_helpdesk.py:109
+#: code:addons/crm_helpdesk/crm_helpdesk.py:104
#, python-format
msgid "No Subject"
msgstr ""
@@ -472,12 +466,6 @@ msgstr ""
msgid "Helpdesk Requests"
msgstr ""
-#. module: crm_helpdesk
-#: field:crm.helpdesk,message_comment_ids:0
-#: help:crm.helpdesk,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: crm_helpdesk
#: help:crm.helpdesk,section_id:0
msgid "Responsible sales team. Define Responsible user and Email account for mail gateway."
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 6e84e520cb587e8c7ab58af880e9bf4f8415d12f..3dc7f011bbf92f7342a3e2adb4e1c3913113987d 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -61,6 +61,11 @@ msgstr ""
msgid "Geo Localize"
msgstr ""
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,starred:0
+msgid "Starred"
+msgstr ""
+
#. module: crm_partner_assign
#: view:crm.lead.forward.to.partner:0
msgid "Body"
@@ -135,11 +140,6 @@ msgstr ""
msgid "Next Partner Review"
msgstr ""
-#. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Favorite"
-msgstr ""
-
#. module: crm_partner_assign
#: selection:crm.lead.forward.to.partner,history_mode:0
msgid "Latest email"
@@ -247,16 +247,6 @@ msgstr ""
msgid "Priority"
msgstr ""
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,author_id:0
-msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
-msgstr ""
-
-#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
#. module: crm_partner_assign
#: field:crm.lead.report.assign,delay_expected:0
msgid "Overpassed Deadline"
@@ -499,6 +489,11 @@ msgstr ""
msgid "#Opportunities"
msgstr ""
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
#. module: crm_partner_assign
#: field:crm.partner.report.assign,date_partnership:0
#: field:res.partner,date_partnership:0
@@ -780,6 +775,11 @@ msgstr ""
msgid "Partner Level"
msgstr ""
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Current user has an unread notification linked to this message"
+msgstr ""
+
#. module: crm_partner_assign
#: selection:crm.lead.report.assign,type:0
msgid "Opportunity"
@@ -872,8 +872,8 @@ msgid "Case Information"
msgstr ""
#. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,to_read:0
-msgid "Functional field to search for messages the current user has to read"
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid "Author of the message. If not set, email_from may hold an email address that did not match any partner."
msgstr ""
#. module: crm_partner_assign
diff --git a/addons/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot
index ca625908eaf384424c105b9966cfc0bce04217ad..7ce4d7606b04f564a95b04a026bdb93b482ea658 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/crm_todo/i18n/crm_todo.pot b/addons/crm_todo/i18n/crm_todo.pot
index 482530d2811d3e2ef228c5b41ae58bff6af75e33..a973dcef0b28fb74fa0d792bd7cf6cfa0780a772 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index 7a63f822797845c9bfa54f338461f7190a63da36..ee287835a9d2df53b8acdf510b2bdba06aa1ee97 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index 7d32197f80e67812181ac6c78bdf5133b30abbce..b6f6a42c4ca2e83d16e8c510d1743a5a48f8d033 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -46,6 +46,12 @@ msgstr ""
msgid "Delivery Grid Line"
msgstr ""
+#. module: delivery
+#: field:stock.move,weight_uom_id:0
+#: field:stock.picking,weight_uom_id:0
+msgid "Unit of Measure"
+msgstr ""
+
#. module: delivery
#: view:delivery.carrier:0
#: view:delivery.grid:0
@@ -80,22 +86,6 @@ msgstr ""
msgid "Delivery order"
msgstr ""
-#. module: delivery
-#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to define a new deliver method. \n"
-" </p><p>\n"
-" Each carrier (e.g. UPS) can have several delivery methods (e.g.\n"
-" UPS Express, UPS Standard) with a set of pricing rules attached\n"
-" to each method.\n"
-" </p><p>\n"
-" These methods allows to automaticaly compute the delivery price\n"
-" according to your settings; on the sale order (based on the\n"
-" quotation) or the invoice (based on the delivery orders).\n"
-" </p>\n"
-" "
-msgstr ""
-
#. module: delivery
#: code:addons/delivery/delivery.py:221
#, python-format
@@ -205,7 +195,7 @@ msgid "Grid definition"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:89
+#: code:addons/delivery/stock.py:90
#, python-format
msgid "Warning!"
msgstr ""
@@ -321,7 +311,9 @@ msgstr ""
#: selection:delivery.grid.line,type:0
#: selection:delivery.grid.line,variable_factor:0
#: report:sale.shipping:0
+#: view:stock.move:0
#: field:stock.move,weight:0
+#: view:stock.picking:0
#: field:stock.picking,weight:0
#: field:stock.picking.in,weight:0
#: field:stock.picking.out,weight:0
@@ -339,7 +331,7 @@ msgid "Keep empty if the pricing depends on the advanced pricing per destination
msgstr ""
#. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
#, python-format
msgid "No grid available !"
msgstr ""
@@ -350,7 +342,7 @@ msgid ">="
msgstr ""
#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
#, python-format
msgid "Order not in draft state !"
msgstr ""
@@ -397,6 +389,22 @@ msgstr ""
msgid "This delivery method will be used when invoicing from picking."
msgstr ""
+#. module: delivery
+#: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to define a new deliver method. \n"
+" </p><p>\n"
+" Each carrier (e.g. UPS) can have several delivery methods (e.g.\n"
+" UPS Express, UPS Standard) with a set of pricing rules attached\n"
+" to each method.\n"
+" </p><p>\n"
+" These methods allows to automaticaly compute the delivery price\n"
+" according to your settings; on the sales order (based on the\n"
+" quotation) or the invoice (based on the delivery orders).\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: delivery
#: field:delivery.grid.line,max_value:0
msgid "Maximum Value"
@@ -433,6 +441,11 @@ msgstr ""
msgid "<="
msgstr ""
+#. module: delivery
+#: help:stock.picking,weight_uom_id:0
+msgid "Unit of measurement for Weight"
+msgstr ""
+
#. module: delivery
#: report:sale.shipping:0
msgid "Description"
@@ -457,7 +470,7 @@ msgid "Price"
msgstr ""
#. module: delivery
-#: code:addons/delivery/sale.py:55
+#: code:addons/delivery/sale.py:54
#, python-format
msgid "No grid matching for this carrier !"
msgstr ""
@@ -474,7 +487,7 @@ msgid "Weight * Volume"
msgstr ""
#. module: delivery
-#: code:addons/delivery/stock.py:90
+#: code:addons/delivery/stock.py:91
#, python-format
msgid "The carrier %s (id: %d) has no delivery grid!"
msgstr ""
@@ -506,12 +519,7 @@ msgid "Delivery Methods"
msgstr ""
#. module: delivery
-#: field:sale.order,id:0
-msgid "ID"
-msgstr ""
-
-#. module: delivery
-#: code:addons/delivery/sale.py:58
+#: code:addons/delivery/sale.py:57
#, python-format
msgid "The order state have to be draft to add delivery lines."
msgstr ""
@@ -542,6 +550,11 @@ msgstr ""
msgid "States"
msgstr ""
+#. module: delivery
+#: help:stock.move,weight_uom_id:0
+msgid "Unit of Measure (Unit of Measure) is the unit of measurement for Weight"
+msgstr ""
+
#. module: delivery
#: field:delivery.grid.line,price_type:0
msgid "Price Type"
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index d5e02a21802785445c517085de6bffdbd5dfd3df..ec8e08f72dcbf617183ed09e4d2f3cdee92b5467 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,26 +21,11 @@ msgid "Parent Directory"
msgstr ""
#. module: document
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:336
#, python-format
msgid "Directory name contains special characters!"
msgstr ""
-#. module: document
-#: view:board.board:0
-msgid "Document board"
-msgstr ""
-
-#. module: document
-#: model:ir.model,name:document.model_process_node
-msgid "Process Node"
-msgstr ""
-
-#. module: document
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage."
-msgstr ""
-
#. module: document
#: view:document.directory:0
msgid "Search Document Directory"
@@ -53,13 +38,12 @@ msgstr ""
#. module: document
#: view:document.directory:0
-#: view:document.storage:0
msgid "Group By..."
msgstr ""
#. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
+#: view:ir.attachment:0
+msgid "Modification"
msgstr ""
#. module: document
@@ -100,8 +84,8 @@ msgid "Directory Content"
msgstr ""
#. module: document
-#: view:document.directory:0
-msgid "Dynamic context"
+#: view:ir.attachment:0
+msgid "My Document(s)"
msgstr ""
#. module: document
@@ -116,13 +100,13 @@ msgid "A python expression used to evaluate the field.\n"
msgstr ""
#. module: document
-#: field:document.storage,path:0
-msgid "Path"
+#: help:document.directory.dctx,field:0
+msgid "The name of the field."
msgstr ""
#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
#, python-format
msgid "Directory name must be unique!"
msgstr ""
@@ -145,7 +129,6 @@ msgstr ""
#. module: document
#: view:document.directory:0
-#: field:document.storage,dir_ids:0
#: model:ir.actions.act_window,name:document.action_document_directory_form
#: model:ir.ui.menu,name:document.menu_document_directories
msgid "Directories"
@@ -156,13 +139,6 @@ msgstr ""
msgid "Files details by Users"
msgstr ""
-#. module: document
-#: code:addons/document/document_storage.py:569
-#: code:addons/document/document_storage.py:597
-#, python-format
-msgid "Error!"
-msgstr ""
-
#. module: document
#: field:document.directory,resource_find_all:0
msgid "Find all resources"
@@ -212,14 +188,9 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: document
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr ""
-
-#. module: document
-#: code:addons/document/document_directory.py:263
-#: code:addons/document/document_directory.py:268
-#: code:addons/document/document_directory.py:273
+#: code:addons/document/document.py:326
+#: code:addons/document/document.py:331
+#: code:addons/document/document.py:336
#, python-format
msgid "ValidateError"
msgstr ""
@@ -236,19 +207,12 @@ msgstr ""
msgid "Documents"
msgstr ""
-#. module: document
-#: view:document.directory:0
-#: field:document.directory,storage_id:0
-msgid "Storage"
-msgstr ""
-
#. module: document
#: field:document.directory,ressource_type_id:0
msgid "Resource model"
msgstr ""
#. module: document
-#: field:ir.attachment,file_size:0
#: field:report.document.file,file_size:0
#: field:report.document.user,file_size:0
msgid "File Size"
@@ -260,22 +224,20 @@ msgstr ""
msgid "Content Type"
msgstr ""
-#. module: document
-#: view:ir.attachment:0
-msgid "Modification"
-msgstr ""
-
#. module: document
#: view:document.directory:0
#: field:document.directory,type:0
-#: view:document.storage:0
-#: field:document.storage,type:0
msgid "Type"
msgstr ""
#. module: document
-#: code:addons/document/document.py:194
-#: code:addons/document/document_directory.py:234
+#: sql_constraint:ir.attachment:0
+msgid "The filename must be unique in a directory !"
+msgstr ""
+
+#. module: document
+#: code:addons/document/document.py:110
+#: code:addons/document/document.py:296
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -305,11 +267,6 @@ msgstr ""
msgid "Context fields"
msgstr ""
-#. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr ""
-
#. module: document
#: view:document.directory:0
#: field:report.document.user,type:0
@@ -337,7 +294,7 @@ msgid "Virtual Files"
msgstr ""
#. module: document
-#: code:addons/document/document_storage.py:635
+#: code:addons/document/document.py:562
#, python-format
msgid "Error at doc write!"
msgstr ""
@@ -370,7 +327,6 @@ msgstr ""
#. module: document
#: field:document.directory,write_uid:0
-#: field:document.storage,write_uid:0
#: field:ir.attachment,write_uid:0
msgid "Last Modification User"
msgstr ""
@@ -393,7 +349,6 @@ msgstr ""
#. module: document
#: field:document.directory,write_date:0
-#: field:document.storage,write_date:0
#: field:ir.attachment,write_date:0
msgid "Date Modified"
msgstr ""
@@ -436,8 +391,8 @@ msgid "Define words in the context, for all child directories and files"
msgstr ""
#. module: document
-#: help:document.storage,online:0
-msgid "If not checked, media is currently offline and its contents not available"
+#: view:document.directory:0
+msgid "Static"
msgstr ""
#. module: document
@@ -448,7 +403,6 @@ msgstr ""
#. module: document
#: view:document.directory:0
#: field:document.directory,user_id:0
-#: field:document.storage,user_id:0
#: view:ir.attachment:0
#: field:ir.attachment,user_id:0
#: field:report.document.user,user_id:0
@@ -467,33 +421,16 @@ msgstr ""
#. module: document
#: field:document.directory,create_date:0
-#: field:document.storage,create_date:0
#: field:report.document.user,create_date:0
msgid "Date Created"
msgstr ""
-#. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr ""
-
#. module: document
#: help:document.directory.content,include_name:0
msgid "Check this field if you want that the name of the file to contain the record name.\n"
"If set, the directory will have to be a resource one."
msgstr ""
-#. module: document
-#: model:ir.actions.act_window,name:document.open_board_document_manager
-#: model:ir.ui.menu,name:document.menu_reports_document
-msgid "Knowledge"
-msgstr ""
-
-#. module: document
-#: view:document.storage:0
-msgid "Document Storage"
-msgstr ""
-
#. module: document
#: view:document.configuration:0
#: model:ir.actions.act_window,name:document.action_config_auto_directory
@@ -510,11 +447,6 @@ msgstr ""
msgid "Model Id"
msgstr ""
-#. module: document
-#: field:document.storage,online:0
-msgid "Online"
-msgstr ""
-
#. module: document
#: help:document.directory,ressource_tree:0
msgid "Check this if you want to use the same tree structure as the object selected in the system."
@@ -538,8 +470,8 @@ msgid "August"
msgstr ""
#. module: document
-#: view:ir.attachment:0
-msgid "My Document(s)"
+#: view:document.directory:0
+msgid "Dynamic context"
msgstr ""
#. module: document
@@ -554,7 +486,6 @@ msgstr ""
#. module: document
#: field:document.directory,group_ids:0
-#: field:document.storage,group_ids:0
msgid "Groups"
msgstr ""
@@ -568,11 +499,6 @@ msgstr ""
msgid "November"
msgstr ""
-#. module: document
-#: field:ir.attachment,db_datas:0
-msgid "Data"
-msgstr ""
-
#. module: document
#: help:document.directory,ressource_parent_type_id:0
msgid "If you put an object here, this directory template will appear bellow all of these objects. Such directories are \"attached\" to the specific model or record, just like attachments. Don't put a parent directory if you select a parent model."
@@ -594,8 +520,8 @@ msgid "Seq."
msgstr ""
#. module: document
-#: selection:document.storage,type:0
-msgid "Database"
+#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
+msgid "All Users files"
msgstr ""
#. module: document
@@ -603,14 +529,8 @@ msgstr ""
msgid "January"
msgstr ""
-#. module: document
-#: field:document.storage,readonly:0
-msgid "Read Only"
-msgstr ""
-
#. module: document
#: view:document.directory:0
-#: view:process.node:0
msgid "Document Directory"
msgstr ""
@@ -626,7 +546,6 @@ msgstr ""
#. module: document
#: field:document.directory,create_uid:0
-#: field:document.storage,create_uid:0
msgid "Creator"
msgstr ""
@@ -636,7 +555,6 @@ msgid "OpenERP's Document Management System supports mapping virtual folders wit
msgstr ""
#. module: document
-#: view:board.board:0
#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
#: view:report.document.user:0
msgid "Files by Month"
@@ -658,18 +576,8 @@ msgid "Children"
msgstr ""
#. module: document
-#: view:board.board:0
-msgid "Files by user"
-msgstr ""
-
-#. module: document
-#: selection:document.storage,type:0
-msgid "External file storage"
-msgstr ""
-
-#. module: document
-#: help:document.storage,path:0
-msgid "For file storage, the root path of the storage"
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
msgstr ""
#. module: document
@@ -688,13 +596,8 @@ msgid "Parent Model"
msgstr ""
#. module: document
-#: help:document.directory.dctx,field:0
-msgid "The name of the field. Note that the prefix \"dctx_\" will be prepended to what is typed here."
-msgstr ""
-
-#. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
+#: view:document.directory:0
+msgid "These groups, however, do NOT apply to children directories, which must define their own groups."
msgstr ""
#. module: document
@@ -702,11 +605,6 @@ msgstr ""
msgid "May"
msgstr ""
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files"
-msgstr ""
-
#. module: document
#: view:document.directory:0
msgid "For each entry here, virtual files will appear in this folder."
@@ -722,16 +620,6 @@ msgstr ""
msgid "Users File"
msgstr ""
-#. module: document
-#: view:document.directory:0
-msgid "Static"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid "These groups, however, do NOT apply to children directories, which must define their own groups."
-msgstr ""
-
#. module: document
#: model:ir.model,name:document.model_document_configuration
msgid "Directory Configuration"
@@ -749,25 +637,14 @@ msgstr ""
#. module: document
#: field:document.directory,name:0
-#: field:document.storage,name:0
msgid "Name"
msgstr ""
-#. module: document
-#: sql_constraint:document.storage:0
-msgid "The storage path must be unique!"
-msgstr ""
-
#. module: document
#: view:document.directory:0
msgid "Fields"
msgstr ""
-#. module: document
-#: help:document.storage,readonly:0
-msgid "If set, media is for reading only"
-msgstr ""
-
#. module: document
#: selection:report.document.user,month:0
msgid "April"
@@ -780,8 +657,8 @@ msgid "# of Files"
msgstr ""
#. module: document
-#: view:document.storage:0
-msgid "Search Document Storage"
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
msgstr ""
#. module: document
@@ -812,8 +689,8 @@ msgid "File Name"
msgstr ""
#. module: document
-#: selection:document.storage,type:0
-msgid "Internal File storage"
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
msgstr ""
#. module: document
@@ -833,10 +710,7 @@ msgid "Year"
msgstr ""
#. module: document
-#: view:document.storage:0
-#: model:ir.actions.act_window,name:document.action_document_storage_form
#: model:ir.model,name:document.model_document_storage
-#: model:ir.ui.menu,name:document.menu_document_storage_media
msgid "Storage Media"
msgstr ""
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index 96ac35bdd10beee9f5f6c6361fe21f52e4e1d664..969bf4254b0a4976b53e1f798cce9f75465e6618 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/document_page/i18n/document_page.pot b/addons/document_page/i18n/document_page.pot
index c26b2a962a8bc51fffa0ab0759d3caf49b7da72f..e6332cc864af2d5637337b952971e6555d9275a3 100644
--- a/addons/document_page/i18n/document_page.pot
+++ b/addons/document_page/i18n/document_page.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index f9ed9590d0af95ed818abafe8fcb17e3605cd360..6df42c7fc8ee541babc74799f1f2a6e23125440f 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -71,12 +71,6 @@ msgstr ""
msgid "DAV Properties for Documents"
msgstr ""
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "PyWebDAV Import Error!"
-msgstr ""
-
#. module: document_webdav
#: view:document.webdav.file.property:0
#: field:document.webdav.file.property,file_id:0
@@ -93,12 +87,6 @@ msgstr ""
msgid "WebDAV properties"
msgstr ""
-#. module: document_webdav
-#: code:addons/document_webdav/webdav.py:37
-#, python-format
-msgid "Please install PyWebDAV from http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-0.9.4.tar.gz&can=2&q=/"
-msgstr ""
-
#. module: document_webdav
#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
msgid "DAV Properties for Folders"
diff --git a/addons/edi/i18n/edi.pot b/addons/edi/i18n/edi.pot
index ecea05980e84977318ebd853f172acdedf653d3b..0df9c7372e7cb38221ba11e2f9d157962666bcae 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 4869430b90525c5b273c981385d24422c4384dee..0b21e71490cfda16276cf5d659b0df08b4ac0359 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -107,7 +107,7 @@ msgid "Body"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:218
+#: code:addons/email_template/email_template.py:244
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -356,7 +356,7 @@ msgid "Attachments"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
#, python-format
msgid "Deletion of the action record failed."
msgstr ""
@@ -385,7 +385,7 @@ msgid "Email Details"
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:170
+#: code:addons/email_template/email_template.py:196
#, python-format
msgid "Send Mail (%s)"
msgstr ""
@@ -413,7 +413,7 @@ msgid "When a relationship field is selected as first field, this field lets you
msgstr ""
#. module: email_template
-#: code:addons/email_template/email_template.py:205
+#: code:addons/email_template/email_template.py:231
#, python-format
msgid "Warning"
msgstr ""
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 1931d5c570f897769be641f00c0fa584bfebeb89..8fda70297c7ea274fc830ede0ed32acf1db55b10 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -53,22 +53,11 @@ msgstr ""
msgid "You can for each event define a minimum registration level. If you do not enough registrations you are not able to confirm your event. (put 0 to ignore this rule )"
msgstr ""
-#. module: event
-#: code:addons/event/event.py:305
-#, python-format
-msgid "Event has been <b>cancelled</b>."
-msgstr ""
-
#. module: event
#: field:event.registration,date_open:0
msgid "Registration Date"
msgstr ""
-#. module: event
-#: help:event.registration,origin:0
-msgid "Name of the sale order which create the registration"
-msgstr ""
-
#. module: event
#: field:event.event,type:0
msgid "Type of Event"
@@ -116,9 +105,8 @@ msgid "Default Maximum Registration"
msgstr ""
#. module: event
-#: help:event.event,message_unread:0
-#: help:event.registration,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:report.event.registration:0
+msgid "Display"
msgstr ""
#. module: event
@@ -193,9 +181,9 @@ msgid "Registrations"
msgstr ""
#. module: event
-#: code:addons/event/event.py:95
-#: code:addons/event/event.py:108
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:89
+#: code:addons/event/event.py:100
+#: code:addons/event/event.py:355
#, python-format
msgid "Error!"
msgstr ""
@@ -230,8 +218,9 @@ msgid "Opera of Verdi"
msgstr ""
#. module: event
-#: view:report.event.registration:0
-msgid "Display"
+#: help:event.event,message_unread:0
+#: help:event.registration,message_unread:0
+msgid "If checked new messages require your attention."
msgstr ""
#. module: event
@@ -250,11 +239,6 @@ msgstr ""
msgid "False"
msgstr ""
-#. module: event
-#: model:mail.message.subtype,name:event.mt_event_registration
-msgid "New Registrations"
-msgstr ""
-
#. module: event
#: field:event.registration,event_end_date:0
msgid "Event End Date"
@@ -266,19 +250,14 @@ 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"
msgstr ""
#. module: event
-#: code:addons/event/event.py:114
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:106
+#: code:addons/event/event.py:108
#, python-format
msgid "Warning!"
msgstr ""
@@ -297,8 +276,8 @@ msgid "Partner"
msgstr ""
#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_read
-msgid "Event: Mark read"
+#: help:event.type,default_registration_min:0
+msgid "It will select this default minimum value when you choose this event"
msgstr ""
#. module: event
@@ -393,7 +372,7 @@ msgid "Email"
msgstr ""
#. module: event
-#: code:addons/event/event.py:367
+#: code:addons/event/event.py:329
#, python-format
msgid "New registration confirmed: %s."
msgstr ""
@@ -461,28 +440,11 @@ msgstr ""
msgid "Speaker who will be giving speech at the event."
msgstr ""
-#. module: event
-#: code:addons/event/event.py:457
-#, python-format
-msgid "Registration has been <b>created</b>."
-msgstr ""
-
#. module: event
#: view:event.event:0
msgid "Cancel Event"
msgstr ""
-#. module: event
-#: code:addons/event/event.py:398
-#, python-format
-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
@@ -530,6 +492,11 @@ msgstr ""
msgid "December"
msgstr ""
+#. module: event
+#: help:event.registration,origin:0
+msgid "Reference of the sales order which created the registration"
+msgstr ""
+
#. module: event
#: field:report.event.registration,draft_state:0
msgid " # No of Draft Registrations"
@@ -577,19 +544,13 @@ msgstr ""
msgid "or"
msgstr ""
-#. module: event
-#: code:addons/event/event.py:315
-#, python-format
-msgid "Event has been <b>done</b>."
-msgstr ""
-
#. module: event
#: help:res.partner,speaker:0
msgid "Check this box if this contact is a speaker."
msgstr ""
#. module: event
-#: code:addons/event/event.py:116
+#: code:addons/event/event.py:108
#, python-format
msgid "No Tickets Available!"
msgstr ""
@@ -617,13 +578,12 @@ msgid "You can for each event define a maximum registration level. If you have t
msgstr ""
#. module: event
-#: code:addons/event/event.py:462
-#, python-format
-msgid "Registration has been set as <b>draft</b>."
+#: field:event.event,user_id:0
+msgid "Responsible User"
msgstr ""
#. module: event
-#: code:addons/event/event.py:108
+#: code:addons/event/event.py:100
#, python-format
msgid "The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. Please reconsider those limits before going further."
msgstr ""
@@ -654,12 +614,6 @@ msgstr ""
msgid "Events which are in New state"
msgstr ""
-#. module: event
-#: code:addons/event/event.py:404
-#, python-format
-msgid "State set to Cancel"
-msgstr ""
-
#. module: event
#: view:event.event:0
#: model:ir.actions.act_window,name:event.action_event_view
@@ -766,9 +720,8 @@ msgid "My Registrations"
msgstr ""
#. module: event
-#: code:addons/event/event.py:310
-#, python-format
-msgid "Event has been set to <b>draft</b>."
+#: selection:report.event.registration,month:0
+msgid "November"
msgstr ""
#. module: event
@@ -776,22 +729,14 @@ msgstr ""
msgid "Extended Filters..."
msgstr ""
-#. module: event
-#: field:event.event,message_comment_ids:0
-#: help:event.event,message_comment_ids:0
-#: field:event.registration,message_comment_ids:0
-#: help:event.registration,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: event
#: selection:report.event.registration,month:0
msgid "October"
msgstr ""
#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_registration_unread
-msgid "Event registration : Mark unread"
+#: selection:report.event.registration,month:0
+msgid "January"
msgstr ""
#. module: event
@@ -801,12 +746,13 @@ msgstr ""
#. module: event
#: view:event.event:0
+#: view:event.registration:0
#: view:res.partner:0
msgid "Confirm Registration"
msgstr ""
#. module: event
-#: code:addons/event/event.py:95
+#: code:addons/event/event.py:89
#, python-format
msgid "You have already set a registration for this event as 'Attended'. Please reset it to draft if you want to cancel this event."
msgstr ""
@@ -826,12 +772,6 @@ msgstr ""
msgid "Default Minimum Registration"
msgstr ""
-#. module: event
-#: code:addons/event/event.py:368
-#, python-format
-msgid "Registration confirmed."
-msgstr ""
-
#. module: event
#: field:event.event,address_id:0
msgid "Location Address"
@@ -850,6 +790,7 @@ msgstr ""
#. module: event
#: view:event.event:0
+#: view:event.registration:0
msgid "Attended the Event"
msgstr ""
@@ -859,16 +800,11 @@ msgid "Error ! Closing Date cannot be set before Beginning Date."
msgstr ""
#. module: event
-#: code:addons/event/event.py:400
+#: code:addons/event/event.py:355
#, python-format
msgid "You must wait for the starting day of the event to do this action."
msgstr ""
-#. module: event
-#: field:event.event,user_id:0
-msgid "Responsible User"
-msgstr ""
-
#. module: event
#: selection:event.event,state:0
#: selection:report.event.registration,event_state:0
@@ -891,7 +827,7 @@ msgid "Reply-to Email"
msgstr ""
#. module: event
-#: code:addons/event/event.py:114
+#: code:addons/event/event.py:106
#, python-format
msgid "Only %d Seats are Available!"
msgstr ""
@@ -941,12 +877,6 @@ msgstr ""
msgid "Upcoming events from today"
msgstr ""
-#. module: event
-#: code:addons/event/event.py:300
-#, python-format
-msgid "Event has been <b>created</b>."
-msgstr ""
-
#. module: event
#: model:event.event,name:event.event_2
msgid "Conference on ERP Business"
@@ -954,6 +884,7 @@ msgstr ""
#. module: event
#: model:ir.actions.act_window,name:event.act_event_view_registration
+#: model:mail.message.subtype,name:event.mt_event_registration
msgid "New Registration"
msgstr ""
@@ -973,9 +904,8 @@ msgid "Participant / Contact Name"
msgstr ""
#. module: event
-#: code:addons/event/event.py:320
-#, python-format
-msgid "Event has been <b>confirmed</b>."
+#: selection:report.event.registration,month:0
+msgid "May"
msgstr ""
#. module: event
@@ -988,16 +918,6 @@ msgstr ""
msgid "No ticket available."
msgstr ""
-#. module: event
-#: help:event.type,default_registration_min:0
-msgid "It will select this default minimum value when you choose this event"
-msgstr ""
-
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "January"
-msgstr ""
-
#. module: event
#: field:event.event,register_max:0
#: field:report.event.registration,register_max:0
@@ -1038,11 +958,6 @@ msgstr ""
msgid "Country"
msgstr ""
-#. module: event
-#: selection:report.event.registration,month:0
-msgid "November"
-msgstr ""
-
#. module: event
#: view:res.partner:0
msgid "Close Registration"
@@ -1093,12 +1008,6 @@ msgstr ""
msgid "Default Reply-To"
msgstr ""
-#. module: event
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event.act_register_event_partner
-msgid "Subscribe"
-msgstr ""
-
#. module: event
#: view:event.event:0
msgid "available."
@@ -1136,8 +1045,9 @@ msgid "The email address of the organizer is likely to be put here, with the eff
msgstr ""
#. module: event
-#: model:ir.actions.server,name:event.actions_server_event_event_unread
-msgid "Event: Mark unread"
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event.act_register_event_partner
+msgid "Subscribe"
msgstr ""
#. module: event
diff --git a/addons/event_moodle/i18n/event_moodle.pot b/addons/event_moodle/i18n/event_moodle.pot
index e808ff3d8f167b53194d6fdd63880340a0bfb981..1bae5a8dcd25dd474297c4d85d95c97ecad83e4a 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot
index 3201defaab33437901461b68afb49d863de04ed9..6edacfdaa536bf51e569c1f476f85dffb2e65ac1 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
#. module: event_sale
#: help:product.product,event_ok:0
-msgid "Determine if a product needs to create automatically an event registration at the confirmation of a sale order line."
+msgid "Determine if a product needs to create automatically an event registration at the confirmation of a sales order line."
msgstr ""
#. module: event_sale
@@ -30,11 +30,6 @@ msgstr ""
msgid "Choose an event and it will automatically create a registration for this event."
msgstr ""
-#. module: event_sale
-#: field:product.product,event_type_id:0
-msgid "Type of Event"
-msgstr ""
-
#. module: event_sale
#: model:event.event,name:event_sale.event_technical_training
msgid "Technical training in Grand-Rosiere"
@@ -42,18 +37,17 @@ msgstr ""
#. module: event_sale
#: help:product.product,event_type_id:0
-msgid "Filter the list of event on this category only, in the sale order lines"
+msgid "Select event types so when we use this product in sales order lines, it will filter events of this type only."
msgstr ""
#. module: event_sale
-#: field:sale.order.line,event_ok:0
-msgid "event_ok"
+#: field:product.product,event_type_id:0
+msgid "Type of Event"
msgstr ""
#. module: event_sale
-#: code:addons/event_sale/event_sale.py:88
-#, python-format
-msgid "The registration %s has been created from the Sale Order %s."
+#: field:sale.order.line,event_ok:0
+msgid "event_ok"
msgstr ""
#. module: event_sale
@@ -71,6 +65,12 @@ msgstr ""
msgid "Technical Training"
msgstr ""
+#. module: event_sale
+#: code:addons/event_sale/event_sale.py:88
+#, python-format
+msgid "The registration %s has been created from the Sales Order %s."
+msgstr ""
+
#. module: event_sale
#: field:sale.order.line,event_id:0
msgid "Event"
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index c973c1a42bfc67764b16856c9f79703c7b3b3513..c69359f71eb1654122aa98d131147b0a7dbaf825 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "Server Name"
msgstr ""
#. module: fetchmail
-#: field:fetchmail.server,script:0
-msgid "Script"
+#: view:fetchmail.server:0
+msgid "POP"
msgstr ""
#. module: fetchmail
@@ -56,8 +56,8 @@ msgid "Whether a full original copy of each email should be kept for referencean
msgstr ""
#. module: fetchmail
-#: view:fetchmail.server:0
-msgid "POP"
+#: view:base.config.settings:0
+msgid "Configure the incoming email gateway"
msgstr ""
#. module: fetchmail
@@ -142,6 +142,11 @@ msgstr ""
msgid "Configuration"
msgstr ""
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
#. module: fetchmail
#: view:fetchmail.server:0
msgid "Incoming Mail Server"
diff --git a/addons/fleet/i18n/fleet.pot b/addons/fleet/i18n/fleet.pot
index 85f42bc9def731dbba66a60fbf901cc4c92e7c79..f3f360e105601c69e5be934b142c647089e24325 100644
--- a/addons/fleet/i18n/fleet.pot
+++ b/addons/fleet/i18n/fleet.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -81,6 +81,7 @@ msgstr ""
#. module: fleet
#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
msgid "Group By..."
msgstr ""
@@ -137,9 +138,8 @@ msgid "Liter"
msgstr ""
#. module: fleet
-#: view:fleet.vehicle.cost:0
-#: field:fleet.vehicle.cost,parent_id:0
-msgid "Parent"
+#: model:ir.actions.client,name:fleet.action_fleet_menu
+msgid "Open Fleet Menu"
msgstr ""
#. module: fleet
@@ -168,7 +168,7 @@ msgid "Refueling Details"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:655
+#: code:addons/fleet/fleet.py:659
#, python-format
msgid "%s contract(s) need(s) to be renewed and/or closed!"
msgstr ""
@@ -289,6 +289,11 @@ msgstr ""
msgid "Messages"
msgstr ""
+#. module: fleet
+#: model:res.groups,name:fleet.group_fleet_user
+msgid "User"
+msgstr ""
+
#. module: fleet
#: help:fleet.vehicle.cost,vehicle_id:0
msgid "Vehicle concerned by this log"
@@ -378,7 +383,7 @@ msgid "Transmission Used by the vehicle"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:726
+#: code:addons/fleet/fleet.py:730
#: view:fleet.vehicle.log.contract:0
#: model:ir.actions.act_window,name:fleet.act_renew_contract
#, python-format
@@ -495,6 +500,11 @@ msgstr ""
msgid "License Plate"
msgstr ""
+#. module: fleet
+#: selection:fleet.vehicle.log.contract,state:0
+msgid "To Close"
+msgstr ""
+
#. module: fleet
#: field:fleet.vehicle.log.contract,cost_frequency:0
msgid "Recurring Cost Frequency"
@@ -532,7 +542,7 @@ msgid "Total of contracts due or overdue minus one"
msgstr ""
#. module: fleet
-#: field:fleet.vehicle.cost,cost_subtype:0
+#: field:fleet.vehicle.cost,cost_subtype_id:0
msgid "Type"
msgstr ""
@@ -557,7 +567,7 @@ msgid "Car Wash"
msgstr ""
#. module: fleet
-#: help:fleet.vehicle,driver:0
+#: help:fleet.vehicle,driver_id:0
msgid "Driver of the vehicle"
msgstr ""
@@ -671,7 +681,7 @@ msgid "Brake Inspection"
msgstr ""
#. module: fleet
-#: help:fleet.vehicle,state:0
+#: help:fleet.vehicle,state_id:0
msgid "Current state of the vehicle"
msgstr ""
@@ -686,7 +696,7 @@ msgid "Wheel Bearing Replacement"
msgstr ""
#. module: fleet
-#: help:fleet.vehicle.cost,cost_subtype:0
+#: help:fleet.vehicle.cost,cost_subtype_id:0
msgid "Cost type purchased with this cost"
msgstr ""
@@ -733,13 +743,9 @@ msgstr ""
msgid "Date when the cost has been executed"
msgstr ""
-#. module: fleet
-#: field:fleet.vehicle.state,sequence:0
-msgid "Order"
-msgstr ""
-
#. module: fleet
#: view:fleet.vehicle.cost:0
+#: view:fleet.vehicle.model:0
msgid "Vehicles costs"
msgstr ""
@@ -779,18 +785,13 @@ msgid "Other Maintenance"
msgstr ""
#. module: fleet
-#: field:fleet.vehicle.model,brand:0
-#: view:fleet.vehicle.model.brand:0
-msgid "Model Brand"
-msgstr ""
-
-#. module: fleet
-#: field:fleet.vehicle.model.brand,image_small:0
-msgid "Smal-sized photo"
+#: view:fleet.vehicle.cost:0
+#: field:fleet.vehicle.cost,parent_id:0
+msgid "Parent"
msgstr ""
#. module: fleet
-#: field:fleet.vehicle,state:0
+#: field:fleet.vehicle,state_id:0
#: view:fleet.vehicle.state:0
msgid "State"
msgstr ""
@@ -902,9 +903,8 @@ msgid "Services Logs"
msgstr ""
#. module: fleet
-#: code:addons/fleet/fleet.py:47
-#, python-format
-msgid "Emptying the odometer value of a vehicle is not allowed."
+#: view:fleet.vehicle.model:0
+msgid "Brand"
msgstr ""
#. module: fleet
@@ -983,6 +983,12 @@ msgstr ""
msgid "Fuel Injector Replacement"
msgstr ""
+#. module: fleet
+#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
+#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
+msgid "Vehicle Status"
+msgstr ""
+
#. module: fleet
#: model:fleet.service.type,name:fleet.type_service_50
msgid "Water Pump Replacement"
@@ -1009,7 +1015,7 @@ msgid "Rotor Replacement"
msgstr ""
#. module: fleet
-#: help:fleet.vehicle.model,brand:0
+#: help:fleet.vehicle.model,brand_id:0
msgid "Brand of the vehicle"
msgstr ""
@@ -1046,7 +1052,7 @@ msgid "Odometer Details"
msgstr ""
#. module: fleet
-#: field:fleet.vehicle,driver:0
+#: field:fleet.vehicle,driver_id:0
msgid "Driver"
msgstr ""
@@ -1121,9 +1127,13 @@ msgid "Odometer Values Per Month"
msgstr ""
#. module: fleet
-#: field:fleet.vehicle,message_comment_ids:0
-#: help:fleet.vehicle,message_comment_ids:0
-msgid "Comments and emails"
+#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a new model.\n"
+" </p><p>\n"
+" You can define several models (e.g. A3, A4) for each brand (Audi).\n"
+" </p>\n"
+" "
msgstr ""
#. module: fleet
@@ -1235,6 +1245,11 @@ msgstr ""
msgid "Emissions"
msgstr ""
+#. module: fleet
+#: model:ir.model,name:fleet.model_fleet_vehicle_model
+msgid "Model of a vehicle"
+msgstr ""
+
#. module: fleet
#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs
#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective
@@ -1256,6 +1271,7 @@ msgstr ""
#. module: fleet
#: model:ir.actions.act_window,name:fleet.open_board_fleet
+#: model:ir.module.category,name:fleet.module_fleet_category
#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard
#: model:ir.ui.menu,name:fleet.menu_fleet_reporting
#: model:ir.ui.menu,name:fleet.menu_root
@@ -1352,8 +1368,8 @@ msgid "Oil Change"
msgstr ""
#. module: fleet
-#: selection:fleet.vehicle.log.contract,state:0
-msgid "To Close"
+#: field:fleet.vehicle.model.brand,image_small:0
+msgid "Smal-sized photo"
msgstr ""
#. module: fleet
@@ -1382,13 +1398,9 @@ msgid "<p>\n"
msgstr ""
#. module: fleet
-#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a new model.\n"
-" </p><p>\n"
-" You can define several models (e.g. A3, A4) for each brand (Audi).\n"
-" </p>\n"
-" "
+#: field:fleet.vehicle.model,brand_id:0
+#: view:fleet.vehicle.model.brand:0
+msgid "Model Brand"
msgstr ""
#. module: fleet
@@ -1421,12 +1433,6 @@ msgstr ""
msgid "Yearly"
msgstr ""
-#. module: fleet
-#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act
-#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu
-msgid "States of Vehicle"
-msgstr ""
-
#. module: fleet
#: field:fleet.vehicle.model,modelname:0
msgid "Model name"
@@ -1579,6 +1585,12 @@ msgstr ""
msgid "Price"
msgstr ""
+#. module: fleet
+#: field:fleet.vehicle.cost,odometer:0
+#: field:fleet.vehicle.odometer,value:0
+msgid "Odometer Value"
+msgstr ""
+
#. module: fleet
#: view:fleet.vehicle:0
#: view:fleet.vehicle.cost:0
@@ -1755,6 +1767,11 @@ msgstr ""
msgid "Generated Costs"
msgstr ""
+#. module: fleet
+#: field:fleet.vehicle.state,sequence:0
+msgid "Sequence"
+msgstr ""
+
#. module: fleet
#: field:fleet.vehicle,color:0
msgid "Color"
@@ -1776,8 +1793,9 @@ msgid "Services Costs"
msgstr ""
#. module: fleet
-#: model:ir.model,name:fleet.model_fleet_vehicle_model
-msgid "Model of a vehicle"
+#: code:addons/fleet/fleet.py:47
+#, python-format
+msgid "Emptying the odometer value of a vehicle is not allowed."
msgstr ""
#. module: fleet
@@ -1786,9 +1804,8 @@ msgid "Number of seats of the vehicle"
msgstr ""
#. module: fleet
-#: field:fleet.vehicle.cost,odometer:0
-#: field:fleet.vehicle.odometer,value:0
-msgid "Odometer Value"
+#: model:res.groups,name:fleet.group_fleet_manager
+msgid "Manager"
msgstr ""
#. module: fleet
diff --git a/addons/google_base_account/i18n/google_base_account.pot b/addons/google_base_account/i18n/google_base_account.pot
index 735c848bb203406f96486a7524412cb8abbfcaa1..44698f1f12aea73dd77807cfa6420c6ffe64cf53 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/google_docs/i18n/google_docs.pot b/addons/google_docs/i18n/google_docs.pot
index c087cc433b8e85b8638ab2926d86a3b002650e01..8da7c5d2f70d5134c460bea585c3cea462d41793 100644
--- a/addons/google_docs/i18n/google_docs.pot
+++ b/addons/google_docs/i18n/google_docs.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Plural-Forms: \n"
#. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
#, python-format
msgid "Key Error!"
msgstr ""
@@ -71,27 +71,27 @@ msgid "for a spreadsheet document with url like `https://docs.google.com/a/opene
msgstr ""
#. module: google_docs
-#: code:addons/google_docs/google_docs.py:98
+#: code:addons/google_docs/google_docs.py:101
#, python-format
msgid "Your resource id is not correct. You can find the id in the google docs URL."
msgstr ""
#. module: google_docs
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:125
#, python-format
msgid "Creating google docs may only be done by one at a time."
msgstr ""
#. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
-#: code:addons/google_docs/google_docs.py:98
-#: code:addons/google_docs/google_docs.py:122
+#: code:addons/google_docs/google_docs.py:56
+#: code:addons/google_docs/google_docs.py:101
+#: code:addons/google_docs/google_docs.py:125
#, python-format
msgid "Google Docs Error!"
msgstr ""
#. module: google_docs
-#: code:addons/google_docs/google_docs.py:53
+#: code:addons/google_docs/google_docs.py:56
#, python-format
msgid "Check your google configuration in Users/Users/Synchronization tab."
msgstr ""
@@ -120,7 +120,7 @@ msgid "User Google credentials are not yet set."
msgstr ""
#. module: google_docs
-#: code:addons/google_docs/google_docs.py:136
+#: code:addons/google_docs/google_docs.py:139
#, python-format
msgid "Your Google Doc Name Pattern's key does not found in object."
msgstr ""
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index e5caf54313aec40734239e120c6d11559bc88d5b..bee35b493461cb762dc52caa2b8fbf5300752460 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -87,6 +87,7 @@ msgstr ""
#: field:hr.employee,department_id:0
#: view:hr.job:0
#: field:hr.job,department_id:0
+#: model:ir.model,name:hr.model_hr_department
msgid "Department"
msgstr ""
@@ -349,11 +350,6 @@ msgstr ""
msgid "Manage employees expenses"
msgstr ""
-#. module: hr
-#: help:hr.job,expected_employees:0
-msgid "Expected number of employees for this job position after new recruitment."
-msgstr ""
-
#. module: hr
#: view:hr.employee:0
msgid "Tel:"
@@ -656,9 +652,8 @@ msgid "This installs the module hr_timesheet."
msgstr ""
#. module: hr
-#: field:hr.job,message_comment_ids:0
-#: help:hr.job,message_comment_ids:0
-msgid "Comments and emails"
+#: help:hr.job,expected_employees:0
+msgid "Expected number of employees for this job position after new recruitment."
msgstr ""
#. module: hr
@@ -708,11 +703,6 @@ msgstr ""
msgid "Employees Categories"
msgstr ""
-#. module: hr
-#: model:ir.model,name:hr.model_hr_department
-msgid "hr.department"
-msgstr ""
-
#. module: hr
#: field:hr.employee,address_home_id:0
msgid "Home Address"
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index eb5b219ae7baab39cb2626561e45d6a42e22d290..a4e1e1d9aa38d43857d00226c058e56e4bad976b 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -65,7 +65,7 @@ msgid "Print Attendance Report Monthly"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/report/timesheet.py:122
+#: code:addons/hr_attendance/report/timesheet.py:120
#, python-format
msgid "Attendances by Week"
msgstr ""
@@ -90,6 +90,11 @@ msgstr ""
msgid "October"
msgstr ""
+#. module: hr_attendance
+#: field:hr.employee,attendance_access:0
+msgid "Attendance Access"
+msgstr ""
+
#. module: hr_attendance
#: code:addons/hr_attendance/hr_attendance.py:154
#: selection:hr.attendance,action:0
@@ -170,11 +175,6 @@ msgstr ""
msgid "Allocates attendance group to all users."
msgstr ""
-#. module: hr_attendance
-#: field:hr.employee,attendance_access:0
-msgid "unknown"
-msgstr ""
-
#. module: hr_attendance
#: view:hr.attendance:0
msgid "My Attendance"
@@ -186,7 +186,7 @@ msgid "June"
msgstr ""
#. module: hr_attendance
-#: code:addons/hr_attendance/report/attendance_by_month.py:193
+#: code:addons/hr_attendance/report/attendance_by_month.py:190
#, python-format
msgid "Attendances by Month"
msgstr ""
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index ae451c3953956b58b00fced919df176b62fc665a..ce93810657eb93172c3d7696290edfc480f67a84 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index 3cf9d4bd325167fb1c063633da3f95232a96de93..f11534544841ea894381db3539719169c427db82 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -166,7 +166,7 @@ msgid "Send to Employees"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:83
+#: code:addons/hr_evaluation/hr_evaluation.py:84
#, python-format
msgid "\n"
"Date: %(date)s\n"
@@ -207,8 +207,8 @@ msgid "Deadline"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:235
+#: code:addons/hr_evaluation/hr_evaluation.py:320
#, python-format
msgid "Warning!"
msgstr ""
@@ -234,7 +234,7 @@ msgid "Interviews"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:82
+#: code:addons/hr_evaluation/hr_evaluation.py:83
#, python-format
msgid "Regarding "
msgstr ""
@@ -547,14 +547,6 @@ msgstr ""
msgid "Extended Filters..."
msgstr ""
-#. module: hr_evaluation
-#: field:hr.evaluation.interview,message_comment_ids:0
-#: help:hr.evaluation.interview,message_comment_ids:0
-#: field:hr_evaluation.evaluation,message_comment_ids:0
-#: help:hr_evaluation.evaluation,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: hr_evaluation
#: help:hr_evaluation.plan.phase,send_anonymous_employee:0
msgid "Send an anonymous summary to the employee"
@@ -591,19 +583,6 @@ msgstr ""
msgid "Survey"
msgstr ""
-#. module: hr_evaluation
-#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a new interview request related to a personnal evaluation. \n"
-" </p><p>\n"
-" Interview requests are usually generated automatically by\n"
-" OpenERP according to an employee's appraisal plan. Each user\n"
-" receives automatic emails and requests to evaluate their\n"
-" colleagues periodically.\n"
-" </p>\n"
-" "
-msgstr ""
-
#. module: hr_evaluation
#: field:hr_evaluation.plan.phase,action:0
msgid "Action"
@@ -813,7 +792,7 @@ msgid "Is Appraisal?"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:326
+#: code:addons/hr_evaluation/hr_evaluation.py:320
#, python-format
msgid "You cannot start evaluation without Appraisal."
msgstr ""
@@ -824,7 +803,7 @@ msgid "Employee to Interview"
msgstr ""
#. module: hr_evaluation
-#: code:addons/hr_evaluation/hr_evaluation.py:250
+#: code:addons/hr_evaluation/hr_evaluation.py:235
#, python-format
msgid "You cannot change state, because some appraisal(s) are in waiting answer or draft state."
msgstr ""
@@ -839,6 +818,19 @@ msgstr ""
msgid "Appraisal Plan Phases"
msgstr ""
+#. module: hr_evaluation
+#: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a new interview request related to a personal evaluation. \n"
+" </p><p>\n"
+" Interview requests are usually generated automatically by\n"
+" OpenERP according to an employee's appraisal plan. Each user\n"
+" receives automatic emails and requests to evaluate their\n"
+" colleagues periodically.\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: hr_evaluation
#: help:hr.evaluation.interview,message_ids:0
#: help:hr_evaluation.evaluation,message_ids:0
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 0b8ec0973aab76ee07e18807ae1bb3532c4c53c6..b49b7b0a04ccf262ade234f2ff6a2fd525466845 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,6 +31,11 @@ msgstr ""
msgid "The accoutant reimburse the expenses"
msgstr ""
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_approved
+msgid "Expense approved"
+msgstr ""
+
#. module: hr_expense
#: field:hr.expense.expense,date_confirm:0
#: field:hr.expense.report,date_confirm:0
@@ -99,6 +104,12 @@ msgstr ""
msgid "To Pay"
msgstr ""
+#. module: hr_expense
+#: code:addons/hr_expense/hr_expense.py:172
+#, python-format
+msgid "No expense journal found. Please make sure you have a journal with type 'purchase' configured."
+msgstr ""
+
#. module: hr_expense
#: model:ir.model,name:hr_expense.model_hr_expense_report
msgid "Expenses Statistics"
@@ -131,12 +142,18 @@ msgid "Messages"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:172
+#: code:addons/hr_expense/hr_expense.py:181
+#: code:addons/hr_expense/hr_expense.py:197
#, python-format
msgid "Error!"
msgstr ""
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_refused
+msgid "Expense refused"
+msgstr ""
+
#. module: hr_expense
#: model:ir.actions.act_window,name:hr_expense.hr_expense_product
#: view:product.product:0
@@ -208,7 +225,7 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
#, python-format
msgid "Warning"
msgstr ""
@@ -315,7 +332,7 @@ msgid "Some costs may be reinvoices to the customer"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:195
+#: code:addons/hr_expense/hr_expense.py:197
#, python-format
msgid "The employee must have a home address."
msgstr ""
@@ -370,7 +387,7 @@ msgid "After creating invoice, reimburse expenses"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
#, python-format
msgid "Warning!"
msgstr ""
@@ -387,7 +404,7 @@ msgid "Validation Date"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:225
+#: code:addons/hr_expense/hr_expense.py:227
#, python-format
msgid "Expense Receipt"
msgstr ""
@@ -442,11 +459,6 @@ msgstr ""
msgid "Currency"
msgstr ""
-#. module: hr_expense
-#: field:hr.expense.expense,user_id:0
-msgid "User"
-msgstr ""
-
#. module: hr_expense
#: field:hr.expense.expense,voucher_id:0
msgid "Employee's Receipt"
@@ -463,7 +475,7 @@ msgid "Employee encode all his expenses"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:300
+#: code:addons/hr_expense/hr_expense.py:302
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure"
msgstr ""
@@ -489,7 +501,7 @@ msgid "Draft"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:179
+#: code:addons/hr_expense/hr_expense.py:181
#, python-format
msgid "Please configure Default Expense account for Product purchase: `property_account_expense_categ`."
msgstr ""
@@ -552,9 +564,13 @@ msgid "Extended Filters..."
msgstr ""
#. module: hr_expense
-#: field:hr.expense.expense,message_comment_ids:0
-#: help:hr.expense.expense,message_comment_ids:0
-msgid "Comments and emails"
+#: field:hr.expense.expense,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_expense
+#: model:ir.ui.menu,name:hr_expense.menu_hr_product
+msgid "Expense Categories"
msgstr ""
#. module: hr_expense
@@ -719,6 +735,7 @@ msgstr ""
#. module: hr_expense
#: selection:hr.expense.expense,state:0
#: view:hr.expense.report:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_approved
#: model:process.node,name:hr_expense.process_node_approved0
msgid "Approved"
msgstr ""
@@ -761,6 +778,7 @@ msgstr ""
#. module: hr_expense
#: selection:hr.expense.expense,state:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_refused
#: model:process.node,name:hr_expense.process_node_refused0
msgid "Refused"
msgstr ""
@@ -770,6 +788,11 @@ msgstr ""
msgid "Can be Expensed"
msgstr ""
+#. module: hr_expense
+#: model:mail.message.subtype,description:hr_expense.mt_expense_confirmed
+msgid "Expense confirmed, waiting confirmation"
+msgstr ""
+
#. module: hr_expense
#: report:hr.expense:0
msgid "Ref."
@@ -802,7 +825,7 @@ msgid "Name"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/hr_expense.py:106
+#: code:addons/hr_expense/hr_expense.py:116
#, python-format
msgid "You can only delete draft expenses!"
msgstr ""
@@ -847,11 +870,6 @@ 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."
@@ -878,6 +896,7 @@ msgstr ""
#. module: hr_expense
#: view:hr.expense.expense:0
+#: model:mail.message.subtype,name:hr_expense.mt_expense_confirmed
msgid "To Approve"
msgstr ""
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index 8527e572a1480f22f61a43c1d67b62a569b846c3..34d7ccf924b6fc68b3a78fd8c3c441134462877d 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid "Waiting Second Approval"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:283
+#: code:addons/hr_holidays/hr_holidays.py:291
#, python-format
msgid "You cannot modify a leave request that has been approved. Contact a human resource manager."
msgstr ""
@@ -103,6 +103,11 @@ msgstr ""
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
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_refused
+msgid "Request refused"
+msgstr ""
+
#. module: hr_holidays
#: field:hr.holidays,number_of_days_temp:0
msgid "Allocation"
@@ -143,6 +148,7 @@ msgstr ""
#: selection:hr.holidays,state:0
#: selection:hr.holidays.summary.dept,holiday_type:0
#: selection:hr.holidays.summary.employee,holiday_type:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_approved
msgid "Approved"
msgstr ""
@@ -157,13 +163,7 @@ msgid "Refuse"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:434
-#, python-format
-msgid "Request <b>submitted</b>, waiting for validation by the manager."
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:439
+#: code:addons/hr_holidays/hr_holidays.py:433
#, python-format
msgid "Request <b>approved</b>, waiting second validation."
msgstr ""
@@ -209,12 +209,6 @@ msgstr ""
msgid "Second Approval"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:448
-#, python-format
-msgid "The request has been <b>approved</b>."
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
@@ -264,12 +258,12 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
-#: code:addons/hr_holidays/hr_holidays.py:283
-#: code:addons/hr_holidays/hr_holidays.py:409
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:238
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
+#: code:addons/hr_holidays/hr_holidays.py:291
+#: code:addons/hr_holidays/hr_holidays.py:414
+#: code:addons/hr_holidays/hr_holidays.py:464
#, python-format
msgid "Warning!"
msgstr ""
@@ -307,7 +301,7 @@ msgid "Sick Leaves"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:492
+#: code:addons/hr_holidays/hr_holidays.py:471
#, python-format
msgid "Leave Request for %s"
msgstr ""
@@ -368,8 +362,8 @@ msgid "Leaves by Type"
msgstr ""
#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_unread
-msgid "Holidays: Mark unread"
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
msgstr ""
#. module: hr_holidays
@@ -378,7 +372,7 @@ msgid "Wheat"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:490
+#: code:addons/hr_holidays/hr_holidays.py:469
#, python-format
msgid "Allocation for %s"
msgstr ""
@@ -398,7 +392,7 @@ msgid "Number of Days"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:485
+#: code:addons/hr_holidays/hr_holidays.py:464
#, python-format
msgid "The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \n"
"You may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \\ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field."
@@ -409,11 +403,6 @@ msgstr ""
msgid "Search Leave Type"
msgstr ""
-#. module: hr_holidays
-#: model:ir.actions.server,name:hr_holidays.actions_server_holidays_read
-msgid "Holidays: Mark read"
-msgstr ""
-
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0
msgid "Waiting Approval"
@@ -424,11 +413,6 @@ msgstr ""
msgid "Employee Tag"
msgstr ""
-#. module: hr_holidays
-#: field:hr.holidays.status,max_leaves:0
-msgid "Maximum Allowed"
-msgstr ""
-
#. module: hr_holidays
#: field:hr.holidays.summary.employee,emp:0
msgid "Employee(s)"
@@ -453,6 +437,12 @@ msgstr ""
msgid "Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar."
msgstr ""
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least one Department. And try again."
+msgstr ""
+
#. module: hr_holidays
#: field:hr.holidays,parent_id:0
msgid "Parent"
@@ -492,7 +482,7 @@ msgid "Start Date"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:409
+#: code:addons/hr_holidays/hr_holidays.py:414
#, python-format
msgid "There are not enough %s allocated for employee %s; please create an allocation request for this leave type."
msgstr ""
@@ -623,12 +613,6 @@ msgstr ""
msgid "Active"
msgstr ""
-#. module: hr_holidays
-#: field:hr.holidays,message_comment_ids:0
-#: help:hr.holidays,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: hr_holidays
#: view:hr.employee:0
#: field:hr.employee,remaining_leaves:0
@@ -682,9 +666,8 @@ msgid "My Department Leaves"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:428
-#, python-format
-msgid "Request <b>created</b>, waiting confirmation."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_confirmed
+msgid "Request confirmed, waiting confirmation"
msgstr ""
#. module: hr_holidays
@@ -735,7 +718,7 @@ msgid "Validated"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:230
+#: code:addons/hr_holidays/hr_holidays.py:238
#, python-format
msgid "You cannot delete a leave which is in %s state."
msgstr ""
@@ -797,7 +780,7 @@ msgid "To Submit"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:328
+#: code:addons/hr_holidays/hr_holidays.py:336
#: view:hr.holidays:0
#: selection:hr.holidays,type:0
#: field:resource.calendar.leaves,holiday_id:0
@@ -806,6 +789,7 @@ msgid "Leave Request"
msgstr ""
#. module: hr_holidays
+#: view:hr.holidays:0
#: field:hr.holidays,name:0
msgid "Description"
msgstr ""
@@ -818,6 +802,7 @@ msgstr ""
#. module: hr_holidays
#: selection:hr.employee,current_leave_state:0
#: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_refused
msgid "Refused"
msgstr ""
@@ -857,8 +842,8 @@ msgid "Violet"
msgstr ""
#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
msgstr ""
#. module: hr_holidays
@@ -888,8 +873,8 @@ msgid "Messages and communication history"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:241
-#: code:addons/hr_holidays/hr_holidays.py:266
+#: code:addons/hr_holidays/hr_holidays.py:249
+#: code:addons/hr_holidays/hr_holidays.py:274
#: sql_constraint:hr.holidays:0
#, python-format
msgid "The start date must be anterior to the end date."
@@ -900,12 +885,6 @@ msgstr ""
msgid "Leave"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:453
-#, python-format
-msgid "Request <b>refused</b>"
-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."
@@ -961,13 +940,13 @@ msgstr ""
#. module: hr_holidays
#: view:hr.holidays:0
#: selection:hr.holidays,state:0
+#: model:mail.message.subtype,name:hr_holidays.mt_holidays_confirmed
msgid "To Approve"
msgstr ""
#. module: hr_holidays
-#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
-#, python-format
-msgid "You have to select at least one Department. And try again."
+#: model:mail.message.subtype,description:hr_holidays.mt_holidays_approved
+msgid "Request approved"
msgstr ""
#. module: hr_holidays
@@ -980,9 +959,3 @@ msgstr ""
msgid "Select Leave Type"
msgstr ""
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr_holidays.py:445
-#, python-format
-msgid "Request <b>validated</b>."
-msgstr ""
-
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index beedbbd733b989456ddea8ea4093fa3ec007f9f9..d5e18e2f96445d44df01e0db0b275cd02dbacbe5 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 81ac3ea61778a4502378e211fd4efc0bc3c70638..dea6e7355df19eeb7c95aca7c049995c925f3e2b 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 64352dfa03dc5d0b891f1decbc555c0ffb673d14..7e1a22c5b105c6a709b56f4aac9dffb0d89c13ce 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -110,7 +110,7 @@ msgid "Sources of Applicants"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
#, python-format
msgid "You must define Applied Job for this applicant."
msgstr ""
@@ -270,7 +270,7 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:424
+#: code:addons/hr_recruitment/hr_recruitment.py:435
#, python-format
msgid "Warning!"
msgstr ""
@@ -281,8 +281,9 @@ msgid "Salary Proposed"
msgstr ""
#. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Edit..."
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
msgstr ""
#. module: hr_recruitment
@@ -304,9 +305,8 @@ msgid "Proposed Salary"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:482
-#, python-format
-msgid "Applicant has been set <b>in progress</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
+msgid "Source of Applicants"
msgstr ""
#. module: hr_recruitment
@@ -335,23 +335,24 @@ msgid "Job Description"
msgstr ""
#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_read
-msgid "HR Applicant: Mark read"
+#: view:hr.applicant:0
+#: field:hr.applicant,source_id:0
+msgid "Source"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:504
-#, python-format
-msgid "Applicant has been set as <b>new</b>."
+#: field:hr.applicant,message_follower_ids:0
+msgid "Followers"
msgstr ""
#. module: hr_recruitment
-#: view:hr.applicant:0
-#: selection:hr.applicant,state:0
-#: view:hr.recruitment.report:0
-#: selection:hr.recruitment.report,state:0
-#: selection:hr.recruitment.stage,state:0
-msgid "New"
+#: model:hr.recruitment.source,name:hr_recruitment.source_monster
+msgid "Monster"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_hired
+msgid "Applicant Hired"
msgstr ""
#. module: hr_recruitment
@@ -392,6 +393,11 @@ msgstr ""
msgid "Good"
msgstr ""
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
#: field:hr.applicant,create_date:0
@@ -405,11 +411,6 @@ 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
@@ -468,7 +469,7 @@ msgid "Applicants"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:342
+#: code:addons/hr_recruitment/hr_recruitment.py:351
#, python-format
msgid "No Subject"
msgstr ""
@@ -499,9 +500,8 @@ msgid "Salary Expected by Applicant, extra advantages"
msgstr ""
#. module: hr_recruitment
-#: view:hr.recruitment.report:0
-#: field:hr.recruitment.report,partner_id:0
-msgid "Partner"
+#: help:hr.applicant,state:0
+msgid "The status is set to 'Draft', when a case is created. If the case is in progress the status is set to 'Open'. When the case is over, the status is set to 'Done'. If the case needs to be reviewed then the status is set to 'Pending'."
msgstr ""
#. module: hr_recruitment
@@ -536,6 +536,11 @@ msgstr ""
msgid "Hire & Create Employee"
msgstr ""
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_hired
+msgid "Applicant hired"
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "Jobs - Recruitment Form"
@@ -547,8 +552,8 @@ msgid "Probability"
msgstr ""
#. module: hr_recruitment
-#: field:hr.job,alias_id:0
-msgid "Alias"
+#: selection:hr.recruitment.report,month:0
+msgid "April"
msgstr ""
#. module: hr_recruitment
@@ -589,8 +594,8 @@ msgid "Answer related job question"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
-msgid "Degree of Recruitment"
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
msgstr ""
#. module: hr_recruitment
@@ -616,8 +621,8 @@ msgid "or"
msgstr ""
#. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Search Jobs"
+#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_refused
+msgid "Applicant Refused"
msgstr ""
#. module: hr_recruitment
@@ -719,8 +724,9 @@ msgid "Schedule interview with this applicant"
msgstr ""
#. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "August"
+#: code:addons/hr_recruitment/hr_recruitment.py:397
+#, python-format
+msgid "Applicant <b>created</b>"
msgstr ""
#. module: hr_recruitment
@@ -734,8 +740,8 @@ msgid "Degree"
msgstr ""
#. module: hr_recruitment
-#: model:ir.actions.server,name:hr_recruitment.actions_server_applicant_unread
-msgid "HR Applicant: Mark unread"
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
msgstr ""
#. module: hr_recruitment
@@ -743,11 +749,6 @@ msgstr ""
msgid "June"
msgstr ""
-#. module: hr_recruitment
-#: help:hr.applicant,state:0
-msgid "The status is set to 'Draft', when a case is created. If the case is in progress the status is set to 'Open'. When the case is over, the status is set to 'Done'. If the case needs to be reviewed then the status is set to 'Pending'."
-msgstr ""
-
#. module: hr_recruitment
#: field:hr.applicant,day_close:0
msgid "Days to Close"
@@ -796,12 +797,6 @@ msgstr ""
msgid "Response"
msgstr ""
-#. module: hr_recruitment
-#: field:hr.applicant,message_comment_ids:0
-#: help:hr.applicant,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: hr_recruitment
#: selection:hr.recruitment.report,month:0
msgid "October"
@@ -817,11 +812,6 @@ msgstr ""
msgid "Proposed Salary Extra"
msgstr ""
-#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_hired
-msgid "Employee Hired"
-msgstr ""
-
#. module: hr_recruitment
#: selection:hr.recruitment.report,month:0
msgid "January"
@@ -834,9 +824,8 @@ msgid "A contact is already existing with the same name."
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:495
-#, python-format
-msgid "Applicant has been <b>hired</b>."
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
+msgid "Review Recruitment Stages"
msgstr ""
#. module: hr_recruitment
@@ -845,8 +834,8 @@ msgid "Contact:"
msgstr ""
#. module: hr_recruitment
-#: field:hr.applicant,message_summary:0
-msgid "Summary"
+#: view:hr.applicant:0
+msgid "Search Jobs"
msgstr ""
#. module: hr_recruitment
@@ -885,18 +874,6 @@ msgstr ""
msgid "Configure"
msgstr ""
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:492
-#, python-format
-msgid "Applicant has been <b>hired</b> 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"
@@ -924,11 +901,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: hr_recruitment
-#: field:hr.applicant,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
#. module: hr_recruitment
#: view:hr.recruitment.partner.create:0
msgid "Are you sure you want to create a contact based on this job request ?"
@@ -957,6 +929,11 @@ msgstr ""
msgid "Gives the sequence order when displaying a list of degrees."
msgstr ""
+#. module: hr_recruitment
+#: model:mail.message.subtype,description:hr_recruitment.mt_stage_changed
+msgid "Stage changed"
+msgstr ""
+
#. module: hr_recruitment
#: view:hr.applicant:0
#: field:hr.applicant,user_id:0
@@ -982,7 +959,7 @@ msgid "LinkedIn"
msgstr ""
#. module: hr_recruitment
-#: model:mail.message.subtype,name:hr_recruitment.mt_applicant_new
+#: model:mail.message.subtype,name:hr_recruitment.mt_job_new_applicant
msgid "New Applicant"
msgstr ""
@@ -997,8 +974,12 @@ msgid "Cases By Stage and Estimates"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
-msgid "Source of Applicants"
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+#: selection:hr.recruitment.stage,state:0
+msgid "New"
msgstr ""
#. module: hr_recruitment
@@ -1007,22 +988,11 @@ msgstr ""
msgid "Interview"
msgstr ""
-#. module: hr_recruitment
-#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
-msgid "Review Recruitment Stages"
-msgstr ""
-
#. module: hr_recruitment
#: field:hr.recruitment.source,name:0
msgid "Source Name"
msgstr ""
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:476
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
#. module: hr_recruitment
#: view:hr.applicant:0
msgid "Day(s)"
@@ -1034,8 +1004,8 @@ msgid "Description"
msgstr ""
#. module: hr_recruitment
-#: view:hr.applicant:0
-msgid "Unassigned Recruitments"
+#: model:mail.message.subtype,name:hr_recruitment.mt_stage_changed
+msgid "Stage Changed"
msgstr ""
#. module: hr_recruitment
@@ -1097,8 +1067,8 @@ msgid "On Average"
msgstr ""
#. module: hr_recruitment
-#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
-msgid "First Interview"
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
msgstr ""
#. module: hr_recruitment
@@ -1155,8 +1125,8 @@ msgid "These people will receive email."
msgstr ""
#. module: hr_recruitment
-#: selection:hr.recruitment.report,month:0
-msgid "April"
+#: field:hr.job,alias_id:0
+msgid "Alias"
msgstr ""
#. module: hr_recruitment
@@ -1169,14 +1139,19 @@ msgstr ""
msgid "Contract"
msgstr ""
+#. module: hr_recruitment
+#: field:hr.applicant,message_summary:0
+msgid "Summary"
+msgstr ""
+
#. module: hr_recruitment
#: help:hr.applicant,message_ids:0
msgid "Messages and communication history"
msgstr ""
#. module: hr_recruitment
-#: model:hr.recruitment.source,name:hr_recruitment.source_monster
-msgid "Monster"
+#: model:mail.message.subtype,description:hr_recruitment.mt_applicant_refused
+msgid "Applicant refused"
msgstr ""
#. module: hr_recruitment
@@ -1195,26 +1170,19 @@ msgstr ""
msgid "Sequence"
msgstr ""
-#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:490
-#, python-format
-msgid "New employee joined the company %s."
-msgstr ""
-
#. module: hr_recruitment
#: model:hr.recruitment.degree,name:hr_recruitment.degree_bachelor
msgid "Bachelor Degree"
msgstr ""
#. module: hr_recruitment
-#: model:ir.model,name:hr_recruitment.model_hr_config_settings
-msgid "hr.config.settings"
+#: view:hr.applicant:0
+msgid "Unassigned Recruitments"
msgstr ""
#. module: hr_recruitment
-#: code:addons/hr_recruitment/hr_recruitment.py:508
-#, python-format
-msgid "Applicant has been <b>created</b>."
+#: model:ir.model,name:hr_recruitment.model_hr_config_settings
+msgid "hr.config.settings"
msgstr ""
#. module: hr_recruitment
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index e02c9397c161ee6151117de40dd8fed6064e99ce..aee3902891de07969a932e681eb2288b7a07027c 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -176,10 +176,10 @@ msgid "Costs and Revenues"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
-#: code:addons/hr_timesheet/hr_timesheet.py:146
-#: code:addons/hr_timesheet/hr_timesheet.py:177
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:144
+#: code:addons/hr_timesheet/hr_timesheet.py:149
+#: code:addons/hr_timesheet/hr_timesheet.py:180
+#: code:addons/hr_timesheet/hr_timesheet.py:182
#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:43
#, python-format
msgid "Warning!"
@@ -270,7 +270,7 @@ msgid "Specifies employee's designation as a product with type 'service'."
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:179
+#: code:addons/hr_timesheet/hr_timesheet.py:182
#, python-format
msgid "No analytic account is defined on the project.\n"
"Please set one or we cannot automatically fill the timesheet."
@@ -282,7 +282,7 @@ msgid "Total cost"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:177
+#: code:addons/hr_timesheet/hr_timesheet.py:180
#, python-format
msgid "No 'Analytic Journal' is defined for employee %s \n"
"Define an employee for the selected user and assign an 'Analytic Journal'!"
@@ -352,7 +352,9 @@ msgid "Define your Analytic Structure"
msgstr ""
#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:146
#: view:hr.sign.in.project:0
+#, python-format
msgid "Sign in / Sign out"
msgstr ""
@@ -387,7 +389,7 @@ msgid "August"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:146
+#: code:addons/hr_timesheet/hr_timesheet.py:149
#, python-format
msgid "No analytic journal defined for '%s'.\n"
"You should assign an analytic journal on the employee form."
@@ -572,7 +574,7 @@ msgid "Sign Out By Project"
msgstr ""
#. module: hr_timesheet
-#: code:addons/hr_timesheet/hr_timesheet.py:141
+#: code:addons/hr_timesheet/hr_timesheet.py:144
#, python-format
msgid "Please create an employee for this user, using the menu: Human Resources > Employees."
msgstr ""
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 152442f66f3dfce01becb031690f581a162b1fd0..d2b9ed56e8eaa9c17078657d1faaa697fd207034 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -92,18 +92,13 @@ msgstr ""
msgid "March"
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."
-msgstr ""
-
#. module: hr_timesheet_invoice
#: report:account.analytic.profit:0
msgid "Profit"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:165
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:144
#, python-format
msgid "You cannot modify an invoiced analytic line!"
msgstr ""
@@ -118,11 +113,6 @@ msgstr ""
msgid "Display time in the history of works"
msgstr ""
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Journals"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
#: field:report.timesheet.line,day:0
@@ -164,7 +154,7 @@ msgid "Invoiced Amount"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:209
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:188
#, python-format
msgid "Analytic Account incomplete !"
msgstr ""
@@ -175,10 +165,8 @@ msgid "Project"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:164
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
-#, python-format
-msgid "Error!"
+#: view:account.analytic.account:0
+msgid "Invoice on Timesheets Options"
msgstr ""
#. module: hr_timesheet_invoice
@@ -191,12 +179,6 @@ msgstr ""
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:116
-#, python-format
-msgid "Contract has been set as <b>pending</b>."
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:account.analytic.account,pricelist_id:0
msgid "Pricelist"
@@ -217,6 +199,11 @@ msgstr ""
msgid "Analytic account to close"
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 sales order), you should invoice the rest on timesheet with a 80% ratio."
+msgstr ""
+
#. module: hr_timesheet_invoice
#: view:hr.timesheet.invoice.create:0
msgid "Create Invoices"
@@ -242,7 +229,7 @@ msgid "Deadline"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -279,7 +266,7 @@ msgid "Costs to invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:267
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:246
#, python-format
msgid "Please define income account for product '%s'."
msgstr ""
@@ -322,12 +309,6 @@ msgstr ""
msgid "To Invoice"
msgstr ""
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:98
-#, python-format
-msgid "Contract has been <b>closed</b>."
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:hr.timesheet.analytic.profit:0
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_analytic_profit
@@ -449,11 +430,6 @@ msgstr ""
msgid "Currency"
msgstr ""
-#. module: hr_timesheet_invoice
-#: view:hr.timesheet.analytic.profit:0
-msgid "Users"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
msgid "Non Assigned timesheets to users"
@@ -606,11 +582,6 @@ msgstr ""
msgid "Date"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_closed
-msgid "finished"
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:report.timesheet.line,quantity:0
#: field:report_timesheet.account,quantity:0
@@ -642,8 +613,8 @@ msgid "General Account"
msgstr ""
#. module: hr_timesheet_invoice
-#: view:account.analytic.account:0
-msgid "Invoice on Timesheets Options"
+#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
+msgid "Print Timesheet Profit"
msgstr ""
#. module: hr_timesheet_invoice
@@ -652,8 +623,9 @@ msgid "Totals:"
msgstr ""
#. module: hr_timesheet_invoice
-#: model:mail.message.subtype,name:hr_timesheet_invoice.mt_account_canceled
-msgid "canceled"
+#: 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
@@ -751,13 +723,7 @@ msgid "Timesheets to invoice"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:104
-#, python-format
-msgid "Contract has been <b>canceled</b>."
-msgstr ""
-
-#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:210
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:189
#, python-format
msgid "Contract incomplete. Please fill in the Customer and Pricelist fields."
msgstr ""
@@ -804,12 +770,6 @@ msgstr ""
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:110
-#, python-format
-msgid "Contract has been <b>opened</b>."
-msgstr ""
-
#. module: hr_timesheet_invoice
#: field:hr.timesheet.invoice.create.final,time:0
msgid "Time Spent"
@@ -864,11 +824,6 @@ msgstr ""
msgid "Sale price"
msgstr ""
-#. module: hr_timesheet_invoice
-#: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_analytic_profit
-msgid "Print Timesheet Profit"
-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"
@@ -884,7 +839,7 @@ msgid "April"
msgstr ""
#. module: hr_timesheet_invoice
-#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:254
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
#, python-format
msgid "There is no product defined. Please select one or force the product through the wizard."
msgstr ""
@@ -912,9 +867,10 @@ msgid "Units"
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"
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:143
+#: code:addons/hr_timesheet_invoice/hr_timesheet_invoice.py:233
+#, python-format
+msgid "Error!"
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 5e6eb17431bde04c378dc3313dceb772ab566e84..dce53a4c18e4657782ae3de51bcb96f97f0a2532 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -136,8 +136,8 @@ msgid "Based on the timesheet"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet."
msgstr ""
@@ -192,8 +192,8 @@ msgid "Please create an employee and associate it with this user."
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
#, python-format
msgid "You cannot enter an attendance date outside the current timesheet dates."
msgstr ""
@@ -228,9 +228,9 @@ msgstr ""
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:80
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:82
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:84
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:313
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:384
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:326
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:397
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
#, python-format
msgid "Error!"
@@ -465,11 +465,6 @@ msgstr ""
msgid "hr.timesheet.current.open"
msgstr ""
-#. module: hr_timesheet_sheet
-#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
-msgid "Validated"
-msgstr ""
-
#. module: hr_timesheet_sheet
#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:71
#, python-format
@@ -679,9 +674,8 @@ msgid "Timesheet range"
msgstr ""
#. module: hr_timesheet_sheet
-#: field:hr_timesheet_sheet.sheet,message_comment_ids:0
-#: help:hr_timesheet_sheet.sheet,message_comment_ids:0
-msgid "Comments and emails"
+#: view:board.board:0
+msgid "My Total Attendance By Week"
msgstr ""
#. module: hr_timesheet_sheet
@@ -761,7 +755,7 @@ msgid "Search Account"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:415
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:428
#, python-format
msgid "You cannot modify an entry in a confirmed timesheet"
msgstr ""
@@ -818,8 +812,8 @@ msgid "Cancel"
msgstr ""
#. module: hr_timesheet_sheet
-#: view:board.board:0
-msgid "My Total Attendance By Week"
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
msgstr ""
#. module: hr_timesheet_sheet
@@ -927,8 +921,8 @@ msgid "May"
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
@@ -1025,8 +1019,8 @@ msgid "Invoice rate"
msgstr ""
#. module: hr_timesheet_sheet
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:388
-#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:408
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:401
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:421
#, python-format
msgid "User Error!"
msgstr ""
@@ -1107,8 +1101,8 @@ msgid "Total"
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
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index e9e6c892227ebe1279c5aca28d4b3a5ff3b2f1d0..86248a34a40282a7822fe738b00450c7380ab3c5 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-12-03 10:24+0000\n"
-"PO-Revision-Date: 2012-12-03 10:24+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -72,12 +72,6 @@ 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
@@ -105,9 +99,8 @@ msgid "Unread Messages"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:86
-#, python-format
-msgid "Idea has been created."
+#: help:idea.idea,message_ids:0
+msgid "Messages and communication history"
msgstr ""
#. module: idea
@@ -115,14 +108,6 @@ 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"
@@ -140,31 +125,22 @@ msgstr ""
msgid "Categories"
msgstr ""
-#. module: idea
-#: field:idea.idea,message_comment_ids:0
-#: help:idea.idea,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: idea
#: view:idea.idea:0
msgid "Refuse"
msgstr ""
-#. module: idea
-#: help:idea.idea,message_ids:0
-msgid "Messages and communication history"
-msgstr ""
-
#. module: idea
#: field:idea.idea,message_ids:0
msgid "Messages"
msgstr ""
#. module: idea
-#: code:addons/idea/idea.py:81
-#, python-format
-msgid "Idea has been accepted."
+#: 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
@@ -208,12 +184,6 @@ msgstr ""
msgid "Open"
msgstr ""
-#. module: idea
-#: code:addons/idea/idea.py:76
-#, python-format
-msgid "Idea has been opened."
-msgstr ""
-
#. module: idea
#: view:idea.idea:0
msgid "Idea"
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index 0cbc0c4c3aa2477367e7054fc737870740918f3d..d1de24cf93955067b5023982e1bbc0c7d4f68c81 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index 2eee3ac8adc58a4f3f6cf57dce29334e7deb35c3..383c8b0e60ebcf33de054bf28a415d0e2e3da8b1 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -188,7 +188,7 @@ msgid "Lunch Alert"
msgstr ""
#. module: lunch
-#: code:addons/lunch/lunch.py:182
+#: code:addons/lunch/lunch.py:183
#, python-format
msgid "Select a product and put your order comments on the note."
msgstr ""
@@ -245,7 +245,7 @@ msgid "New"
msgstr ""
#. module: lunch
-#: code:addons/lunch/lunch.py:179
+#: code:addons/lunch/lunch.py:180
#, python-format
msgid "This is the first time you order a meal"
msgstr ""
@@ -298,11 +298,6 @@ msgstr ""
msgid "Control Accounts"
msgstr ""
-#. module: lunch
-#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
-msgid "Employee's Payment"
-msgstr ""
-
#. module: lunch
#: selection:lunch.alert,alter_type:0
msgid "Every Day"
@@ -431,7 +426,7 @@ msgid "Note"
msgstr ""
#. module: lunch
-#: code:addons/lunch/lunch.py:249
+#: code:addons/lunch/lunch.py:250
#, python-format
msgid "Add"
msgstr ""
@@ -662,7 +657,7 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: lunch
-#: code:addons/lunch/lunch.py:185
+#: code:addons/lunch/lunch.py:186
#, python-format
msgid "Your favorite meals will be created based on your last orders."
msgstr ""
@@ -691,7 +686,7 @@ msgid "Recurrency"
msgstr ""
#. module: lunch
-#: code:addons/lunch/lunch.py:188
+#: code:addons/lunch/lunch.py:189
#, python-format
msgid "Don't forget the alerts displayed in the reddish area"
msgstr ""
@@ -751,6 +746,11 @@ msgstr ""
msgid "Cancel a meal means that we didn't receive it from the supplier."
msgstr ""
+#. module: lunch
+#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove
+msgid "Employee Payments"
+msgstr ""
+
#. module: lunch
#: view:lunch.cashmove:0
#: selection:lunch.cashmove,state:0
diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index ac7cb2b1e0f8f9dd5d09d45f43a3ad8fb5c2119c..44a8b895038359987b66a47bbd091e894c2619a9 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-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-03 16:01+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17: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: mail
-#: field:res.partner,notification_email_send:0
-msgid "Receive Feeds by Email"
-msgstr ""
-
#. module: mail
#: view:mail.followers:0
msgid "Followers Form"
@@ -46,6 +41,11 @@ msgstr ""
msgid "Message recipients"
msgstr ""
+#. module: mail
+#: help:mail.message.subtype,default:0
+msgid "Activated by default when subscribing."
+msgstr ""
+
#. module: mail
#: view:mail.message:0
msgid "Comments"
@@ -75,8 +75,10 @@ msgid "Compose Email"
msgstr ""
#. module: mail
-#: constraint:mail.alias:0
-msgid "Invalid expression, it must be a literal python dictionary definition e.g. \"{'field': 'value'}\""
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:132
+#, python-format
+msgid "Add them into recipients and followers"
msgstr ""
#. module: mail
@@ -110,6 +112,18 @@ msgstr ""
msgid "Email composition wizard"
msgstr ""
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:23
+#, python-format
+msgid "Add others"
+msgstr ""
+
+#. module: mail
+#: field:mail.message.subtype,parent_id:0
+msgid "Parent"
+msgstr ""
+
#. module: mail
#: field:mail.group,message_unread:0
#: field:mail.thread,message_unread:0
@@ -119,16 +133,11 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
#, python-format
msgid "show"
msgstr ""
-#. module: mail
-#: help:mail.message.subtype,default:0
-msgid "Checked by default when subscribing."
-msgstr ""
-
#. module: mail
#: help:mail.group,group_ids:0
msgid "Members of those groups will automatically added as followers. Note that they will be able to manage their subscription manually if necessary."
@@ -136,7 +145,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail.js:778
+#: code:addons/mail/static/src/js/mail.js:869
#, python-format
msgid "Do you really want to delete this message?"
msgstr ""
@@ -154,13 +163,13 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:134
+#: code:addons/mail/static/src/js/mail_followers.js:156
#, python-format
msgid "followers"
msgstr ""
#. module: mail
-#: code:addons/mail/mail_message.py:646
+#: code:addons/mail/mail_message.py:726
#, python-format
msgid "Access Denied"
msgstr ""
@@ -171,14 +180,29 @@ msgid "Medium-sized photo of the group. It is automatically resized as a 128x128
msgstr ""
#. module: mail
-#: view:mail.mail:0
-#: selection:mail.mail,state:0
-msgid "Received"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:194
+#, python-format
+msgid "Uploading error"
msgstr ""
#. module: mail
-#: field:mail.mail,body_html:0
-msgid "Rich-text Contents"
+#: model:mail.group,name:mail.group_support
+msgid "Support"
+msgstr ""
+
+#. module: mail
+#: code:addons/mail/mail_message.py:727
+#, python-format
+msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
+"\n"
+"(Document type: %s, Operation: %s)"
+msgstr ""
+
+#. module: mail
+#: view:mail.mail:0
+#: selection:mail.mail,state:0
+msgid "Received"
msgstr ""
#. module: mail
@@ -217,7 +241,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:179
+#: code:addons/mail/static/src/xml/mail.xml:188
#, python-format
msgid "No messages."
msgstr ""
@@ -237,9 +261,9 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:211
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
#, python-format
-msgid "Set back to Inbox"
+msgid "more."
msgstr ""
#. module: mail
@@ -249,8 +273,8 @@ msgid "Message type: email for email message, notification for system message, c
msgstr ""
#. module: mail
-#: model:ir.model,name:mail.model_mail_wizard_invite
-msgid "Invite wizard"
+#: help:mail.message.subtype,relation_field:0
+msgid "Field used to link the related model to the subtype model when using automatic subscription on a related document. The field is used to compute getattr(related_document.relation_field)."
msgstr ""
#. module: mail
@@ -307,14 +331,14 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:246
+#: code:addons/mail/static/src/xml/mail.xml:261
#, python-format
msgid "show one more message"
msgstr ""
#. module: mail
#: code:addons/mail/mail_mail.py:71
-#: code:addons/mail/res_users.py:76
+#: code:addons/mail/res_users.py:79
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -351,6 +375,11 @@ msgstr ""
msgid "The model (OpenERP Document Kind) to which this alias corresponds. Any incoming email that does not reply to an existing record will cause the creation of a new record of this model (e.g. a Project Task)"
msgstr ""
+#. module: mail
+#: field:mail.message.subtype,relation_field:0
+msgid "Relation field"
+msgstr ""
+
#. module: mail
#: selection:mail.compose.message,type:0
#: selection:mail.message,type:0
@@ -397,23 +426,11 @@ msgstr ""
msgid "Email message"
msgstr ""
-#. module: mail
-#: help:mail.compose.message,favorite_user_ids:0
-#: help:mail.message,favorite_user_ids:0
-msgid "Users that set this message in their favorites"
-msgstr ""
-
#. module: mail
#: model:ir.model,name:mail.model_base_config_settings
msgid "base.config.settings"
msgstr ""
-#. module: mail
-#: field:mail.compose.message,to_read:0
-#: field:mail.message,to_read:0
-msgid "To read"
-msgstr ""
-
#. module: mail
#: view:mail.compose.message:0
msgid "Send"
@@ -421,7 +438,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:130
+#: code:addons/mail/static/src/js/mail_followers.js:152
#, python-format
msgid "No followers"
msgstr ""
@@ -431,14 +448,9 @@ msgstr ""
msgid "Failed"
msgstr ""
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_won
-msgid "Won"
-msgstr ""
-
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:21
+#: code:addons/mail/static/src/xml/mail_followers.xml:22
#: model:ir.actions.act_window,name:mail.action_view_followers
#: model:ir.ui.menu,name:mail.menu_email_followers
#: view:mail.followers:0
@@ -458,19 +470,22 @@ msgstr ""
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:82
+#: code:addons/mail/static/src/xml/mail.xml:94
#, python-format
msgid "Delete this attachment"
msgstr ""
#. module: mail
-#: field:mail.compose.message,message_id:0
-#: field:mail.message,message_id:0
-msgid "Message-Id"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:227
+#: view:mail.mail:0
+#, python-format
+msgid "Reply"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/js/mail_followers.js:132
+#: code:addons/mail/static/src/js/mail_followers.js:154
#, python-format
msgid "One follower"
msgstr ""
@@ -499,12 +514,12 @@ msgid "Comments and Emails"
msgstr ""
#. module: mail
-#: model:ir.model,name:mail.model_mail_favorite
-msgid "Favorite messages"
+#: field:mail.alias,alias_defaults:0
+msgid "Default Values"
msgstr ""
#. module: mail
-#: code:addons/mail/res_users.py:97
+#: code:addons/mail/res_users.py:100
#, python-format
msgid "%s has joined the %s network."
msgstr ""
@@ -522,7 +537,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:126
+#: code:addons/mail/static/src/xml/mail.xml:127
#, python-format
msgid "<<<"
msgstr ""
@@ -580,7 +595,7 @@ msgid "<p>\n"
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.group_rd_ir_ui_menu
+#: model:mail.group,name:mail.group_rd
msgid "R&D"
msgstr ""
@@ -602,33 +617,28 @@ msgid "Advanced"
msgstr ""
#. module: mail
-#: code:addons/mail/wizard/mail_compose_message.py:154
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:226
#, python-format
-msgid "Re:"
+msgid "Move to Inbox"
msgstr ""
#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:212
-#: view:mail.mail:0
+#: code:addons/mail/wizard/mail_compose_message.py:165
#, python-format
-msgid "Reply"
+msgid "Re:"
msgstr ""
#. module: mail
-#: code:addons/mail/res_users.py:76
-#, python-format
-msgid "You may not create a user. To create new users, you should use the \"Settings > Users\" menu."
+#: field:mail.compose.message,to_read:0
+#: field:mail.message,to_read:0
+msgid "To read"
msgstr ""
#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_mail_message
-#: model:ir.ui.menu,name:mail.menu_mail_message
-#: field:mail.group,message_ids:0
-#: view:mail.message:0
-#: field:mail.thread,message_ids:0
-#: field:res.partner,message_ids:0
-msgid "Messages"
+#: code:addons/mail/res_users.py:79
+#, python-format
+msgid "You may not create a user. To create new users, you should use the \"Settings > Users\" menu."
msgstr ""
#. module: mail
@@ -639,7 +649,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:271
+#: code:addons/mail/static/src/xml/mail.xml:286
#, python-format
msgid "like"
msgstr ""
@@ -685,7 +695,7 @@ msgid "on"
msgstr ""
#. module: mail
-#: code:addons/mail/mail_message.py:809
+#: code:addons/mail/mail_message.py:916
#, python-format
msgid "The following partners chosen as recipients for the email have no email address linked :"
msgstr ""
@@ -695,6 +705,11 @@ msgstr ""
msgid "A Python dictionary that will be evaluated to provide default values when creating new records for this alias."
msgstr ""
+#. module: mail
+#: model:ir.model,name:mail.model_mail_message_subtype
+msgid "Message subtypes"
+msgstr ""
+
#. module: mail
#: help:mail.compose.message,notified_partner_ids:0
#: help:mail.message,notified_partner_ids:0
@@ -727,7 +742,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:161
+#: code:addons/mail/static/src/xml/mail.xml:170
#, python-format
msgid "Compose a new message"
msgstr ""
@@ -755,7 +770,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:164
+#: code:addons/mail/static/src/xml/mail.xml:173
#: view:mail.compose.message:0
#: view:mail.wizard.invite:0
#, python-format
@@ -783,23 +798,12 @@ msgstr ""
msgid "Email Search"
msgstr ""
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_canceled
-msgid "Canceled"
-msgstr ""
-
#. module: mail
#: field:mail.compose.message,child_ids:0
#: field:mail.message,child_ids:0
msgid "Child Messages"
msgstr ""
-#. module: mail
-#: help:mail.compose.message,to_read:0
-#: help:mail.message,to_read:0
-msgid "Functional field to search for messages the current user has to read"
-msgstr ""
-
#. module: mail
#: field:mail.alias,alias_user_id:0
msgid "Owner"
@@ -812,21 +816,13 @@ msgstr ""
#. module: mail
#: model:ir.model,name:mail.model_mail_message
-#: field:mail.favorite,message_id:0
#: field:mail.mail,mail_message_id:0
#: view:mail.message:0
#: field:mail.notification,message_id:0
-#: field:mail.vote,message_id:0
#: field:mail.wizard.invite,message:0
msgid "Message"
msgstr ""
-#. module: mail
-#: model:ir.actions.client,name:mail.action_mail_star_feeds
-#: model:ir.ui.menu,name:mail.mail_starfeeds
-msgid "Todo"
-msgstr ""
-
#. module: mail
#: help:mail.followers,res_id:0
#: help:mail.wizard.invite,res_id:0
@@ -845,6 +841,11 @@ msgstr ""
msgid "Aliases"
msgstr ""
+#. module: mail
+#: help:mail.message.subtype,description:0
+msgid "Description that will be added in the message posted for this subtype. If void, the name will be added instead."
+msgstr ""
+
#. module: mail
#: field:mail.compose.message,vote_user_ids:0
#: field:mail.message,vote_user_ids:0
@@ -856,6 +857,12 @@ msgstr ""
msgid "Group"
msgstr ""
+#. module: mail
+#: help:mail.compose.message,starred:0
+#: help:mail.message,starred:0
+msgid "Current user has a starred notification linked to this message"
+msgstr ""
+
#. module: mail
#: field:mail.group,public:0
msgid "Privacy"
@@ -867,8 +874,10 @@ msgid "Notification"
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.group_support_ir_ui_menu
-msgid "Support"
+#. openerp-web
+#: code:addons/mail/static/src/js/mail.js:585
+#, python-format
+msgid "Please complete partner's informations"
msgstr ""
#. module: mail
@@ -877,8 +886,8 @@ msgid "Add Followers"
msgstr ""
#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_closed
-msgid "Closed"
+#: view:mail.compose.message:0
+msgid "Followers of selected items and"
msgstr ""
#. module: mail
@@ -957,7 +966,7 @@ msgid "by"
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.group_best_sales_practices_ir_ui_menu
+#: model:mail.group,name:mail.group_best_sales_practices
msgid "Best Sales Practices"
msgstr ""
@@ -975,9 +984,7 @@ msgstr ""
#. module: mail
#: view:mail.alias:0
-#: field:mail.favorite,user_id:0
#: view:mail.mail:0
-#: field:mail.vote,user_id:0
msgid "User"
msgstr ""
@@ -1009,16 +1016,6 @@ msgstr ""
msgid "Extended Filters..."
msgstr ""
-#. module: mail
-#: field:mail.group,message_comment_ids:0
-#: help:mail.group,message_comment_ids:0
-#: field:mail.thread,message_comment_ids:0
-#: help:mail.thread,message_comment_ids:0
-#: field:res.partner,message_comment_ids:0
-#: help:res.partner,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:107
@@ -1028,7 +1025,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:166
+#: code:addons/mail/static/src/xml/mail.xml:175
#, python-format
msgid "Write to my followers"
msgstr ""
@@ -1045,18 +1042,28 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:245
+#: code:addons/mail/static/src/xml/mail.xml:260
#, python-format
msgid "show more message"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:213
+#: code:addons/mail/static/src/xml/mail.xml:228
#, python-format
msgid "Mark as Todo"
msgstr ""
+#. module: mail
+#: help:mail.message.subtype,parent_id:0
+msgid "Parent subtype, used for automatic subscription."
+msgstr ""
+
+#. module: mail
+#: model:ir.model,name:mail.model_mail_wizard_invite
+msgid "Invite wizard"
+msgstr ""
+
#. module: mail
#: field:mail.group,message_summary:0
#: field:mail.thread,message_summary:0
@@ -1064,6 +1071,11 @@ msgstr ""
msgid "Summary"
msgstr ""
+#. module: mail
+#: help:mail.message.subtype,res_model:0
+msgid "Model the subtype applies to. If False, this subtype applies to all models."
+msgstr ""
+
#. module: mail
#: field:mail.compose.message,subtype_id:0
#: field:mail.followers,subtype_ids:0
@@ -1077,9 +1089,16 @@ msgstr ""
msgid "Group Form"
msgstr ""
+#. module: mail
+#: field:mail.compose.message,starred:0
+#: field:mail.message,starred:0
+#: field:mail.notification,starred:0
+msgid "Starred"
+msgstr ""
+
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:247
+#: code:addons/mail/static/src/xml/mail.xml:262
#, python-format
msgid "more messages"
msgstr ""
@@ -1108,8 +1127,16 @@ msgid "The owner of records created upon receiving emails on this alias. If this
msgstr ""
#. module: mail
-#: view:mail.favorite:0
-msgid "Favorite Form"
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:52
+#, python-format
+msgid "And"
+msgstr ""
+
+#. module: mail
+#: field:mail.compose.message,message_id:0
+#: field:mail.message,message_id:0
+msgid "Message-Id"
msgstr ""
#. module: mail
@@ -1135,6 +1162,11 @@ msgstr ""
msgid "Cc"
msgstr ""
+#. module: mail
+#: help:mail.notification,starred:0
+msgid "Starred message that goes into the todo mailbox"
+msgstr ""
+
#. module: mail
#. openerp-web
#: code:addons/mail/static/src/xml/mail.xml:110
@@ -1155,16 +1187,11 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:209
+#: code:addons/mail/static/src/xml/mail.xml:224
#, python-format
msgid "Done"
msgstr ""
-#. module: mail
-#: help:mail.message.subtype,res_model:0
-msgid "Related model of the subtype. If False, this subtype exists for all models."
-msgstr ""
-
#. module: mail
#: model:mail.message.subtype,name:mail.mt_comment
msgid "Discussions"
@@ -1178,7 +1205,12 @@ msgid "Follow"
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.group_all_employees_ir_ui_menu
+#: field:mail.group,name:0
+msgid "Name"
+msgstr ""
+
+#. module: mail
+#: model:mail.group,name:mail.group_all_employees
msgid "Whole Company"
msgstr ""
@@ -1202,7 +1234,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:257
+#: code:addons/mail/static/src/xml/mail.xml:272
#, python-format
msgid "Compose new Message"
msgstr ""
@@ -1222,44 +1254,27 @@ msgstr ""
msgid "To"
msgstr ""
-#. module: mail
-#: model:ir.model,name:mail.model_mail_message_subtype
-msgid "mail_message_subtype"
-msgstr ""
-
-#. module: mail
-#: selection:mail.group,public:0
-msgid "Private"
-msgstr ""
-
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_issue_new
-msgid "New"
-msgstr ""
-
#. module: mail
#: field:mail.compose.message,notified_partner_ids:0
#: field:mail.message,notified_partner_ids:0
msgid "Notified partners"
msgstr ""
-#. module: mail
-#. openerp-web
-#: code:addons/mail/static/src/xml/mail_followers.xml:22
-#, python-format
-msgid "Invite others"
-msgstr ""
-
#. module: mail
#: help:mail.group,public:0
msgid "This group is visible by non members. Invisible groups can add members through the invite button."
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.group_board_ir_ui_menu
+#: model:mail.group,name:mail.group_board
msgid "Board meetings"
msgstr ""
+#. module: mail
+#: constraint:mail.alias:0
+msgid "Invalid expression, it must be a literal python dictionary definition e.g. \"{'field': 'value'}\""
+msgstr ""
+
#. module: mail
#: field:mail.alias,alias_model_id:0
msgid "Aliased Model"
@@ -1273,26 +1288,20 @@ msgstr ""
#. module: mail
#: field:mail.group,description:0
+#: field:mail.message.subtype,description:0
msgid "Description"
msgstr ""
-#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_stage
-#: model:mail.message.subtype,name:mail.mt_issue_change
-msgid "Stage Changed"
-msgstr ""
-
#. module: mail
#: model:ir.model,name:mail.model_mail_followers
msgid "Document Followers"
msgstr ""
#. module: mail
-#: code:addons/mail/mail_message.py:647
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail_followers.xml:35
#, python-format
-msgid "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n"
-"\n"
-"(Document type: %s, Operation: %s)"
+msgid "Remove this follower"
msgstr ""
#. module: mail
@@ -1306,7 +1315,7 @@ msgid "Outgoing mail server"
msgstr ""
#. module: mail
-#: code:addons/mail/mail_message.py:813
+#: code:addons/mail/mail_message.py:920
#, python-format
msgid "Partners email addresses not found"
msgstr ""
@@ -1318,10 +1327,14 @@ msgid "Sent"
msgstr ""
#. module: mail
-#: model:ir.actions.act_window,name:mail.action_view_favorites
-#: model:ir.ui.menu,name:mail.menu_email_favorites
-#: view:mail.favorite:0
-msgid "Favorites"
+#: field:mail.mail,body_html:0
+msgid "Rich-text Contents"
+msgstr ""
+
+#. module: mail
+#: help:mail.compose.message,to_read:0
+#: help:mail.message,to_read:0
+msgid "Current user has an unread notification linked to this message"
msgstr ""
#. module: mail
@@ -1343,6 +1356,13 @@ msgid "<p>\n"
" "
msgstr ""
+#. module: mail
+#. openerp-web
+#: code:addons/mail/static/src/xml/mail.xml:195
+#, python-format
+msgid "Please, wait while the file is uploading."
+msgstr ""
+
#. module: mail
#: view:mail.group:0
msgid "This group is visible by everyone,\n"
@@ -1352,7 +1372,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:210
+#: code:addons/mail/static/src/xml/mail.xml:225
#, python-format
msgid "Set back to Todo"
msgstr ""
@@ -1370,13 +1390,8 @@ msgid "Filters"
msgstr ""
#. module: mail
-#: model:mail.message.subtype,name:mail.mt_crm_lost
-msgid "Lost"
-msgstr ""
-
-#. module: mail
-#: field:mail.alias,alias_defaults:0
-msgid "Default Values"
+#: field:res.partner,notification_email_send:0
+msgid "Receive Feeds by Email"
msgstr ""
#. module: mail
@@ -1385,18 +1400,28 @@ msgid "If you have setup a catch-all email domain redirected to the OpenERP serv
msgstr ""
#. module: mail
-#: field:mail.compose.message,favorite_user_ids:0
-#: field:mail.message,favorite_user_ids:0
-msgid "Favorite"
+#: model:ir.actions.act_window,name:mail.action_view_mail_message
+#: model:ir.ui.menu,name:mail.menu_mail_message
+#: field:mail.group,message_ids:0
+#: view:mail.message:0
+#: field:mail.thread,message_ids:0
+#: field:res.partner,message_ids:0
+msgid "Messages"
msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:125
+#: code:addons/mail/static/src/xml/mail.xml:126
#, python-format
msgid "others..."
msgstr ""
+#. module: mail
+#: model:ir.actions.client,name:mail.action_mail_star_feeds
+#: model:ir.ui.menu,name:mail.mail_starfeeds
+msgid "To-do"
+msgstr ""
+
#. module: mail
#: view:mail.alias:0
#: field:mail.alias,alias_name:0
@@ -1465,7 +1490,7 @@ msgstr ""
#. module: mail
#. openerp-web
-#: code:addons/mail/static/src/xml/mail.xml:272
+#: code:addons/mail/static/src/xml/mail.xml:287
#, python-format
msgid "unlike"
msgstr ""
@@ -1493,8 +1518,8 @@ msgid "Error during communication with the publisher warranty server."
msgstr ""
#. module: mail
-#: model:ir.model,name:mail.model_mail_vote
-msgid "Mail Vote"
+#: selection:mail.group,public:0
+msgid "Private"
msgstr ""
#. module: mail
@@ -1525,7 +1550,7 @@ msgid "Initial thread message."
msgstr ""
#. module: mail
-#: model:ir.ui.menu,name:mail.group_hr_policies_ir_ui_menu
+#: model:mail.group,name:mail.group_hr_policies
msgid "HR Policies"
msgstr ""
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index da98a00f9f58fa60904b831a69febc0a75b9968a..62260dff76704adc647daa51be1d2c7ce0e37cc6 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -33,6 +33,7 @@ msgid "Configure Marketing"
msgstr ""
#. module: marketing
+#: view:crm.lead:0
#: model:ir.ui.menu,name:marketing.menu_marketing_configuration
msgid "Marketing"
msgstr ""
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index 4e6415fdb874fbaf430cffc6afdb06713cbb37f6..f0d8e85ee3a38b9f9ed28f000c5099eeade9b21a 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index 4fb6ca31cdf5731964859494290af3dd8cca6fa7..1fb423afdb8a80ad3e805f012a1219ba6da723f5 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index 573c4f761ff634cf451025736fb3a70b8f1add68..a7f6f7648a21d99d87bb729316e53f62f434a082 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -94,11 +94,12 @@ msgid "Ending Date Of Membership"
msgstr ""
#. module: membership
-#: field:product.product,membership_date_to:0
-msgid "Date to"
+#: help:report.membership,date_to:0
+msgid "End membership date"
msgstr ""
#. module: membership
+#: field:product.product,membership_date_to:0
#: field:res.partner,membership_stop:0
msgid "Membership End Date"
msgstr ""
@@ -195,11 +196,6 @@ msgstr ""
msgid "End Membership Date"
msgstr ""
-#. module: membership
-#: field:product.product,membership_date_from:0
-msgid "Date from"
-msgstr ""
-
#. module: membership
#: code:addons/membership/membership.py:414
#, python-format
@@ -459,11 +455,6 @@ msgstr ""
msgid "Membership Status"
msgstr ""
-#. module: membership
-#: help:report.membership,date_to:0
-msgid "End membership date"
-msgstr ""
-
#. module: membership
#: view:res.partner:0
msgid "Customers"
@@ -644,11 +635,6 @@ msgstr ""
msgid "All non Members"
msgstr ""
-#. module: membership
-#: view:product.product:0
-msgid "Information"
-msgstr ""
-
#. module: membership
#: field:membership.membership_line,account_invoice_line:0
msgid "Account Invoice line"
@@ -680,6 +666,7 @@ msgid "May"
msgstr ""
#. module: membership
+#: field:product.product,membership_date_from:0
#: field:res.partner,membership_start:0
msgid "Membership Start Date"
msgstr ""
@@ -769,6 +756,11 @@ msgstr ""
msgid "Year"
msgstr ""
+#. module: membership
+#: view:product.product:0
+msgid "Accounting"
+msgstr ""
+
#. module: membership
#: view:report.membership:0
msgid "Revenue Done"
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index b870d4da734ab3ce32f13ba5f26cf4b758480d80..e221ba93be336955afbd27c16fb2eaabcd1aacd3 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -143,11 +143,6 @@ msgstr ""
msgid "The system launches automatically a RFQ to the preferred supplier."
msgstr ""
-#. module: mrp
-#: help:mrp.config.settings,group_mrp_properties:0
-msgid "The selection of the right Bill of Material to use will depend on the properties specified on the sale order and the Bill of Material."
-msgstr ""
-
#. module: mrp
#: view:mrp.production:0
msgid "Products to Finish"
@@ -183,13 +178,18 @@ msgstr ""
msgid "For purchased material"
msgstr ""
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
+msgid "Order Planning"
+msgstr ""
+
#. module: mrp
#: field:mrp.config.settings,module_mrp_operations:0
msgid "Allow detailed planning of work order"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:648
+#: code:addons/mrp/mrp.py:633
#, python-format
msgid "Cannot cancel manufacturing order!"
msgstr ""
@@ -254,6 +254,17 @@ msgstr ""
msgid "Produce several products from one manufacturing order"
msgstr ""
+#. module: mrp
+#: help:mrp.config.settings,group_mrp_properties:0
+msgid "The selection of the right Bill of Material to use will depend on the properties specified on the sales order and the Bill of Material."
+msgstr ""
+
+#. module: mrp
+#: view:mrp.bom:0
+msgid "When processing a sales order for this product, the delivery order\n"
+" will contain the raw materials, instead of the finished product."
+msgstr ""
+
#. module: mrp
#: report:mrp.production.order:0
msgid "Partner Ref"
@@ -398,6 +409,22 @@ msgstr ""
msgid "Weekly Stock Value Variation"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a new property.\n"
+" </p><p>\n"
+" The Properties in OpenERP are used to select the right bill of\n"
+" materials for manufacturing a product when you have different\n"
+" ways of building the same product. You can assign several\n"
+" properties to each bill of materials. When a salesperson\n"
+" creates a sales order, they can relate it to several properties\n"
+" and OpenERP will automatically select the BoM to use according\n"
+" the needs.\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: mrp
#: view:mrp.production:0
#: field:mrp.production,date_planned:0
@@ -406,7 +433,7 @@ msgid "Scheduled Date"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:113
+#: code:addons/mrp/procurement.py:124
#, python-format
msgid "Manufacturing Order <em>%s</em> created."
msgstr ""
@@ -417,12 +444,6 @@ msgstr ""
msgid "Bill Of Material"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:1068
-#, python-format
-msgid "Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>."
-msgstr ""
-
#. module: mrp
#: help:mrp.routing,location_id:0
msgid "Keep empty if you produce at the location where the finished products are needed.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations."
@@ -438,12 +459,6 @@ msgstr ""
msgid "Bill of Materials Structure"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:1043
-#, python-format
-msgid "Manufacturing order has been <b>canceled</b>."
-msgstr ""
-
#. module: mrp
#: model:process.node,note:mrp.process_node_serviceproduct0
msgid "Product type is service"
@@ -565,12 +580,6 @@ msgstr ""
msgid "If the active field is set to False, it will allow you to hide the routing without removing it."
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:386
-#, python-format
-msgid "Bill of Material has been <b>created</b> for <em>%s</em> product."
-msgstr ""
-
#. module: mrp
#: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
msgid "Material Routing"
@@ -591,7 +600,7 @@ msgid "Work Center Load"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:44
+#: code:addons/mrp/procurement.py:50
#, python-format
msgid "No BoM defined for this product !"
msgstr ""
@@ -655,12 +664,6 @@ msgstr ""
msgid "Master Bill of Materials"
msgstr ""
-#. module: mrp
-#: view:mrp.production:0
-#: report:mrp.production.order:0
-msgid "Work Orders"
-msgstr ""
-
#. module: mrp
#: help:mrp.config.settings,module_product_manufacturer:0
msgid "This allows you to define the following for a product:\n"
@@ -683,24 +686,6 @@ msgstr ""
msgid "Type"
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a group of properties.\n"
-" </p><p>\n"
-" Define specific property groups that can be assigned to your\n"
-" bill of materials and sales orders. Properties allows OpenERP\n"
-" to automatically select the right bill of materials according\n"
-" to properties selected in the sale order by salesperson.\n"
-" </p><p>\n"
-" For instance, in the property group \"Warranty\", you an have\n"
-" two properties: 1 year warranty, 3 years warranty. Depending\n"
-" on the propoerties selected in the sale order, OpenERP will\n"
-" schedule a production using the matching bill of materials.\n"
-" </p>\n"
-" "
-msgstr ""
-
#. module: mrp
#: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -740,8 +725,8 @@ msgid "A factor of 0.9 means a loss of 10% within the production process."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:756
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:737
+#: code:addons/mrp/mrp.py:765
#, python-format
msgid "Warning!"
msgstr ""
@@ -799,7 +784,7 @@ msgid "Manufacturing Orders which are waiting for raw materials."
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
@@ -808,6 +793,7 @@ msgstr ""
#: model:ir.model,name:mrp.model_mrp_production
#: view:mrp.config.settings:0
#: view:mrp.production:0
+#: field:mrp.production.workcenter.line,production_id:0
#: field:procurement.order,production_id:0
msgid "Manufacturing Order"
msgstr ""
@@ -868,7 +854,7 @@ msgid "BoM Type"
msgstr ""
#. module: mrp
-#: code:addons/mrp/procurement.py:46
+#: code:addons/mrp/procurement.py:52
#, python-format
msgid "Procurement '%s' has an exception: 'No BoM defined for this product !'"
msgstr ""
@@ -889,7 +875,7 @@ msgid "Companies"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:649
+#: code:addons/mrp/mrp.py:634
#, python-format
msgid "You must first cancel related internal picking attached to this manufacturing order."
msgstr ""
@@ -1192,7 +1178,7 @@ msgid "Routing indicates all the Work Centers used, for how long and/or cycles.I
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1230,7 +1216,7 @@ msgid "Bill of Materials allow you to define the list of required raw materials
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:374
+#: code:addons/mrp/mrp.py:375
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -1268,22 +1254,6 @@ msgstr ""
msgid "In case the Supply method of the product is Buy, the system creates a purchase order."
msgstr ""
-#. module: mrp
-#: model:ir.actions.act_window,help:mrp.mrp_property_action
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a new property.\n"
-" </p><p>\n"
-" The Properties in OpenERP are used to select the right bill of\n"
-" materials for manufacturing a product when you have different\n"
-" ways of building the same product. You can assign several\n"
-" properties to each bill of materials. When a salesperson\n"
-" creates a sale order, they can relate it to several properties\n"
-" and OpenERP will automatically select the BoM to use according\n"
-" the needs.\n"
-" </p>\n"
-" "
-msgstr ""
-
#. module: mrp
#: model:ir.model,name:mrp.model_procurement_order
msgid "Procurement"
@@ -1353,12 +1323,6 @@ msgstr ""
msgid "Pending"
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:1053
-#, python-format
-msgid "Manufacturing order is <b>in production</b>."
-msgstr ""
-
#. module: mrp
#: field:mrp.bom,active:0
#: field:mrp.routing,active:0
@@ -1392,12 +1356,6 @@ msgstr ""
msgid "Reference of the document that generated this production order request."
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:1058
-#, python-format
-msgid "Manufacturing order has been <b>done</b>."
-msgstr ""
-
#. module: mrp
#: model:process.transition,name:mrp.process_transition_minimumstockprocure0
msgid "'Minimum stock rule' material"
@@ -1418,12 +1376,6 @@ msgstr ""
msgid "Drives the procurement orders for raw material."
msgstr ""
-#. module: mrp
-#: code:addons/mrp/mrp.py:1048
-#, python-format
-msgid "Manufacturing order is <b>ready to produce</b>."
-msgstr ""
-
#. module: mrp
#: field:mrp.production.product.line,product_uos_qty:0
msgid "Product UOS Quantity"
@@ -1440,7 +1392,7 @@ msgid "SO Number"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:521
+#: code:addons/mrp/mrp.py:505
#, python-format
msgid "Cannot delete a manufacturing order in state '%s'."
msgstr ""
@@ -1487,6 +1439,24 @@ msgstr ""
msgid "Work Center"
msgstr ""
+#. module: mrp
+#: model:ir.actions.act_window,help:mrp.mrp_property_group_action
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a group of properties.\n"
+" </p><p>\n"
+" Define specific property groups that can be assigned to your\n"
+" bill of materials and sales orders. Properties allows OpenERP\n"
+" to automatically select the right bill of materials according\n"
+" to properties selected in the sales order by salesperson.\n"
+" </p><p>\n"
+" For instance, in the property group \"Warranty\", you an have\n"
+" two properties: 1 year warranty, 3 years warranty. Depending\n"
+" on the propoerties selected in the sales order, OpenERP will\n"
+" schedule a production using the matching bill of materials.\n"
+" </p>\n"
+" "
+msgstr ""
+
#. module: mrp
#: field:mrp.workcenter,capacity_per_cycle:0
msgid "Capacity per Cycle"
@@ -1616,18 +1586,6 @@ msgstr ""
msgid "Manager"
msgstr ""
-#. module: mrp
-#: view:mrp.bom:0
-msgid "When processing a sale order for this product, the delivery order\n"
-" will contain the raw materials, instead of the finished product."
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:1039
-#, python-format
-msgid "Manufacturing order has been <b>created</b>."
-msgstr ""
-
#. module: mrp
#: help:mrp.product.produce,mode:0
msgid "'Consume only' mode will only consume the products with the quantity selected.\n"
@@ -1635,8 +1593,9 @@ msgid "'Consume only' mode will only consume the products with the quantity sele
msgstr ""
#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
-msgid "Orders Planning"
+#: view:mrp.production:0
+#: report:mrp.production.order:0
+msgid "Work Orders"
msgstr ""
#. module: mrp
@@ -1667,7 +1626,7 @@ msgid "This allows to add state, date_start,date_stop in production order operat
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:756
+#: code:addons/mrp/mrp.py:737
#, python-format
msgid "You are going to consume total %s quantities of \"%s\".\n"
"But you can only consume up to total %s quantities."
@@ -1700,7 +1659,6 @@ msgstr ""
#. module: mrp
#: model:ir.actions.report.xml,name:mrp.report_mrp_production_report
#: field:mrp.production.product.line,production_id:0
-#: field:mrp.production.workcenter.line,production_id:0
#: model:process.node,name:mrp.process_node_production0
#: model:process.node,name:mrp.process_node_productionorder0
msgid "Production Order"
@@ -1724,7 +1682,7 @@ msgid "Compute Data"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
#: code:addons/mrp/wizard/change_production_qty.py:83
#: code:addons/mrp/wizard/change_production_qty.py:88
#, python-format
@@ -1770,7 +1728,7 @@ msgid "Manufacturing Lead Time"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:284
+#: code:addons/mrp/mrp.py:285
#, python-format
msgid "Warning"
msgstr ""
@@ -2000,17 +1958,7 @@ msgid "BOM Ref"
msgstr ""
#. module: mrp
-#: field:mrp.bom,message_comment_ids:0
-#: help:mrp.bom,message_comment_ids:0
-#: field:mrp.production,message_comment_ids:0
-#: help:mrp.production,message_comment_ids:0
-#: field:mrp.production.workcenter.line,message_comment_ids:0
-#: help:mrp.production.workcenter.line,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
-#. module: mrp
-#: code:addons/mrp/mrp.py:784
+#: code:addons/mrp/mrp.py:765
#, python-format
msgid "You are going to produce total %s quantities of \"%s\".\n"
"But you can only produce up to total %s quantities."
@@ -2047,7 +1995,7 @@ msgid "Bill of Materials"
msgstr ""
#. module: mrp
-#: code:addons/mrp/mrp.py:625
+#: code:addons/mrp/mrp.py:610
#, python-format
msgid "Cannot find a bill of material for this product."
msgstr ""
diff --git a/addons/mrp_byproduct/i18n/mrp_byproduct.pot b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
index 0afe30f88d3a8c3556ed9cf49b5f54dfc790ff9a..1f624fb081fc1eaad27bc31bac12bed039b21529 100644
--- a/addons/mrp_byproduct/i18n/mrp_byproduct.pot
+++ b/addons/mrp_byproduct/i18n/mrp_byproduct.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgid "Product Qty"
msgstr ""
#. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
#, python-format
msgid "Warning"
msgstr ""
@@ -83,7 +83,7 @@ msgid "Fixed"
msgstr ""
#. module: mrp_byproduct
-#: code:addons/mrp_byproduct/mrp_byproduct.py:62
+#: code:addons/mrp_byproduct/mrp_byproduct.py:63
#, python-format
msgid "The Product Unit of Measure you chose has a different category than in the product form."
msgstr ""
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index 408539286663c0c67eafd94282ae507154e851cb..5e97cb2b1f038b741a57f4de61c6f0d3321a141b 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgid "Work Orders"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:484
#, python-format
msgid "Operation is already finished!"
msgstr ""
@@ -39,12 +39,6 @@ msgstr ""
msgid "mrp_operations.operation.code"
msgstr ""
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:246
-#, python-format
-msgid "Work order has been <b>cancelled</b> for production order <em>%s</em>."
-msgstr ""
-
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
#: view:mrp.workorder:0
@@ -93,12 +87,6 @@ msgstr ""
msgid "Set to Draft"
msgstr ""
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:238
-#, python-format
-msgid "Work order is <b>pending</b> for production order <em>%s</em>."
-msgstr ""
-
#. module: mrp_operations
#: field:mrp.production,allow_reorder:0
msgid "Free Serialisation"
@@ -146,11 +134,11 @@ msgid "The work orders are created on the basis of the production order."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
-#: code:addons/mrp_operations/mrp_operations.py:508
-#: code:addons/mrp_operations/mrp_operations.py:512
-#: code:addons/mrp_operations/mrp_operations.py:524
-#: code:addons/mrp_operations/mrp_operations.py:527
+#: code:addons/mrp_operations/mrp_operations.py:134
+#: code:addons/mrp_operations/mrp_operations.py:465
+#: code:addons/mrp_operations/mrp_operations.py:469
+#: code:addons/mrp_operations/mrp_operations.py:481
+#: code:addons/mrp_operations/mrp_operations.py:484
#, python-format
msgid "Error!"
msgstr ""
@@ -163,7 +151,7 @@ msgid "Cancelled"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:477
#, python-format
msgid "Operation is Already Cancelled!"
msgstr ""
@@ -180,13 +168,13 @@ msgid "Stock Move"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:524
+#: code:addons/mrp_operations/mrp_operations.py:481
#, python-format
msgid "No operation to cancel."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:517
+#: code:addons/mrp_operations/mrp_operations.py:474
#, python-format
msgid "In order to Finish the operation, it must be in the Start or Resume state!"
msgstr ""
@@ -204,6 +192,11 @@ msgstr ""
msgid "Draft"
msgstr ""
+#. module: mrp_operations
+#: view:mrp.production.workcenter.line:0
+msgid "Actual Production Date"
+msgstr ""
+
#. module: mrp_operations
#: view:mrp.production.workcenter.line:0
msgid "Production Workcenter"
@@ -254,7 +247,7 @@ msgid "Product Qty"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:122
+#: code:addons/mrp_operations/mrp_operations.py:134
#, python-format
msgid "Manufacturing order cannot start in state \"%s\"!"
msgstr ""
@@ -338,12 +331,6 @@ msgstr ""
msgid "December"
msgstr ""
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:230
-#, python-format
-msgid "Work order has been <b>done</b> for production order <em>%s</em>."
-msgstr ""
-
#. module: mrp_operations
#: view:mrp.workorder:0
#: field:mrp.workorder,month:0
@@ -395,13 +382,13 @@ msgid "In Progress"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:508
+#: code:addons/mrp_operations/mrp_operations.py:465
#, python-format
msgid "In order to Pause the operation, it must be in the Start or Resume state!"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:512
+#: code:addons/mrp_operations/mrp_operations.py:469
#, python-format
msgid "In order to Resume the operation, it must be in the Pause state!"
msgstr ""
@@ -442,7 +429,7 @@ msgid "Production Operation Code"
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:504
+#: code:addons/mrp_operations/mrp_operations.py:461
#, python-format
msgid "Operation has already started! You can either Pause/Finish/Cancel the operation."
msgstr ""
@@ -530,7 +517,7 @@ msgid "Finish the operation."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
+#: code:addons/mrp_operations/mrp_operations.py:454
#, python-format
msgid "Operation is not started yet !"
msgstr ""
@@ -541,10 +528,10 @@ msgid "Information from the production order."
msgstr ""
#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:497
-#: code:addons/mrp_operations/mrp_operations.py:504
-#: code:addons/mrp_operations/mrp_operations.py:517
-#: code:addons/mrp_operations/mrp_operations.py:520
+#: code:addons/mrp_operations/mrp_operations.py:454
+#: code:addons/mrp_operations/mrp_operations.py:461
+#: code:addons/mrp_operations/mrp_operations.py:474
+#: code:addons/mrp_operations/mrp_operations.py:477
#, python-format
msgid "Sorry!"
msgstr ""
@@ -607,12 +594,6 @@ msgid "* When a work order is created it is set in 'Draft' status.\n"
"* When order is completely processed that time it is set in 'Finished' status."
msgstr ""
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:214
-#, python-format
-msgid "Work order has been <b>created</b> for production order <em>%s</em>."
-msgstr ""
-
#. module: mrp_operations
#: model:process.node,name:mrp_operations.process_node_startoperation0
msgid "Start Operation"
@@ -674,11 +655,6 @@ msgstr ""
msgid "Work Center"
msgstr ""
-#. module: mrp_operations
-#: view:mrp.production.workcenter.line:0
-msgid "Real"
-msgstr ""
-
#. module: mrp_operations
#: field:mrp.production.workcenter.line,date_planned:0
msgid "Scheduled Date"
@@ -760,12 +736,6 @@ msgstr ""
msgid "#Line Orders"
msgstr ""
-#. module: mrp_operations
-#: code:addons/mrp_operations/mrp_operations.py:222
-#, python-format
-msgid "Work order has been <b>started</b> for production order <em>%s</em>."
-msgstr ""
-
#. module: mrp_operations
#: view:mrp.production:0
msgid "Start Working"
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index eab3a8cb67abbf9a4a343c3a7407d78ee33c40a1..b54e30448b8785787ecac9e95ed8f960c2f4b886 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
-"PO-Revision-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgid "Recreate Invoice"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
#, python-format
msgid "You have to select a Partner Invoice Address in the repair form !"
msgstr ""
@@ -69,7 +69,7 @@ msgid "Unread Messages"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:435
#, python-format
msgid "No product defined on Fees!"
msgstr ""
@@ -144,9 +144,9 @@ msgid "Taxes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:385
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
#, python-format
msgid "Error!"
msgstr ""
@@ -202,9 +202,8 @@ msgid "Move"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:579
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>started</b>."
+#: report:repair.order:0
+msgid "Tax"
msgstr ""
#. module: mrp_repair
@@ -230,8 +229,8 @@ msgstr ""
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:336
-#: code:addons/mrp_repair/mrp_repair.py:350
-#: code:addons/mrp_repair/mrp_repair.py:440
+#: code:addons/mrp_repair/mrp_repair.py:349
+#: code:addons/mrp_repair/mrp_repair.py:435
#: code:addons/mrp_repair/wizard/cancel_repair.py:49
#, python-format
msgid "Warning!"
@@ -249,7 +248,7 @@ msgid "Partner"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:390
+#: code:addons/mrp_repair/mrp_repair.py:385
#, python-format
msgid "No account defined for partner \"%s\"."
msgstr ""
@@ -276,11 +275,6 @@ msgstr ""
msgid "Repairs order"
msgstr ""
-#. module: mrp_repair
-#: report:repair.order:0
-msgid "Tax"
-msgstr ""
-
#. module: mrp_repair
#: code:addons/mrp_repair/mrp_repair.py:336
#, python-format
@@ -372,12 +366,6 @@ msgstr ""
msgid "Repair Line"
msgstr ""
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:596
-#, python-format
-msgid "Repair has been <b>cancelled</b>."
-msgstr ""
-
#. module: mrp_repair
#: report:repair.order:0
msgid "N° :"
@@ -416,9 +404,9 @@ msgid "Yes"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:573
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>created</b>."
+#: view:mrp.repair.cancel:0
+#: view:mrp.repair.make_invoice:0
+msgid "or"
msgstr ""
#. module: mrp_repair
@@ -496,12 +484,6 @@ msgstr ""
msgid "Pricelist of the selected partner."
msgstr ""
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:606
-#, python-format
-msgid "Repair Order is <b>closed</b>."
-msgstr ""
-
#. module: mrp_repair
#: report:repair.order:0
msgid "Guarantee Limit"
@@ -534,12 +516,6 @@ msgstr ""
msgid "Is a Follower"
msgstr ""
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:591
-#, python-format
-msgid "Repair Order for <em>%s</em> has been <b>accepted</b>."
-msgstr ""
-
#. module: mrp_repair
#: view:mrp.repair:0
msgid "Date"
@@ -551,15 +527,13 @@ msgid "Repair Fees Line"
msgstr ""
#. module: mrp_repair
-#: field:mrp.repair,message_comment_ids:0
-#: help:mrp.repair,message_comment_ids:0
-msgid "Comments and emails"
+#: selection:mrp.repair,state:0
+msgid "Quotation"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:585
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: view:mrp.repair:0
+msgid "Confirm Repair"
msgstr ""
#. module: mrp_repair
@@ -578,8 +552,8 @@ msgid "End Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:418
-#: code:addons/mrp_repair/mrp_repair.py:447
+#: code:addons/mrp_repair/mrp_repair.py:413
+#: code:addons/mrp_repair/mrp_repair.py:442
#, python-format
msgid "No account defined for product \"%s\"."
msgstr ""
@@ -642,11 +616,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: mrp_repair
-#: selection:mrp.repair,state:0
-msgid "Quotation"
-msgstr ""
-
#. module: mrp_repair
#: field:mrp.repair.line,location_dest_id:0
msgid "Dest. Location"
@@ -732,16 +701,11 @@ msgid "Do you really want to create the invoice(s)?"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:350
+#: code:addons/mrp_repair/mrp_repair.py:349
#, python-format
msgid "Repair order is already invoiced."
msgstr ""
-#. module: mrp_repair
-#: view:mrp.repair:0
-msgid "Confirm Repair"
-msgstr ""
-
#. module: mrp_repair
#: field:mrp.repair,picking_id:0
msgid "Picking"
@@ -774,12 +738,6 @@ msgstr ""
msgid "Remove"
msgstr ""
-#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:601
-#, python-format
-msgid "Repair Order is now <b>ready</b> to repair."
-msgstr ""
-
#. module: mrp_repair
#: field:mrp.repair,partner_invoice_id:0
msgid "Invoicing Address"
@@ -811,12 +769,6 @@ msgstr ""
msgid "No Invoice"
msgstr ""
-#. module: mrp_repair
-#: view:mrp.repair.cancel:0
-#: view:mrp.repair.make_invoice:0
-msgid "or"
-msgstr ""
-
#. module: mrp_repair
#: field:mrp.repair,amount_total:0
msgid "Total"
@@ -828,7 +780,7 @@ msgid "Ready to Repair"
msgstr ""
#. module: mrp_repair
-#: code:addons/mrp_repair/mrp_repair.py:376
+#: code:addons/mrp_repair/mrp_repair.py:371
#, python-format
msgid "No partner !"
msgstr ""
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index 09738d02d1d0a8b04bf4334c0cd83b8cd56368d5..c57bab7806ca43e5f0385af03579111fe155336e 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 10:25+0000\n"
-"PO-Revision-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
index ed269310c19e80a6ddbbd21492418446560be9b1..632af8c42eff82f9a4394900be7d3ebd19b5dc09 100644
--- a/addons/note/i18n/note.pot
+++ b/addons/note/i18n/note.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -152,9 +152,9 @@ msgid "Categories"
msgstr ""
#. module: note
-#: field:note.note,message_comment_ids:0
-#: help:note.note,message_comment_ids:0
-msgid "Comments and emails"
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
msgstr ""
#. module: note
@@ -192,11 +192,6 @@ msgstr ""
msgid "Summary"
msgstr ""
-#. module: note
-#: help:note.stage,sequence:0
-msgid "Used to order the note stages"
-msgstr ""
-
#. module: note
#: field:note.note,stage_ids:0
msgid "Stages of Users"
@@ -265,9 +260,8 @@ msgid "Owner"
msgstr ""
#. module: note
-#: view:note.note:0
-#: field:note.note,stage_id:0
-msgid "Stage"
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
msgstr ""
#. module: note
diff --git a/addons/note_pad/i18n/note_pad.pot b/addons/note_pad/i18n/note_pad.pot
index 45353f3afca621f1a293c64c4fb25b54cf2a3392..aff44e14fd8d9d07c4f102117f6517f9d9bde898 100644
--- a/addons/note_pad/i18n/note_pad.pot
+++ b/addons/note_pad/i18n/note_pad.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 8ab119e7839ca271b17f4ebdc1b35be5818e672b..cf13dd09ae4a9bf6a80a557fbe3eeb9ef4a2243c 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,8 +23,10 @@ msgid "Ñ"
msgstr ""
#. module: pad
-#: model:ir.model,name:pad.model_pad_common
-msgid "pad.common"
+#. openerp-web
+#: code:addons/pad/static/src/xml/pad.xml:10
+#, python-format
+msgid "You must configure the etherpad through the menu Settings > Companies > Companies, in the configuration tab of your company."
msgstr ""
#. module: pad
@@ -38,10 +40,8 @@ msgid "Companies"
msgstr ""
#. module: pad
-#. openerp-web
-#: code:addons/pad/static/src/xml/pad.xml:10
-#, python-format
-msgid "You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company."
+#: model:ir.model,name:pad.model_pad_common
+msgid "pad.common"
msgstr ""
#. module: pad
diff --git a/addons/pad_project/i18n/pad_project.pot b/addons/pad_project/i18n/pad_project.pot
index c406ffeffe470f4df9cc91829a79bd6ef921ed0d..0d94b4c18ee5aabe08f89562e3e3b4c2cde0fd44 100644
--- a/addons/pad_project/i18n/pad_project.pot
+++ b/addons/pad_project/i18n/pad_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:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/plugin/i18n/plugin.pot b/addons/plugin/i18n/plugin.pot
index 709b96fa603c93bd67c81f564d0270b24bf67216..0442bb950dc6c5e8da8ec07dca2f429c480406f6 100644
--- a/addons/plugin/i18n/plugin.pot
+++ b/addons/plugin/i18n/plugin.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/plugin_outlook/i18n/plugin_outlook.pot b/addons/plugin_outlook/i18n/plugin_outlook.pot
index 3dc394ca61ba0cc5eff0ed17082c43420cc3e5d1..1db7d4b066b90f813d2239c438eb9d5337dc8125 100644
--- a/addons/plugin_outlook/i18n/plugin_outlook.pot
+++ b/addons/plugin_outlook/i18n/plugin_outlook.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot b/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
index f20f897bb0e91d140d07cbed97148fd79ec68a53..14d28309ff59a974f2561e63c71076bf33cb4f7a 100644
--- a/addons/plugin_thunderbird/i18n/plugin_thunderbird.pot
+++ b/addons/plugin_thunderbird/i18n/plugin_thunderbird.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-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 82d369eda212e358dd6df671887225f20f0bc298..6d18a322e77215e389589f33379c699a6500ddda 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgid "Red grapefruit"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1343
+#: code:addons/point_of_sale/point_of_sale.py:1341
#, python-format
msgid "Assign a Custom EAN"
msgstr ""
@@ -156,7 +156,7 @@ msgid "Take Money Out"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:107
+#: code:addons/point_of_sale/point_of_sale.py:105
#, python-format
msgid "not used"
msgstr ""
@@ -179,8 +179,8 @@ msgid "Reference"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1040
-#: code:addons/point_of_sale/point_of_sale.py:1056
+#: code:addons/point_of_sale/point_of_sale.py:1038
+#: code:addons/point_of_sale/point_of_sale.py:1054
#: report:pos.invoice:0
#: report:pos.lines:0
#, python-format
@@ -217,7 +217,7 @@ msgid "Help needed"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:741
+#: code:addons/point_of_sale/point_of_sale.py:739
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -310,7 +310,7 @@ msgid "Disc.(%)"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1005
+#: code:addons/point_of_sale/point_of_sale.py:1003
#, python-format
msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -412,7 +412,7 @@ msgid "Hardware Events"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:303
+#: code:addons/point_of_sale/point_of_sale.py:301
#, python-format
msgid "You should assign a Point of Sale to your session."
msgstr ""
@@ -428,14 +428,14 @@ msgid "Fanta Orange 33cl"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:422
+#: code:addons/point_of_sale/point_of_sale.py:420
#, python-format
msgid "Please set your profit and loss accounts on your payment method '%s'. This will allow OpenERP to post the difference of %.2f in your ending balance. To close this session, you can update the 'Closing Cash Control' to avoid any difference."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:317
-#: code:addons/point_of_sale/point_of_sale.py:514
+#: code:addons/point_of_sale/point_of_sale.py:315
+#: code:addons/point_of_sale/point_of_sale.py:512
#, python-format
msgid "error!"
msgstr ""
@@ -466,7 +466,7 @@ msgid "Validate & Open Session"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:101
+#: code:addons/point_of_sale/point_of_sale.py:99
#: selection:pos.session,state:0
#: selection:pos.session.opening,pos_state:0
#, python-format
@@ -588,7 +588,7 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:870
+#: code:addons/point_of_sale/point_of_sale.py:868
#, python-format
msgid "Customer Invoice"
msgstr ""
@@ -736,6 +736,11 @@ msgstr ""
msgid "Pizza"
msgstr ""
+#. module: point_of_sale
+#: view:pos.session:0
+msgid "= Theoretical Balance"
+msgstr ""
+
#. module: point_of_sale
#: code:addons/point_of_sale/wizard/pos_return.py:85
#: code:addons/point_of_sale/wizard/pos_return.py:240
@@ -938,7 +943,7 @@ msgid "User's Product"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1142
+#: code:addons/point_of_sale/point_of_sale.py:1140
#, python-format
msgid "You have to select a pricelist in the sale form !\n"
"Please set one before choosing a product."
@@ -987,7 +992,7 @@ msgstr ""
#. module: point_of_sale
#. openerp-web
-#: code:addons/point_of_sale/point_of_sale.py:520
+#: code:addons/point_of_sale/point_of_sale.py:518
#: code:addons/point_of_sale/static/src/xml/pos.xml:692
#: code:addons/point_of_sale/static/src/xml/pos.xml:747
#, python-format
@@ -1069,7 +1074,7 @@ msgstr ""
#. openerp-web
#: code:addons/point_of_sale/static/src/xml/pos.xml:209
#: code:addons/point_of_sale/static/src/xml/pos.xml:295
-#: code:addons/point_of_sale/wizard/pos_payment.py:78
+#: code:addons/point_of_sale/wizard/pos_payment.py:79
#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
#: report:pos.details:0
#: view:pos.order:0
@@ -1112,8 +1117,8 @@ msgid "2L Evian"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:375
-#: code:addons/point_of_sale/point_of_sale.py:474
+#: code:addons/point_of_sale/point_of_sale.py:373
+#: code:addons/point_of_sale/point_of_sale.py:472
#: code:addons/point_of_sale/wizard/pos_session_opening.py:34
#, python-format
msgid "Start Point Of Sale"
@@ -1312,7 +1317,7 @@ msgid "Today's Closed Cashbox"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:900
+#: code:addons/point_of_sale/point_of_sale.py:898
#, python-format
msgid "Selected orders do not have the same session!"
msgstr ""
@@ -1577,7 +1582,7 @@ msgid "Timmermans Faro 37.5cl"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:412
+#: code:addons/point_of_sale/point_of_sale.py:410
#, python-format
msgid "Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it."
msgstr ""
@@ -1593,7 +1598,7 @@ msgid "Number of Transaction"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:740
+#: code:addons/point_of_sale/point_of_sale.py:738
#, python-format
msgid "There is no receivable account defined to make payment for the partner: \"%s\" (id:%d)."
msgstr ""
@@ -1762,7 +1767,7 @@ msgid "Difference"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
#, python-format
msgid "Unable to Delete !"
msgstr ""
@@ -1844,7 +1849,7 @@ msgid "User:"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:318
+#: code:addons/point_of_sale/point_of_sale.py:316
#, python-format
msgid "Unable to open the session. You have to assign a sale journal to your point of sale."
msgstr ""
@@ -1916,7 +1921,7 @@ msgid "Salespeople"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:758
+#: code:addons/point_of_sale/point_of_sale.py:756
#: code:addons/point_of_sale/wizard/pos_box_entries.py:118
#: code:addons/point_of_sale/wizard/pos_box_out.py:91
#, python-format
@@ -1924,7 +1929,7 @@ msgid "You have to open at least one cashbox."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1141
+#: code:addons/point_of_sale/point_of_sale.py:1139
#, python-format
msgid "No Pricelist !"
msgstr ""
@@ -1976,7 +1981,7 @@ msgid "No Cash Register Defined !"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:515
+#: code:addons/point_of_sale/point_of_sale.py:513
#, python-format
msgid "No cash statement found for this session. Unable to record returned cash."
msgstr ""
@@ -2157,7 +2162,7 @@ msgid "Bank Statement"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:103
+#: code:addons/point_of_sale/point_of_sale.py:101
#: selection:pos.session,state:0
#: selection:pos.session.opening,pos_state:0
#, python-format
@@ -2217,7 +2222,7 @@ msgid "Golden Apples Perlim"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:102
+#: code:addons/point_of_sale/point_of_sale.py:100
#: selection:pos.session,state:0
#: selection:pos.session.opening,pos_state:0
#, python-format
@@ -2686,7 +2691,7 @@ msgid "Pos Lines"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:415
+#: code:addons/point_of_sale/point_of_sale.py:413
#, python-format
msgid "Point of Sale Profit"
msgstr ""
@@ -2730,11 +2735,6 @@ msgstr ""
msgid "Paid:"
msgstr ""
-#. module: point_of_sale
-#: view:pos.session:0
-msgid "= Theorical Balance"
-msgstr ""
-
#. module: point_of_sale
#: report:account.statement:0
msgid "Statement Name"
@@ -3011,17 +3011,17 @@ msgid "Boni Oranges"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:302
-#: 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: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/point_of_sale.py:300
+#: code:addons/point_of_sale/point_of_sale.py:409
+#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:457
+#: code:addons/point_of_sale/point_of_sale.py:712
+#: code:addons/point_of_sale/point_of_sale.py:756
+#: code:addons/point_of_sale/point_of_sale.py:818
+#: code:addons/point_of_sale/point_of_sale.py:898
+#: code:addons/point_of_sale/point_of_sale.py:1003
#: 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.py:23
#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
#: code:addons/point_of_sale/wizard/pos_box_entries.py:118
#: code:addons/point_of_sale/wizard/pos_box_entries.py:123
@@ -3113,13 +3113,13 @@ msgid "Chaudfontaine 1.5l"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:1068
+#: code:addons/point_of_sale/point_of_sale.py:1066
#, python-format
msgid "Trade Receivables"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:531
+#: code:addons/point_of_sale/point_of_sale.py:529
#, python-format
msgid "In order to delete a sale, it must be new or cancelled."
msgstr ""
@@ -3152,7 +3152,7 @@ msgid "Journal Entry"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:738
+#: code:addons/point_of_sale/point_of_sale.py:736
#, python-format
msgid "There is no receivable account defined to make payment."
msgstr ""
@@ -3183,7 +3183,7 @@ msgid "Supplier Invoice"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:460
+#: code:addons/point_of_sale/point_of_sale.py:458
#, python-format
msgid "You cannot confirm all orders of this session, because they have not the 'paid' status"
msgstr ""
@@ -3260,7 +3260,7 @@ msgid "Coca-Cola Regular 1L"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:714
+#: code:addons/point_of_sale/point_of_sale.py:712
#, python-format
msgid "Unable to cancel the picking."
msgstr ""
@@ -3301,7 +3301,7 @@ msgid "Spa Barisart 1.5l"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:791
+#: code:addons/point_of_sale/point_of_sale.py:789
#: view:pos.order:0
#, python-format
msgid "Return Products"
@@ -3414,7 +3414,7 @@ msgid "Default Point of Sale"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/wizard/pos_box.py:23
+#: code:addons/point_of_sale/wizard/pos_box.py:24
#, python-format
msgid "There is no cash register for this PoS Session"
msgstr ""
@@ -3458,7 +3458,7 @@ msgid "PRO-FORMA"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:820
+#: code:addons/point_of_sale/point_of_sale.py:818
#, python-format
msgid "Please provide a partner for the sale."
msgstr ""
@@ -3510,7 +3510,7 @@ msgid "Print Receipt"
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:419
+#: code:addons/point_of_sale/point_of_sale.py:417
#, python-format
msgid "Point of Sale Loss"
msgstr ""
@@ -3860,7 +3860,7 @@ msgid "Sorry, we could not create a session for this user."
msgstr ""
#. module: point_of_sale
-#: code:addons/point_of_sale/point_of_sale.py:100
+#: code:addons/point_of_sale/point_of_sale.py:98
#: selection:pos.session,state:0
#: selection:pos.session.opening,pos_state:0
#, python-format
diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot
index dd25f7beb859d6a0c84b703b93bae258a94d1ab2..3b4128dbc9182c6c77bcf528ca5046bbc0d5316d 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -34,14 +34,13 @@ msgid "Select which contacts should belong to the portal in the list below.\n"
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/share_wizard.py:54
-#, python-format
-msgid "Please select at least one group to share with"
+#: model:mail.group,name:portal.company_jobs
+msgid "Company Jobs"
msgstr ""
#. module: portal
-#: model:ir.ui.menu,name:portal.company_news_feed_ir_ui_menu
-msgid "Company's news"
+#: view:portal.payment.acquirer:0
+msgid "amount: the total amount to pay, as a float"
msgstr ""
#. module: portal
@@ -70,6 +69,12 @@ msgstr ""
msgid "Non-Portal Groups"
msgstr ""
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:54
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr ""
+
#. module: portal
#: view:share.wizard:0
msgid "Details"
@@ -109,8 +114,9 @@ msgid "<p>\n"
msgstr ""
#. module: portal
-#: view:portal.wizard:0
-msgid "or"
+#: code:addons/portal/wizard/portal_wizard.py:194
+#, python-format
+msgid "You must have an email address in your User Preferences to send emails."
msgstr ""
#. module: portal
@@ -125,11 +131,17 @@ msgid "Users"
msgstr ""
#. module: portal
-#: code:addons/portal/acquirer.py:74
+#: code:addons/portal/acquirer.py:82
#, python-format
msgid "Pay safely online"
msgstr ""
+#. module: portal
+#: code:addons/portal/acquirer.py:77
+#, python-format
+msgid "No online payment acquirers configured"
+msgstr ""
+
#. module: portal
#: view:portal.payment.acquirer:0
msgid "kind: the kind of document on which the payment form is rendered (translated to user language, e.g. \"Invoice\")"
@@ -155,8 +167,9 @@ msgid "<p>\n"
msgstr ""
#. module: portal
-#: model:ir.ui.menu,name:portal.company_jobs_ir_ui_menu
-msgid "Company's jobs"
+#: view:portal.payment.acquirer:0
+msgid ", so it may use Mako expressions.\n"
+" The Mako evaluation context provides:"
msgstr ""
#. module: portal
@@ -174,8 +187,8 @@ msgid "Your OpenERP account at %(company)s"
msgstr ""
#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "cr: the current database cursor"
+#: model:res.groups,name:portal.group_anonymous
+msgid "Anonymous"
msgstr ""
#. module: portal
@@ -228,12 +241,6 @@ msgstr ""
msgid "Wizard"
msgstr ""
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid ", so it may use Mako expressions.\n"
-" The Mako evaluation context provides:"
-msgstr ""
-
#. module: portal
#: field:portal.payment.acquirer,name:0
msgid "Name"
@@ -254,11 +261,6 @@ msgstr ""
msgid "quote(): a method to quote special string character to make them suitable for inclusion in a URL"
msgstr ""
-#. module: portal
-#: view:portal.payment.acquirer:0
-msgid "amount: the total amount to pay, as a float"
-msgstr ""
-
#. module: portal
#: help:res.groups,is_portal:0
msgid "If checked, this group is usable as a portal."
@@ -280,7 +282,7 @@ msgid "Outgoing Mails"
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:194
+#: code:addons/portal/wizard/portal_wizard.py:193
#, python-format
msgid "Email required"
msgstr ""
@@ -291,9 +293,9 @@ msgid "Messaging"
msgstr ""
#. module: portal
-#: code:addons/portal/wizard/portal_wizard.py:195
-#, python-format
-msgid "You must have an email address in your User Preferences to send emails."
+#: model:res.groups,comment:portal.group_anonymous
+msgid "Anonymous users have specific access rights (such as record rules and restricted menus).\n"
+" They usually do not belong to the usual OpenERP groups."
msgstr ""
#. module: portal
@@ -301,9 +303,20 @@ msgstr ""
msgid "Online Payment Acquirer"
msgstr ""
+#. module: portal
+#: model:mail.group,name:portal.company_news_feed
+msgid "Company News"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/acquirer.py:76
+#, python-format
+msgid "You can finish the configuration in the <a href=\"%s\">Bank&Cash settings</a>"
+msgstr ""
+
#. module: portal
#: view:portal.payment.acquirer:0
-msgid "object: the document on which the payment form is rendered (usually an invoice or sale order record)"
+msgid "cr: the current database cursor"
msgstr ""
#. module: portal
@@ -318,6 +331,11 @@ msgid "<p>\n"
" "
msgstr ""
+#. module: portal
+#: view:portal.payment.acquirer:0
+msgid "object: the document on which the payment form is rendered (usually an invoice or sales order record)"
+msgstr ""
+
#. module: portal
#: help:portal.wizard,welcome_message:0
msgid "This text is included in the email sent to new users of the portal."
@@ -360,6 +378,11 @@ msgid "Dear %(name)s,\n"
""
msgstr ""
+#. module: portal
+#: view:portal.wizard:0
+msgid "or"
+msgstr ""
+
#. module: portal
#: model:portal.payment.acquirer,form_template:portal.paypal_acquirer
msgid "\n"
@@ -419,7 +442,7 @@ msgid "This is an HTML form template to submit a payment through this acquirer.\
msgstr ""
#. module: portal
-#: code:addons/portal/mail_mail.py:40
+#: code:addons/portal/mail_mail.py:42
#, python-format
msgid "Access your personal documents through <a href=\"%s\">our Customer Portal</a>"
msgstr ""
diff --git a/addons/portal_anonymous/i18n/portal_anonymous.pot b/addons/portal_anonymous/i18n/portal_anonymous.pot
new file mode 100644
index 0000000000000000000000000000000000000000..ee07a910113e7219414b26d8d82ed003539b6a8a
--- /dev/null
+++ b/addons/portal_anonymous/i18n/portal_anonymous.pot
@@ -0,0 +1,24 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * portal_anonymous
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: portal_anonymous
+#. openerp-web
+#: code:addons/portal_anonymous/static/src/xml/portal_anonymous.xml:8
+#, python-format
+msgid "Login"
+msgstr ""
+
diff --git a/addons/portal_claim/i18n/portal_claim.pot b/addons/portal_claim/i18n/portal_claim.pot
index 2ead5301f178bbb0c640e674e0a21ee3ef4e757d..860c2749ed6649cd5de5f11ed8447806134e2bb6 100644
--- a/addons/portal_claim/i18n/portal_claim.pot
+++ b/addons/portal_claim/i18n/portal_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:53+0000\n"
-"PO-Revision-Date: 2012-11-24 02:53+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/portal_crm/i18n/portal_crm.pot b/addons/portal_crm/i18n/portal_crm.pot
index aea7b1f9de97922752c7d244e3cbe4e60e5c821c..d4641024ab5348b47697e6df083b9b662d2937fd 100644
--- a/addons/portal_crm/i18n/portal_crm.pot
+++ b/addons/portal_crm/i18n/portal_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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -407,12 +407,6 @@ msgstr ""
msgid "Days to Close"
msgstr ""
-#. module: portal_crm
-#: field:portal_crm.crm_contact_us,message_comment_ids:0
-#: help:portal_crm.crm_contact_us,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: portal_crm
#: field:portal_crm.crm_contact_us,company_ids:0
msgid "Companies"
diff --git a/addons/portal_event/i18n/portal_event.pot b/addons/portal_event/i18n/portal_event.pot
index df360788cb1af24986f4dd91791edaa5f6b2cbd0..75c84cf6bf441103fbf8a7b900fe68ec97b13dab 100644
--- a/addons/portal_event/i18n/portal_event.pot
+++ b/addons/portal_event/i18n/portal_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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/portal_hr_employees/i18n/portal_hr_employees.pot b/addons/portal_hr_employees/i18n/portal_hr_employees.pot
index 44f3197f07c7861c691d4e700ba89d5c8757e228..adba430f460036af2a7da3aaf6a210c4ccf1ba89 100644
--- a/addons/portal_hr_employees/i18n/portal_hr_employees.pot
+++ b/addons/portal_hr_employees/i18n/portal_hr_employees.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
#. module: portal_hr_employees
#: model:ir.actions.act_window,name:portal_hr_employees.action_team
#: view:portal_crm.crm_contact_us:0
-msgid "Meet the team"
+msgid "Our Team"
msgstr ""
#. module: portal_hr_employees
@@ -31,11 +31,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: portal_hr_employees
-#: field:hr.employee,public_info:0
-msgid "unknown"
-msgstr ""
-
#. module: portal_hr_employees
#: view:hr.employee:0
msgid "Company"
@@ -76,6 +71,11 @@ msgstr ""
msgid "Visibility"
msgstr ""
+#. module: portal_hr_employees
+#: field:hr.employee,public_info:0
+msgid "Public Info"
+msgstr ""
+
#. module: portal_hr_employees
#: model:ir.model,name:portal_hr_employees.model_portal_crm_crm_contact_us
msgid "Contact form for the portal"
diff --git a/addons/portal_project/i18n/portal_project.pot b/addons/portal_project/i18n/portal_project.pot
index 262aad849f04b3ca314bed67b24950d47f344708..91a6606ef2f2f47207bb3107b4de25a83a4c9bc0 100644
--- a/addons/portal_project/i18n/portal_project.pot
+++ b/addons/portal_project/i18n/portal_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-12-03 10:25+0000\n"
-"PO-Revision-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2012-12-21 17:05+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/portal_project_issue/i18n/portal_project_issue.pot b/addons/portal_project_issue/i18n/portal_project_issue.pot
index 02858726d45d5701e4c7d7bbe2583c36f950414f..1e63d7c1714c6317a66cbb5c97b1821bd0f123de 100644
--- a/addons/portal_project_issue/i18n/portal_project_issue.pot
+++ b/addons/portal_project_issue/i18n/portal_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-12-03 10:25+0000\n"
-"PO-Revision-Date: 2012-12-03 10:25+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/portal_sale/i18n/portal_sale.pot b/addons/portal_sale/i18n/portal_sale.pot
index b622424f1c1a663df4504a26cb8afe522506c172..520a78fa82d232656886bab98a42a74d9f1172d0 100644
--- a/addons/portal_sale/i18n/portal_sale.pot
+++ b/addons/portal_sale/i18n/portal_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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgid "We haven't sent you any invoice."
msgstr ""
#. module: portal_sale
-#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
-msgid "We haven't sent you any sale order."
+#: model:email.template,report_name:portal_sale.email_template_edi_sale
+msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
msgstr ""
#. module: portal_sale
@@ -56,65 +56,61 @@ msgid "Sales Orders"
msgstr ""
#. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_invoice
+#: model:res.groups,comment:portal_sale.group_payment_options
+msgid "Members of this group see the online payment options\n"
+"on Sale Orders and Customer Invoices. These options are meant for customers who are accessing\n"
+"their documents through the portal."
+msgstr ""
+
+#. module: portal_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_sale
msgid "\n"
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>\n"
-"\n"
-" <p>A new invoice is available for you: </p>\n"
+" <p>Hello ${object.partner_id.name},</p>\n"
" \n"
+" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
" <strong>REFERENCES</strong><br />\n"
-" Invoice number: <strong>${object.number}</strong><br />\n"
-" Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
-" Invoice date: ${object.date_invoice}<br />\n"
+" Order number: <strong>${object.name}</strong><br />\n"
+" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
+" Order date: ${object.date_order}<br />\n"
" % if object.origin:\n"
" Order reference: ${object.origin}<br />\n"
" % endif\n"
+" % if object.client_order_ref:\n"
+" Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
" % if object.user_id:\n"
-" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
" % endif\n"
-" </p> \n"
+" </p>\n"
"\n"
-" <%\n"
-" action = 'portal_sale.portal_action_invoices'\n"
-" object.partner_id.signup_prepare()\n"
-" signup_url = object.partner_id._get_signup_url_for_action(action=action,view_type='form',res_id=object.id)[object.partner_id.id]\n"
-" %>\n"
+" <% set signup_url = object.get_signup_url() %>\n"
" % if signup_url:\n"
" <p>\n"
-" You can access the invoice document and pay online via our Customer Portal:\n"
+" You can access this document and pay online via our Customer Portal:\n"
" </p>\n"
" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"${signup_url}\">View Invoice</a>\n"
+" href=\"${signup_url}\">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>\n"
" % endif\n"
-" \n"
-" % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):\n"
-" <% \n"
-" comp_name = quote(object.company_id.name)\n"
-" inv_number = quote(object.number)\n"
-" paypal_account = quote(object.company_id.paypal_account)\n"
-" inv_amount = quote(str(object.residual))\n"
-" cur_name = quote(object.currency_id.name)\n"
-" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&\" \\\n"
-" \"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
-" (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)\n"
-" %>\n"
+"\n"
+" % if object.paypal_url:\n"
" <br/>\n"
" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
" </a>\n"
" % endif\n"
-" \n"
+"\n"
" <br/>\n"
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
" <br/>\n"
" <br/>\n"
" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
" </div>\n"
" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
@@ -141,20 +137,13 @@ msgid "\n"
" <div>\n"
" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
-" %endif\n"
+" % endif\n"
" <p></p>\n"
" </div>\n"
"</div>\n"
" "
msgstr ""
-#. module: portal_sale
-#: model:res.groups,comment:portal_sale.group_payment_options
-msgid "Members of this group see the online payment options\n"
-"on Sale Orders and Customer Invoices. These options are meant for customers who are accessing\n"
-"their documents through the portal."
-msgstr ""
-
#. module: portal_sale
#: model:email.template,report_name:portal_sale.email_template_edi_invoice
msgid "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
@@ -204,69 +193,51 @@ msgid "Configure payment acquiring methods"
msgstr ""
#. module: portal_sale
-#: model:email.template,body_html:portal_sale.email_template_edi_sale
+#: model:email.template,body_html:portal_sale.email_template_edi_invoice
msgid "\n"
"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>\n"
-" \n"
-" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
+" <p>Hello ${object.partner_id.name},</p>\n"
"\n"
+" <p>A new invoice is available for you: </p>\n"
+" \n"
" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
" <strong>REFERENCES</strong><br />\n"
-" Order number: <strong>${object.name}</strong><br />\n"
-" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" Order date: ${object.date_order}<br />\n"
+" Invoice number: <strong>${object.number}</strong><br />\n"
+" Invoice total: <strong>${object.amount_total} ${object.currency_id.name}</strong><br />\n"
+" Invoice date: ${object.date_invoice}<br />\n"
" % if object.origin:\n"
" Order reference: ${object.origin}<br />\n"
" % endif\n"
-" % if object.client_order_ref:\n"
-" Your reference: ${object.client_order_ref}<br />\n"
-" % endif\n"
" % if object.user_id:\n"
-" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
" % endif\n"
-" </p>\n"
+" </p> \n"
"\n"
-" <%\n"
-" action = 'portal_sale.action_quotations_portal' if object.state in ('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
-" object.partner_id.signup_prepare()\n"
-" signup_url = object.partner_id._get_signup_url_for_action(action=action,view_type='form',res_id=object.id)[object.partner_id.id]\n"
-" %>\n"
+" <% set signup_url = object.get_signup_url() %>\n"
" % if signup_url:\n"
" <p>\n"
-" You can access this document and pay online via our Customer Portal:\n"
+" You can access the invoice document and pay online via our Customer Portal:\n"
" </p>\n"
" <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
-" href=\"${signup_url}\">View ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'}</a>\n"
+" href=\"${signup_url}\">View Invoice</a>\n"
" % endif\n"
-"\n"
-" % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state != 'draft':\n"
-" <%\n"
-" comp_name = quote(object.company_id.name)\n"
-" order_name = quote(object.name)\n"
-" paypal_account = quote(object.company_id.paypal_account)\n"
-" order_amount = quote(str(object.residual))\n"
-" cur_name = quote(object.pricelist_id.currency_id.name)\n"
-" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s\" \\\n"
-" \"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1\" \\\n"
-" \"&bn=OpenERP_Order_PayNow_%s\" % \\\n"
-" (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)\n"
-" %>\n"
+" \n"
+" % if object.paypal_url:\n"
" <br/>\n"
" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
" </a>\n"
" % endif\n"
-"\n"
+" \n"
" <br/>\n"
" <p>If you have any question, do not hesitate to contact us.</p>\n"
" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
" <br/>\n"
" <br/>\n"
" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
" </div>\n"
" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
@@ -293,13 +264,18 @@ msgid "\n"
" <div>\n"
" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
" </div>\n"
-" %endif\n"
+" % endif\n"
" <p></p>\n"
" </div>\n"
"</div>\n"
" "
msgstr ""
+#. module: portal_sale
+#: model:ir.actions.act_window,help:portal_sale.action_orders_portal
+msgid "We haven't sent you any sales order."
+msgstr ""
+
#. module: portal_sale
#: model:ir.model,name:portal_sale.model_account_invoice
msgid "Invoice"
@@ -310,8 +286,3 @@ msgstr ""
msgid "Sale Orders"
msgstr ""
-#. module: portal_sale
-#: model:email.template,report_name:portal_sale.email_template_edi_sale
-msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
-msgstr ""
-
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index 9b504510d8101662d7e6abf1cef65a176ef81439..3bf64e304589e6af39e282b79725922bf8af8e38 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index 6bda6378b92457a4f97e7404881fb4c1d0281c13..d0f09af121bff572530f4728ee73768b009cc5b0 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -40,12 +40,6 @@ msgstr ""
msgid "Draft procurement of the product and location of that orderpoint"
msgstr ""
-#. module: procurement
-#: code:addons/procurement/procurement.py:290
-#, python-format
-msgid "No supplier defined for this product !"
-msgstr ""
-
#. module: procurement
#: view:product.product:0
msgid "required quantities are always\n"
@@ -71,9 +65,8 @@ msgid "Manufacture"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:307
-#, python-format
-msgid "No address defined for the supplier"
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
msgstr ""
#. module: procurement
@@ -99,7 +92,6 @@ msgstr ""
#. module: procurement
#: view:procurement.order:0
-#: field:procurement.order,name:0
msgid "Reason"
msgstr ""
@@ -128,11 +120,6 @@ msgstr ""
msgid "Latest procurement"
msgstr ""
-#. module: procurement
-#: view:procurement.order:0
-msgid "Notes"
-msgstr ""
-
#. module: procurement
#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
msgid "You can define your minimum stock rules, so that OpenERP will automatically create draft manufacturing orders or purchase quotations according to the stock level. Once the virtual stock of a product (= stock on hand minus all confirmed orders and reservations) is below the minimum quantity, OpenERP will generate a procurement request to increase the stock up to the maximum quantity."
@@ -158,6 +145,11 @@ msgstr ""
msgid "Cancelled"
msgstr ""
+#. module: procurement
+#: view:procurement.order:0
+msgid "Permanent Procurement Exceptions"
+msgstr ""
+
#. module: procurement
#: help:procurement.order,message_unread:0
msgid "If checked new messages require your attention."
@@ -174,8 +166,8 @@ msgid "Stock Move"
msgstr ""
#. module: procurement
-#: model:ir.model,name:procurement.model_procurement_order_compute_all
-msgid "Compute all schedulers"
+#: view:product.product:0
+msgid "Stockable products"
msgstr ""
#. module: procurement
@@ -207,11 +199,6 @@ msgid "<p>\n"
" "
msgstr ""
-#. module: procurement
-#: view:product.product:0
-msgid "Stockable products"
-msgstr ""
-
#. module: procurement
#: selection:procurement.order,state:0
msgid "Confirmed"
@@ -222,12 +209,6 @@ msgstr ""
msgid "Retry"
msgstr ""
-#. module: procurement
-#: code:addons/procurement/procurement.py:498
-#, python-format
-msgid "Procurement <b>confirmed</b>."
-msgstr ""
-
#. module: procurement
#: view:procurement.order.compute:0
#: view:procurement.orderpoint.compute:0
@@ -261,7 +242,7 @@ msgid "Minimum Inventory Rule"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:395
+#: code:addons/procurement/procurement.py:369
#, python-format
msgid "Procurement '%s' is in exception: "
msgstr ""
@@ -277,8 +258,8 @@ msgid "Reordering Rules Search"
msgstr ""
#. module: procurement
-#: field:procurement.order,message_summary:0
-msgid "Summary"
+#: selection:procurement.order,state:0
+msgid "Waiting"
msgstr ""
#. module: procurement
@@ -348,7 +329,7 @@ msgid "Quantity"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:390
+#: code:addons/procurement/procurement.py:364
#, python-format
msgid "Not enough stock and no minimum orderpoint rule defined."
msgstr ""
@@ -365,12 +346,6 @@ msgstr ""
msgid "Make to Stock"
msgstr ""
-#. module: procurement
-#: code:addons/procurement/procurement.py:501
-#, python-format
-msgid "Procurement <b>cancelled</b>."
-msgstr ""
-
#. module: procurement
#: model:ir.actions.act_window,help:procurement.procurement_action
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -447,11 +422,6 @@ msgstr ""
msgid "Compute Stock"
msgstr ""
-#. module: procurement
-#: model:process.process,name:procurement.process_process_serviceproductprocess0
-msgid "Service"
-msgstr ""
-
#. module: procurement
#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
msgid "Related Procurement Orders"
@@ -581,7 +551,7 @@ msgid "Is a Follower"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:392
+#: code:addons/procurement/procurement.py:366
#, python-format
msgid "Not enough stock."
msgstr ""
@@ -597,17 +567,11 @@ msgid "Procure Products"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:336
+#: code:addons/procurement/procurement.py:311
#, python-format
msgid "Please check the quantity in procurement order(s) for the product \"%s\", it should not be 0 or less!"
msgstr ""
-#. module: procurement
-#: field:procurement.order,message_comment_ids:0
-#: help:procurement.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: procurement
#: field:procurement.order,date_planned:0
msgid "Scheduled date"
@@ -656,14 +620,8 @@ msgid "Extra Information"
msgstr ""
#. module: procurement
-#: help:procurement.order,name:0
-msgid "Procurement name."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:297
-#, python-format
-msgid "No default supplier defined for this product"
+#: field:procurement.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: procurement
@@ -698,7 +656,7 @@ msgid "Properties composition"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:335
+#: code:addons/procurement/procurement.py:310
#, python-format
msgid "Data Insufficient !"
msgstr ""
@@ -715,12 +673,6 @@ msgstr ""
msgid "Misc"
msgstr ""
-#. module: procurement
-#: code:addons/procurement/procurement.py:504
-#, python-format
-msgid "Procurement <b>done</b>."
-msgstr ""
-
#. module: procurement
#: field:stock.move,procurements:0
msgid "Procurements"
@@ -761,12 +713,9 @@ msgid "Not urgent"
msgstr ""
#. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action5
-#: model:ir.actions.act_window,name:procurement.procurement_action_board
-#: model:ir.actions.act_window,name:procurement.procurement_exceptions
-#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
-#: view:procurement.order:0
-msgid "Procurement Exceptions"
+#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
+#: view:product.product:0
+msgid "Orderpoints"
msgstr ""
#. module: procurement
@@ -775,8 +724,8 @@ msgid "When the virtual stock goes below the Min Quantity, OpenERP generates a p
msgstr ""
#. module: procurement
-#: view:procurement.order:0
-msgid "Permanent Procurement Exceptions"
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
msgstr ""
#. module: procurement
@@ -790,9 +739,12 @@ msgid "Procurements in Exception"
msgstr ""
#. module: procurement
-#: model:ir.actions.act_window,name:procurement.product_open_orderpoint
-#: view:product.product:0
-msgid "Orderpoints"
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+#: view:procurement.order:0
+msgid "Procurement Exceptions"
msgstr ""
#. module: procurement
@@ -835,6 +787,7 @@ msgstr ""
#. module: procurement
#: field:mrp.property,description:0
#: field:mrp.property.group,description:0
+#: field:procurement.order,name:0
msgid "Description"
msgstr ""
@@ -855,11 +808,6 @@ msgstr ""
msgid "Make to Order"
msgstr ""
-#. module: procurement
-#: selection:procurement.order,state:0
-msgid "Waiting"
-msgstr ""
-
#. module: procurement
#: field:product.template,supply_method:0
msgid "Supply Method"
@@ -946,11 +894,6 @@ msgstr ""
msgid "Automatic Orderpoint"
msgstr ""
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Details"
-msgstr ""
-
#. module: procurement
#: help:procurement.order,message_ids:0
msgid "Messages and communication history"
@@ -961,12 +904,6 @@ msgstr ""
msgid "Procurement started late"
msgstr ""
-#. module: procurement
-#: code:addons/procurement/procurement.py:495
-#, python-format
-msgid "Procurement <b>created</b>."
-msgstr ""
-
#. module: procurement
#: selection:mrp.property,composition:0
msgid "min"
@@ -998,7 +935,7 @@ msgid "PROC %d: on order - %3.2f %-5s - %s"
msgstr ""
#. module: procurement
-#: code:addons/procurement/procurement.py:364
+#: code:addons/procurement/procurement.py:338
#, python-format
msgid "Products reserved from stock."
msgstr ""
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 2a551953938ed73b5cfbd6b1ec2b0e6a4e999e99..9732b4a18073ab9c089089f7b61e00dba822db1e 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-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-03 16:03+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -30,11 +30,6 @@ msgstr ""
msgid "This is minimum quantity to purchase from Main Supplier."
msgstr ""
-#. module: product
-#: model:product.uom,name:product.product_uom_day
-msgid "Day"
-msgstr ""
-
#. module: product
#: model:product.template,name:product.product_product_34_product_template
msgid "Webcam"
@@ -101,8 +96,8 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:177
-#: code:addons/product/product.py:206
+#: code:addons/product/pricelist.py:179
+#: code:addons/product/product.py:208
#, python-format
msgid "Warning!"
msgstr ""
@@ -113,16 +108,11 @@ msgid "Small-sized image"
msgstr ""
#. module: product
-#: code:addons/product/product.py:174
+#: code:addons/product/product.py:176
#, python-format
msgid "Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!."
msgstr ""
-#. module: product
-#: model:product.uom,name:product.product_uom_dozen
-msgid "Dozen"
-msgstr ""
-
#. module: product
#: selection:product.template,cost_method:0
msgid "Average Price"
@@ -176,7 +166,7 @@ msgid "Product Type"
msgstr ""
#. module: product
-#: code:addons/product/product.py:410
+#: code:addons/product/product.py:412
#, python-format
msgid "Products: "
msgstr ""
@@ -252,11 +242,6 @@ msgstr ""
msgid "Category"
msgstr ""
-#. module: product
-#: model:product.uom,name:product.product_uom_litre
-msgid "Litre"
-msgstr ""
-
#. module: product
#: model:product.template,name:product.product_product_25_product_template
msgid "Laptop E5023"
@@ -469,6 +454,11 @@ msgstr ""
msgid "Headset standard"
msgstr ""
+#. module: product
+#: model:product.uom,name:product.product_uom_day
+msgid "Day(s)"
+msgstr ""
+
#. module: product
#: help:product.product,incoming_qty:0
msgid "Quantity of products that are planned to arrive.\n"
@@ -519,8 +509,8 @@ msgid "PC Assemble + Custom (PC on Demand)"
msgstr ""
#. module: product
-#: model:process.transition,note:product.process_transition_supplierofproduct0
-msgid "1 or several supplier(s) can be linked to a product. All information stands in the product form."
+#: model:product.template,description:product.product_product_27_product_template
+msgid "Custom Laptop based on customer's requirement."
msgstr ""
#. module: product
@@ -529,7 +519,7 @@ msgid "The width of the package"
msgstr ""
#. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
#, python-format
msgid "Unit of Measure categories Mismatch!"
msgstr ""
@@ -626,6 +616,7 @@ msgstr ""
#. module: product
#: field:product.supplierinfo,name:0
+#: field:product.template,seller_ids:0
msgid "Supplier"
msgstr ""
@@ -651,8 +642,8 @@ msgid "If checked new messages require your attention."
msgstr ""
#. module: product
-#: model:product.category,name:product.product_category_1
-msgid "Saleable"
+#: field:product.product,ean13:0
+msgid "EAN13 Barcode"
msgstr ""
#. module: product
@@ -724,6 +715,11 @@ msgstr ""
msgid "End Date"
msgstr ""
+#. module: product
+#: model:product.uom,name:product.product_uom_litre
+msgid "Liter(s)"
+msgstr ""
+
#. module: product
#: view:product.price_list:0
msgid "Print"
@@ -757,7 +753,6 @@ msgstr ""
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_pricelist
#: model:ir.model,name:product.model_product_pricelist
-#: field:product.product,price:0
#: field:product.product,pricelist_id:0
#: view:product.supplierinfo:0
msgid "Pricelist"
@@ -765,7 +760,7 @@ msgstr ""
#. module: product
#: model:product.uom,name:product.product_uom_hour
-msgid "Hour"
+msgid "Hour(s)"
msgstr ""
#. module: product
@@ -779,8 +774,8 @@ msgid "Partner"
msgstr ""
#. module: product
-#: model:product.template,description:product.product_product_27_product_template
-msgid "Custom Laptop based on customer's requirement."
+#: model:process.transition,note:product.process_transition_supplierofproduct0
+msgid "1 or several supplier(s) can be linked to a product. All information stands in the product form."
msgstr ""
#. module: product
@@ -845,11 +840,6 @@ msgstr ""
msgid "Total Package Weight"
msgstr ""
-#. module: product
-#: field:product.product,seller_info_id:0
-msgid "unknown"
-msgstr ""
-
#. module: product
#: help:product.packaging,code:0
msgid "The code of the transport unit."
@@ -1007,6 +997,11 @@ msgstr ""
msgid "Right Parent"
msgstr ""
+#. module: product
+#: field:product.product,price:0
+msgid "Price"
+msgstr ""
+
#. module: product
#: field:product.pricelist.item,price_surcharge:0
msgid "Price Surcharge"
@@ -1080,6 +1075,11 @@ msgstr ""
msgid "Gives the sequence order when displaying a list of product categories."
msgstr ""
+#. module: product
+#: model:product.uom,name:product.product_uom_dozen
+msgid "Dozen(s)"
+msgstr ""
+
#. module: product
#: field:product.uom,factor:0
#: field:product.uom,factor_inv:0
@@ -1152,7 +1152,7 @@ msgid "<p>\n"
msgstr ""
#. module: product
-#: code:addons/product/product.py:359
+#: code:addons/product/product.py:361
#, python-format
msgid "New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurements' tab and create a new one."
msgstr ""
@@ -1199,11 +1199,6 @@ msgstr ""
msgid "This field holds the image used as image for the product, limited to 1024x1024px."
msgstr ""
-#. module: product
-#: field:product.template,seller_ids:0
-msgid "Partners"
-msgstr ""
-
#. module: product
#: help:product.pricelist.item,categ_id:0
msgid "Specify a product category if this rule only applies to products belonging to this category or its children categories. Keep empty otherwise."
@@ -1215,7 +1210,12 @@ msgid "Inventory"
msgstr ""
#. module: product
-#: code:addons/product/product.py:736
+#: field:product.product,seller_info_id:0
+msgid "Supplier Info"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:729
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -1327,17 +1327,10 @@ msgstr ""
#. module: product
#: selection:product.ul,type:0
-#: model:product.uom,name:product.product_uom_unit
#: model:product.uom.categ,name:product.product_uom_categ_unit
msgid "Unit"
msgstr ""
-#. module: product
-#: code:addons/product/product.py:588
-#, python-format
-msgid "Product has been <b>created</b>."
-msgstr ""
-
#. module: product
#: field:product.pricelist.version,date_start:0
msgid "Start Date"
@@ -1440,8 +1433,8 @@ msgid "Pricelist Name"
msgstr ""
#. module: product
-#: field:product.product,ean13:0
-msgid "EAN13 Barcode"
+#: model:product.category,name:product.product_category_1
+msgid "Saleable"
msgstr ""
#. module: product
@@ -1663,7 +1656,7 @@ msgid "Sepcify a unit of measure here if invoicing is made in another unit of me
msgstr ""
#. module: product
-#: code:addons/product/product.py:206
+#: code:addons/product/product.py:208
#, python-format
msgid "Cannot change the category of existing Unit of Measure '%s'."
msgstr ""
@@ -1699,7 +1692,7 @@ msgid "Default Unit of Measure"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:375
+#: code:addons/product/pricelist.py:377
#, python-format
msgid "Partner section of the product form"
msgstr ""
@@ -1725,7 +1718,12 @@ msgid "Messages"
msgstr ""
#. module: product
-#: code:addons/product/product.py:174
+#: model:product.uom,name:product.product_uom_unit
+msgid "Unit(s)"
+msgstr ""
+
+#. module: product
+#: code:addons/product/product.py:176
#, python-format
msgid "Error!"
msgstr ""
@@ -2012,7 +2010,7 @@ msgid "Normal"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:177
+#: code:addons/product/pricelist.py:179
#, python-format
msgid "At least one pricelist has no active version !\n"
"Please create or activate one."
@@ -2055,12 +2053,6 @@ msgstr ""
msgid "Variable"
msgstr ""
-#. module: product
-#: field:product.product,message_comment_ids:0
-#: help:product.product,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: product
#: field:product.template,rental:0
msgid "Can be Rent"
@@ -2210,7 +2202,7 @@ msgid "15†LCD Monitor"
msgstr ""
#. module: product
-#: code:addons/product/pricelist.py:374
+#: code:addons/product/pricelist.py:376
#: field:product.pricelist.item,base_pricelist_id:0
#, python-format
msgid "Other Pricelist"
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 377a17a93a2204a07ec270fd35ba36ae831a37d7..1ce3519046b9932deb1d30cf30efe11b0a97658d 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index e0a4ea1d858d8131dec8c4b1e4b72555ac1b6a57..404d2266f622279d04dfa6fde9a827684d28a9e7 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 590d3f9763a98e3058af243c7daa32373aeb050e..1a99fe75adf7044d387af2f161e6055e0e8671ca 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,19 +41,14 @@ msgstr ""
msgid "To"
msgstr ""
-#. module: product_margin
-#: field:product.product,date_to:0
-msgid "To Date"
-msgstr ""
-
#. module: product_margin
#: help:product.product,total_margin:0
msgid "Turnover - Standard price"
msgstr ""
#. module: product_margin
-#: field:product.product,date_from:0
-msgid "From Date"
+#: field:product.product,total_margin_rate:0
+msgid "Total Margin Rate(%)"
msgstr ""
#. module: product_margin
@@ -62,6 +57,15 @@ msgstr ""
msgid "Draft, Open and Paid"
msgstr ""
+#. module: product_margin
+#: code:addons/product_margin/wizard/product_margin.py:73
+#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
+#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
+#: view:product.product:0
+#, python-format
+msgid "Product Margins"
+msgstr ""
+
#. module: product_margin
#: field:product.product,purchase_avg_price:0
#: field:product.product,sale_avg_price:0
@@ -69,8 +73,8 @@ msgid "Avg. Unit Price"
msgstr ""
#. module: product_margin
-#: model:ir.model,name:product_margin.model_product_product
-msgid "Product"
+#: field:product.product,sale_num_invoiced:0
+msgid "# Invoiced in Sale"
msgstr ""
#. module: product_margin
@@ -84,6 +88,12 @@ msgstr ""
msgid "Paid"
msgstr ""
+#. module: product_margin
+#: view:product.product:0
+#: field:product.product,sales_gap:0
+msgid "Sales Gap"
+msgstr ""
+
#. module: product_margin
#: help:product.product,sales_gap:0
msgid "Expected Sale - Turn Over"
@@ -105,14 +115,13 @@ msgid "Sum of Quantity in Supplier Invoices"
msgstr ""
#. module: product_margin
-#: help:product.product,expected_margin:0
-msgid "Expected Sale - Normal Cost"
+#: field:product.product,date_to:0
+msgid "Margin Date To"
msgstr ""
#. module: product_margin
-#: field:product.product,purchase_num_invoiced:0
-#: field:product.product,sale_num_invoiced:0
-msgid "# Invoiced"
+#: view:product.product:0
+msgid "Analysis Criteria"
msgstr ""
#. module: product_margin
@@ -147,8 +156,8 @@ msgid "Avg. Price in Customer Invoices."
msgstr ""
#. module: product_margin
-#: help:product.product,sale_expected:0
-msgid "Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+#: help:product.product,purchase_avg_price:0
+msgid "Avg. Price in Supplier Invoices "
msgstr ""
#. module: product_margin
@@ -162,15 +171,19 @@ msgstr ""
msgid "Normal Cost - Total Cost"
msgstr ""
+#. module: product_margin
+#: help:product.product,sale_expected:0
+msgid "Sum of Multiplication of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+
#. module: product_margin
#: field:product.product,total_margin:0
msgid "Total Margin"
msgstr ""
#. module: product_margin
-#: view:product.product:0
-#: field:product.product,sales_gap:0
-msgid "Sales Gap"
+#: field:product.product,date_from:0
+msgid "Margin Date From"
msgstr ""
#. module: product_margin
@@ -189,8 +202,13 @@ msgid "Purchases"
msgstr ""
#. module: product_margin
-#: help:product.product,purchase_avg_price:0
-msgid "Avg. Price in Supplier Invoices "
+#: field:product.product,purchase_num_invoiced:0
+msgid "# Invoiced in Purchase"
+msgstr ""
+
+#. module: product_margin
+#: help:product.product,expected_margin:0
+msgid "Expected Sale - Normal Cost"
msgstr ""
#. module: product_margin
@@ -204,8 +222,8 @@ msgid "Total margin * 100 / Turnover"
msgstr ""
#. module: product_margin
-#: view:product.product:0
-msgid "Analysis Criteria"
+#: view:product.margin:0
+msgid "Open Margins"
msgstr ""
#. module: product_margin
@@ -220,12 +238,8 @@ msgid "Sales"
msgstr ""
#. module: product_margin
-#: code:addons/product_margin/wizard/product_margin.py:73
-#: model:ir.actions.act_window,name:product_margin.product_margin_act_window
-#: model:ir.ui.menu,name:product_margin.menu_action_product_margin
-#: view:product.product:0
-#, python-format
-msgid "Product Margins"
+#: model:ir.model,name:product_margin.model_product_product
+msgid "Product"
msgstr ""
#. module: product_margin
@@ -238,16 +252,6 @@ msgstr ""
msgid "Purchase Gap"
msgstr ""
-#. module: product_margin
-#: field:product.product,total_margin_rate:0
-msgid "Total Margin (%)"
-msgstr ""
-
-#. module: product_margin
-#: view:product.margin:0
-msgid "Open Margins"
-msgstr ""
-
#. module: product_margin
#: view:product.margin:0
msgid "Cancel"
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index a59306280a722d9b31e4e25024e979e3e1b361b7..ee812c3cd641ca729f134da1cef692d6bfffc858 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index c35af7ac6c8a62eb122a0ec94e483130fb2a0a45..718dfaf7a7c86024bb12be0b8bef56b8dba3c617 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+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:960
+#: code:addons/project/project.py:932
#, 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:440
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:432
+#: code:addons/project/project.py:1305
#, python-format
msgid "Warning!"
msgstr ""
@@ -213,8 +213,9 @@ msgid "Assigned To"
msgstr ""
#. module: project
-#: selection:project.task,priority:0
-msgid "Very important"
+#: model:mail.message.subtype,name:project.mt_project_task_closed
+#: model:mail.message.subtype,name:project.mt_task_closed
+msgid "Task Done"
msgstr ""
#. module: project
@@ -253,9 +254,14 @@ msgid "Project Task Delegate"
msgstr ""
#. module: project
-#: code:addons/project/project.py:557
-#, python-format
-msgid "Project has been <b>created</b>."
+#: model:mail.message.subtype,name:project.mt_project_task_started
+#: model:mail.message.subtype,name:project.mt_task_started
+msgid "Task Started"
+msgstr ""
+
+#. module: project
+#: view:project.task:0
+msgid "Very Important"
msgstr ""
#. module: project
@@ -298,12 +304,6 @@ msgstr ""
msgid "August"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:1303
-#, python-format
-msgid "Task has been <b>delegated</b> to <em>%s</em>."
-msgstr ""
-
#. module: project
#: view:project.project:0
#: field:project.project,complete_name:0
@@ -365,7 +365,7 @@ msgid "Assigned to"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1057
+#: code:addons/project/project.py:1021
#, python-format
msgid "Delegated User should be specified"
msgstr ""
@@ -401,12 +401,6 @@ msgstr ""
msgid "Re-evaluate Task"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:1292
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
#. module: project
#: view:project.task:0
msgid "Validate planned time"
@@ -417,6 +411,12 @@ msgstr ""
msgid "Use integrated collaborative note pads on task"
msgstr ""
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_blocked
+#: model:mail.message.subtype,name:project.mt_task_blocked
+msgid "Task Blocked"
+msgstr ""
+
#. module: project
#: model:process.node,note:project.process_node_opentask0
msgid "Encode your working hours."
@@ -432,6 +432,11 @@ msgstr ""
msgid "oe_kanban_text_red"
msgstr ""
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_blocked
+msgid "Task blocked"
+msgstr ""
+
#. module: project
#: view:project.task:0
msgid "Delegation"
@@ -580,11 +585,6 @@ msgstr ""
msgid "Not a Template Task"
msgstr ""
-#. module: project
-#: view:project.project:0
-msgid "Follow this project to automatically follow all related tasks and issues."
-msgstr ""
-
#. module: project
#: field:project.task,planned_hours:0
msgid "Initially Planned Hours"
@@ -643,6 +643,14 @@ msgstr ""
msgid "Invoice working time on issues"
msgstr ""
+#. module: project
+#: view:project.project:0
+#: view:project.task:0
+#: field:project.task.history,end_date:0
+#: field:project.task.history.cumulative,end_date:0
+msgid "End Date"
+msgstr ""
+
#. module: project
#: model:project.task.type,name:project.project_tt_specification
msgid "Specification"
@@ -828,6 +836,11 @@ msgstr ""
msgid "Companies"
msgstr ""
+#. module: project
+#: field:project.task.type,fold:0
+msgid "Folded by Default"
+msgstr ""
+
#. module: project
#: field:project.task.history,date:0
#: field:project.task.history.cumulative,date:0
@@ -854,12 +867,6 @@ msgstr ""
msgid "10"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:566
-#, python-format
-msgid "Project has been <b>canceled</b>."
-msgstr ""
-
#. module: project
#: help:project.project,analytic_account_id:0
msgid "Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."
@@ -875,17 +882,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:569
-#, python-format
-msgid "Project has been <b>closed</b>."
-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"
@@ -908,8 +904,8 @@ msgid "Sum of spent hours of all tasks related to this project and its child pro
msgstr ""
#. module: project
-#: model:project.task.type,name:project.project_tt_development
-msgid "Development"
+#: view:project.project:0
+msgid "Follow this project to automatically track the events associated to tasks and issues of this project."
msgstr ""
#. module: project
@@ -918,27 +914,21 @@ msgid "Users"
msgstr ""
#. module: project
-#: model:mail.message.subtype,name:project.mt_project_stage
-#: model:mail.message.subtype,name:project.mt_task_change
+#: model:mail.message.subtype,name:project.mt_task_stage
msgid "Stage Changed"
msgstr ""
#. module: project
-#: field:project.task.type,fold:0
-msgid "Hide in views if empty"
+#: view:project.project:0
+#: model:res.groups,name:project.group_project_manager
+msgid "Manager"
msgstr ""
#. module: project
-#: view:project.task:0
#: selection:project.task,priority:0
msgid "Important"
msgstr ""
-#. module: project
-#: field:project.task.type,case_default:0
-msgid "Common to All Projects"
-msgstr ""
-
#. module: project
#: field:project.category,name:0
msgid "Name"
@@ -986,18 +976,6 @@ msgstr ""
msgid "Work summary"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:563
-#, python-format
-msgid "Project is now <b>pending</b>."
-msgstr ""
-
-#. module: project
-#: code:addons/project/project.py:560
-#, python-format
-msgid "Project has been <b>opened</b>."
-msgstr ""
-
#. module: project
#: view:project.project:0
#: view:project.task:0
@@ -1050,11 +1028,6 @@ 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 +1076,7 @@ msgid "Done by"
msgstr ""
#. module: project
-#: code:addons/project/project.py:180
+#: code:addons/project/project.py:181
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1134,11 +1107,6 @@ 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
@@ -1174,13 +1142,18 @@ msgid "Computed as: Time Spent + Remaining Time."
msgstr ""
#. module: project
-#: code:addons/project/project.py:364
-#: code:addons/project/project.py:385
-#: code:addons/project/project.py:728
+#: code:addons/project/project.py:356
+#: code:addons/project/project.py:377
+#: code:addons/project/project.py:709
#, python-format
msgid "%s (copy)"
msgstr ""
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_stage
+msgid "Task Stage Changed"
+msgstr ""
+
#. module: project
#: view:project.task:0
#: field:project.task.history,remaining_hours:0
@@ -1218,6 +1191,11 @@ msgstr ""
msgid "This will set the unit of measure used in projects and tasks."
msgstr ""
+#. module: project
+#: selection:project.task,priority:0
+msgid "Very important"
+msgstr ""
+
#. module: project
#: view:report.project.task.user:0
#: field:report.project.task.user,month:0
@@ -1275,8 +1253,6 @@ msgid "Low"
msgstr ""
#. module: project
-#: model:mail.message.subtype,name:project.mt_project_closed
-#: model:mail.message.subtype,name:project.mt_task_closed
#: selection:project.project,state:0
msgid "Closed"
msgstr ""
@@ -1357,7 +1333,7 @@ msgid "Estimated time to do the task, usually set by the project manager when th
msgstr ""
#. module: project
-#: code:addons/project/project.py:219
+#: code:addons/project/project.py:220
#, python-format
msgid "Attachments"
msgstr ""
@@ -1377,7 +1353,7 @@ msgid "Done"
msgstr ""
#. module: project
-#: code:addons/project/project.py:181
+#: code:addons/project/project.py:182
#, 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 ""
@@ -1402,6 +1378,11 @@ msgstr ""
msgid "Remaining Hours"
msgstr ""
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_stage
+msgid "Stage changed"
+msgstr ""
+
#. module: project
#: constraint:project.task:0
msgid "Error ! Task end-date must be greater then task start-date"
@@ -1423,17 +1404,6 @@ msgstr ""
msgid "Delegated Task"
msgstr ""
-#. module: project
-#: view:project.project:0
-#: model:res.groups,name:project.group_project_manager
-msgid "Manager"
-msgstr ""
-
-#. module: project
-#: view:project.task:0
-msgid "Very Important"
-msgstr ""
-
#. module: project
#: view:report.project.task.user:0
#: field:report.project.task.user,total_hours:0
@@ -1446,11 +1416,8 @@ msgid "project.config.settings"
msgstr ""
#. module: project
-#: view:project.project:0
-#: view:project.task:0
-#: field:project.task.history,end_date:0
-#: field:project.task.history.cumulative,end_date:0
-msgid "End Date"
+#: model:project.task.type,name:project.project_tt_development
+msgid "Development"
msgstr ""
#. module: project
@@ -1486,7 +1453,7 @@ msgid "Overpassed Tasks"
msgstr ""
#. module: project
-#: code:addons/project/project.py:960
+#: code:addons/project/project.py:932
#, python-format
msgid "Child task still open.\n"
"Please cancel or complete child task first."
@@ -1512,6 +1479,11 @@ msgstr ""
msgid "Delegate your task to the other user"
msgstr ""
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_started
+msgid "Task started"
+msgstr ""
+
#. module: project
#: help:project.task.reevaluate,remaining_hours:0
msgid "Put here the remaining hours required to close the task."
@@ -1537,7 +1509,7 @@ msgid "CHECK: "
msgstr ""
#. module: project
-#: code:addons/project/project.py:440
+#: code:addons/project/project.py:432
#, python-format
msgid "You must assign members on the project '%s' !"
msgstr ""
@@ -1660,6 +1632,11 @@ msgstr ""
msgid "Documents"
msgstr ""
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_new
+msgid "Task created"
+msgstr ""
+
#. module: project
#: view:report.project.task.user:0
#: field:report.project.task.user,no_of_days:0
@@ -1673,8 +1650,6 @@ msgid "Followers"
msgstr ""
#. module: project
-#: model:mail.message.subtype,name:project.mt_project_new
-#: model:mail.message.subtype,name:project.mt_task_new
#: selection:project.project,state:0
#: view:project.task:0
#: selection:project.task,state:0
@@ -1752,7 +1727,7 @@ msgid "Starting Date"
msgstr ""
#. module: project
-#: code:addons/project/project.py:406
+#: code:addons/project/project.py:398
#: model:ir.actions.act_window,name:project.open_view_project_all
#: model:ir.ui.menu,name:project.menu_projects
#: view:project.project:0
@@ -1785,12 +1760,6 @@ msgstr ""
msgid "Project Tasks"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:1296
-#, python-format
-msgid "Task has been <b>created</b>."
-msgstr ""
-
#. module: project
#: field:account.analytic.account,use_tasks:0
#: model:ir.actions.act_window,name:project.act_project_project_2_project_task_all
@@ -1809,12 +1778,6 @@ msgstr ""
msgid "December"
msgstr ""
-#. module: project
-#: model:mail.message.subtype,name:project.mt_project_canceled
-#: model:mail.message.subtype,name:project.mt_task_canceled
-msgid "Canceled"
-msgstr ""
-
#. module: project
#: view:project.config.settings:0
#: view:project.task.delegate:0
@@ -1853,12 +1816,6 @@ msgstr ""
msgid "Kanban State"
msgstr ""
-#. module: project
-#: code:addons/project/project.py:1299
-#, python-format
-msgid "Task has been set as <b>draft</b>."
-msgstr ""
-
#. module: project
#: field:project.config.settings,module_project_timesheet:0
msgid "Record timesheet lines per tasks"
@@ -1904,14 +1861,6 @@ msgstr ""
msgid "Configure Project"
msgstr ""
-#. module: project
-#: field:project.project,message_comment_ids:0
-#: help:project.project,message_comment_ids:0
-#: field:project.task,message_comment_ids:0
-#: help:project.task,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: project
#: view:project.task.history.cumulative:0
msgid "Tasks's Cumulative Flow"
@@ -1922,11 +1871,6 @@ 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"
@@ -1938,11 +1882,17 @@ msgid "Reevaluation Task"
msgstr ""
#. module: project
-#: code:addons/project/project.py:1414
+#: code:addons/project/project.py:1305
#, python-format
msgid "Please delete the project linked with this account first."
msgstr ""
+#. module: project
+#: model:mail.message.subtype,name:project.mt_project_task_new
+#: model:mail.message.subtype,name:project.mt_task_new
+msgid "Task Created"
+msgstr ""
+
#. module: project
#: view:report.project.task.user:0
msgid "Non Assigned Tasks to users"
@@ -1961,6 +1911,11 @@ msgstr ""
msgid "Ready for next stage"
msgstr ""
+#. module: project
+#: field:project.task.type,case_default:0
+msgid "Default for New Projects"
+msgstr ""
+
#. module: project
#: view:project.task:0
#: field:project.task,description:0
@@ -1994,6 +1949,11 @@ msgid "A long term project management module that tracks planning, scheduling, a
" This installs the module project_long_term."
msgstr ""
+#. module: project
+#: model:mail.message.subtype,description:project.mt_task_closed
+msgid "Task closed"
+msgstr ""
+
#. module: project
#: selection:report.project.task.user,month:0
msgid "April"
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index 4c07180922444cf780cba1d6bbcf1bf52b75c2b7..340d721bcc7398f6e48aff7e36143908248ecb02 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index abca23e48704f2a6fef8af299358a71d48dcd76d..b11d1d8d37893eb19cd98f59004559033aa1b0f4 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -41,6 +41,11 @@ msgstr ""
msgid "Working Hours to Open the Issue"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_started
+msgid "Issue started"
+msgstr ""
+
#. module: project_issue
#: field:project.issue,date_open:0
msgid "Opened"
@@ -68,19 +73,23 @@ msgid "Unread Messages"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:560
-#, python-format
-msgid "<b>escalated</b>."
+#: field:project.issue,company_id:0
+#: view:project.issue.report:0
+#: field:project.issue.report,company_id:0
+msgid "Company"
msgstr ""
#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
-msgid "Issue: Mark unread"
+#: field:project.issue,email_cc:0
+msgid "Watchers Emails"
msgstr ""
#. module: project_issue
-#: field:project.issue,email_cc:0
-msgid "Watchers Emails"
+#: help:project.issue,kanban_state:0
+msgid "A Issue's kanban state indicates special situations affecting it:\n"
+" * Normal is the default situation\n"
+" * Blocked indicates something is preventing the progress of this issue\n"
+" * Ready for next stage indicates the issue is ready to be pulled to the next stage"
msgstr ""
#. module: project_issue
@@ -99,7 +108,7 @@ msgid "Days to Open"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
#, python-format
msgid "You cannot escalate this issue.\n"
"The relevant Project has not configured the Escalation Project!"
@@ -139,6 +148,11 @@ msgstr ""
msgid "Task"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_stage
+msgid "Issue Stage Changed"
+msgstr ""
+
#. module: project_issue
#: field:project.issue,message_ids:0
msgid "Messages"
@@ -196,11 +210,6 @@ msgstr ""
msgid "Color Index"
msgstr ""
-#. module: project_issue
-#: help:project.issue,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
#. module: project_issue
#: field:project.issue.report,working_hours_open:0
msgid "Avg. Working Hours to Open"
@@ -247,12 +256,12 @@ msgid "Statistics"
msgstr ""
#. module: project_issue
-#: model:crm.case.categ,name:project_issue.bug_categ
-msgid "Maintenance"
+#: field:project.issue,kanban_state:0
+msgid "Kanban State"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:547
+#: code:addons/project_issue/project_issue.py:360
#, python-format
msgid "Project issue <b>converted</b> to task."
msgstr ""
@@ -308,7 +317,7 @@ msgid "Lowest"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:358
+#: code:addons/project_issue/project_issue.py:382
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -379,7 +388,7 @@ msgid "Issues Analysis"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:493
+#: code:addons/project_issue/project_issue.py:485
#, python-format
msgid "No Subject"
msgstr ""
@@ -397,19 +406,13 @@ msgstr ""
msgid "Contact"
msgstr ""
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:551
-#, python-format
-msgid "Project issue <b>created</b>."
-msgstr ""
-
#. module: project_issue
#: view:project.issue:0
msgid "Delete"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:341
+#: code:addons/project_issue/project_issue.py:365
#, python-format
msgid "Tasks"
msgstr ""
@@ -420,8 +423,8 @@ msgid "# of Issues"
msgstr ""
#. module: project_issue
-#: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
-msgid "Issue: Mark read"
+#: selection:project.issue.report,month:0
+msgid "September"
msgstr ""
#. module: project_issue
@@ -474,16 +477,10 @@ msgstr ""
msgid "Next Action"
msgstr ""
-#. module: project_issue
-#: field:project.issue,company_id:0
-#: view:project.issue.report:0
-#: field:project.issue.report,company_id:0
-msgid "Company"
-msgstr ""
-
#. module: project_issue
#: view:project.issue:0
-msgid "Category"
+#: selection:project.issue,kanban_state:0
+msgid "Blocked"
msgstr ""
#. module: project_issue
@@ -506,6 +503,11 @@ msgstr ""
msgid "These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"
msgstr ""
+#. module: project_issue
+#: model:crm.case.categ,name:project_issue.bug_categ
+msgid "Maintenance"
+msgstr ""
+
#. module: project_issue
#: selection:project.issue.report,state:0
msgid "Draft"
@@ -553,6 +555,7 @@ msgid "August"
msgstr ""
#. module: project_issue
+#: selection:project.issue,kanban_state:0
#: selection:project.issue,priority:0
#: selection:project.issue.report,priority:0
msgid "Normal"
@@ -610,17 +613,11 @@ msgid "November"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:472
+#: code:addons/project_issue/project_issue.py:465
#, python-format
msgid "Warning!"
msgstr ""
-#. module: project_issue
-#: field:project.issue,message_comment_ids:0
-#: help:project.issue,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: project_issue
#: view:project.issue.report:0
msgid "Search"
@@ -674,13 +671,13 @@ msgid "Configure"
msgstr ""
#. module: project_issue
-#: view:project.issue:0
-msgid "Current Features"
+#: model:mail.message.subtype,description:project_issue.mt_issue_closed
+msgid "Issue closed"
msgstr ""
#. module: project_issue
-#: selection:project.issue.report,month:0
-msgid "September"
+#: view:project.issue:0
+msgid "Current Features"
msgstr ""
#. module: project_issue
@@ -715,6 +712,7 @@ msgid "Issues"
msgstr ""
#. module: project_issue
+#: view:project.issue:0
#: selection:project.issue,state:0
msgid "In Progress"
msgstr ""
@@ -737,9 +735,14 @@ msgid "Creation Month"
msgstr ""
#. module: project_issue
-#: code:addons/project_issue/project_issue.py:557
-#, python-format
-msgid "<b>escalated</b> to <em>'%s'</em>."
+#: help:project.issue,progress:0
+msgid "Computed as: Time Spent / Total Time."
+msgstr ""
+
+#. module: project_issue
+#: view:project.issue:0
+#: selection:project.issue,kanban_state:0
+msgid "Ready for next stage"
msgstr ""
#. module: project_issue
@@ -762,12 +765,6 @@ msgstr ""
msgid "Issue"
msgstr ""
-#. module: project_issue
-#: code:addons/project_issue/project_issue.py:540
-#, python-format
-msgid "Stage changed to <b>%s</b>."
-msgstr ""
-
#. module: project_issue
#: model:project.category,name:project_issue.project_issue_category_02
msgid "PBCK"
@@ -798,17 +795,41 @@ msgstr ""
msgid "project.config.settings"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_closed
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_closed
+msgid "Issue Closed"
+msgstr ""
+
#. module: project_issue
#: view:project.issue.report:0
#: field:project.issue.report,email:0
msgid "# Emails"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_new
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_new
+msgid "Issue Created"
+msgstr ""
+
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_blocked
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_blocked
+msgid "Issue Blocked"
+msgstr ""
+
#. module: project_issue
#: selection:project.issue.report,month:0
msgid "February"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_stage
+#: model:mail.message.subtype,description:project_issue.mt_project_issue_stage
+msgid "Stage changed"
+msgstr ""
+
#. module: project_issue
#: view:project.issue:0
msgid "Feature description"
@@ -860,6 +881,11 @@ msgstr ""
msgid "References"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_new
+msgid "Issue created"
+msgstr ""
+
#. module: project_issue
#: field:project.issue,working_hours_close:0
msgid "Working Hours to Close the Issue"
@@ -870,6 +896,11 @@ msgstr ""
msgid "ID"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,description:project_issue.mt_issue_blocked
+msgid "Issue blocked"
+msgstr ""
+
#. module: project_issue
#: model:ir.model,name:project_issue.model_project_issue_report
msgid "project.issue.report"
@@ -885,6 +916,11 @@ msgstr ""
msgid "Avg. Working Hours to Close"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_stage
+msgid "Stage Changed"
+msgstr ""
+
#. module: project_issue
#: selection:project.issue,priority:0
#: selection:project.issue.report,priority:0
@@ -912,3 +948,9 @@ msgstr ""
msgid "Duration"
msgstr ""
+#. module: project_issue
+#: model:mail.message.subtype,name:project_issue.mt_issue_started
+#: model:mail.message.subtype,name:project_issue.mt_project_issue_started
+msgid "Issue Started"
+msgstr ""
+
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 35dce21e8bd4ea6ba81de2e4abf4e4f3338c9897..c1202b62b8f9242f83b3e9723bbc2ad8cf8fbd87 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index 179629da2ef3906ef18898895de665708bd88c74..0c8daace986c327138c4c09decab374d7bee02ef 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -33,6 +33,14 @@ msgstr ""
msgid "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 "Team Planning"
+msgstr ""
+
#. module: project_long_term
#: field:project.phase,user_ids:0
msgid "Assigned Users"
@@ -137,7 +145,7 @@ msgid "In Progress Phases"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:141
+#: code:addons/project_long_term/project_long_term.py:140
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -148,12 +156,6 @@ msgstr ""
msgid "Please specify a project to schedule."
msgstr ""
-#. module: project_long_term
-#: view:project.compute.phases:0
-#: view:project.compute.tasks:0
-msgid "or"
-msgstr ""
-
#. module: project_long_term
#: view:project.phase:0
#: view:project.user.allocation:0
@@ -190,11 +192,6 @@ msgstr ""
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"
@@ -241,9 +238,8 @@ msgid "Pending Phases"
msgstr ""
#. module: project_long_term
-#: code:addons/project_long_term/project_long_term.py:126
-#, python-format
-msgid "Day"
+#: help:project.user.allocation,date_start:0
+msgid "Starting Date"
msgstr ""
#. module: project_long_term
@@ -484,10 +480,8 @@ 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"
+#: view:project.compute.phases:0
+#: view:project.compute.tasks:0
+msgid "or"
msgstr ""
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index 9a3d4228e517eb2e25d7eb9a0933ccec54be3e94..9015ac93351c3b64ce6551fb786b30cdb3b8bf95 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,19 +26,19 @@ msgid "Product type is service, then its creates the task."
msgstr ""
#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:93
+#: code:addons/project_mrp/project_procurement.py:92
#, python-format
msgid "Task created"
msgstr ""
#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_mrptask0
-msgid "A task is created to provide the service."
+#: model:process.node,note:project_mrp.process_node_saleordertask0
+msgid "In case you sell services on sales order"
msgstr ""
#. module: project_mrp
-#: field:project.task,sale_line_id:0
-msgid "Sale Order Line"
+#: model:process.node,note:project_mrp.process_node_mrptask0
+msgid "A task is created to provide the service."
msgstr ""
#. module: project_mrp
@@ -46,6 +46,11 @@ msgstr ""
msgid "Product"
msgstr ""
+#. module: project_mrp
+#: model:process.node,name:project_mrp.process_node_saleordertask0
+msgid "Sales Order Task"
+msgstr ""
+
#. module: project_mrp
#: model:process.transition,note:project_mrp.process_transition_procuretask0
msgid "if product type is 'service' then it creates the task."
@@ -61,6 +66,11 @@ msgstr ""
msgid "Procurement Task"
msgstr ""
+#. module: project_mrp
+#: field:procurement.order,sale_line_id:0
+msgid "Sales order line"
+msgstr ""
+
#. module: project_mrp
#: model:ir.model,name:project_mrp.model_project_task
#: model:process.node,name:project_mrp.process_node_mrptask0
@@ -69,6 +79,13 @@ msgstr ""
msgid "Task"
msgstr ""
+#. module: project_mrp
+#: view:product.product:0
+msgid "will be \n"
+" created to follow up the job to do. This task will appear\n"
+" in the project related to the contract of the sales order."
+msgstr ""
+
#. module: project_mrp
#: view:product.product:0
msgid "When you sell this service to a customer,"
@@ -85,25 +102,13 @@ msgstr ""
msgid "Procurement"
msgstr ""
-#. module: project_mrp
-#: field:procurement.order,sale_line_id:0
-msgid "Sale order line"
-msgstr ""
-
#. module: project_mrp
#: view:product.product:0
msgid "False"
msgstr ""
#. module: project_mrp
-#: view:product.product:0
-msgid "will be \n"
-" created to follow up the job to do. This task will appear\n"
-" in the project related to the contract of the sale order."
-msgstr ""
-
-#. module: project_mrp
-#: code:addons/project_mrp/project_procurement.py:87
+#: code:addons/project_mrp/project_procurement.py:86
#, python-format
msgid "Task created."
msgstr ""
@@ -114,8 +119,8 @@ msgid "If procurement method is Make to order and supply method is produce"
msgstr ""
#. module: project_mrp
-#: model:process.node,name:project_mrp.process_node_saleordertask0
-msgid "Sale Order Task"
+#: field:project.task,sale_line_id:0
+msgid "Sales Order Line"
msgstr ""
#. module: project_mrp
@@ -133,11 +138,6 @@ msgstr ""
msgid "Order Line"
msgstr ""
-#. module: project_mrp
-#: model:process.node,note:project_mrp.process_node_saleordertask0
-msgid "In case you sell services on sale order"
-msgstr ""
-
#. module: project_mrp
#: view:product.product:0
msgid "a task"
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index 047c156a1ddc90669282755f0ec702710ea4b786..d5d1bbc8022dd1193b51846e912fcc556a194d87 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -57,11 +57,6 @@ msgstr ""
msgid "Group By..."
msgstr ""
-#. module: project_timesheet
-#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
-msgid "Trigger invoices from sale order lines"
-msgstr ""
-
#. module: project_timesheet
#: selection:report.timesheet.task.user,month:0
msgid "October"
@@ -174,12 +169,6 @@ msgstr ""
msgid "Task"
msgstr ""
-#. module: project_timesheet
-#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
-msgstr ""
-
#. module: project_timesheet
#: view:report.timesheet.task.user:0
#: field:report.timesheet.task.user,user_id:0
@@ -312,6 +301,11 @@ msgstr ""
msgid "Invoicing"
msgstr ""
+#. module: project_timesheet
+#: model:process.node,note:project_timesheet.process_node_triggerinvoice0
+msgid "Trigger invoices from sales order lines"
+msgstr ""
+
#. module: project_timesheet
#: code:addons/project_timesheet/project_timesheet.py:100
#, python-format
@@ -330,6 +324,12 @@ msgstr ""
msgid "Work on task"
msgstr ""
+#. module: project_timesheet
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks"
+msgstr ""
+
#. module: project_timesheet
#: model:ir.actions.act_window,name:project_timesheet.action_report_timesheet_task_user
#: model:ir.ui.menu,name:project_timesheet.menu_timesheet_task_user
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index d33163c1470bafdba3aa1f9bffbc00fae12dc745..8a9a828327a718c0d811d1fbae3ca6f32fe39d5b 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -52,11 +52,6 @@ msgstr ""
msgid "The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."
msgstr ""
-#. module: purchase
-#: model:ir.actions.server,name:purchase.actions_server_purchase_order_read
-msgid "Purchase: Mark read"
-msgstr ""
-
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,day:0
@@ -96,16 +91,13 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
-#: code:addons/purchase/purchase.py:988
-#: code:addons/purchase/purchase.py:991
-#: code:addons/purchase/wizard/purchase_order_group.py:47
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Warning!"
+msgid "Configuration Error!"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:573
+#: code:addons/purchase/purchase.py:587
#, python-format
msgid "You must first cancel all receptions related to this purchase order."
msgstr ""
@@ -122,9 +114,9 @@ msgid "Purchase-Standard Price"
msgstr ""
#. module: purchase
-#: report:purchase.order:0
-#: field:purchase.report,validator:0
-msgid "Validated By"
+#: code:addons/purchase/purchase.py:1011
+#, python-format
+msgid "No supplier defined for this product !"
msgstr ""
#. module: purchase
@@ -144,12 +136,6 @@ msgstr ""
msgid "Average Price"
msgstr ""
-#. module: purchase
-#: code:addons/purchase/purchase.py:830
-#, python-format
-msgid "Invoice <b>paid</b>."
-msgstr ""
-
#. module: purchase
#: view:purchase.order:0
msgid "Purchase order which are in the exception state"
@@ -217,7 +203,7 @@ msgid "This is computed as the minimum scheduled date of all purchase order line
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "In order to delete a purchase order, you must cancel it first."
msgstr ""
@@ -242,28 +228,12 @@ msgstr ""
msgid "Total Untaxed amount"
msgstr ""
-#. module: purchase
-#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
-msgid "Unit of Measure Categories"
-msgstr ""
-
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,category_id:0
msgid "Category"
msgstr ""
-#. module: purchase
-#: view:purchase.order:0
-msgid "Quotation "
-msgstr ""
-
-#. module: purchase
-#: code:addons/purchase/purchase.py:810
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s."
-msgstr ""
-
#. module: purchase
#: model:process.transition,note:purchase.process_transition_purchaseinvoice0
msgid "A purchase order generates a supplier invoice, as soon as it is confirmed by the buyer. Depending on the Invoicing control of the purchase order, the invoice is based on received or on ordered quantities."
@@ -325,14 +295,14 @@ msgid "October"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:837
+#: code:addons/purchase/purchase.py:1024
#, python-format
-msgid "Purchase Order for <em>%s</em> <b>cancelled</b>."
+msgid "The product \"%s\" has been defined with your company as reseller which seems to be a configuration error!"
msgstr ""
#. module: purchase
-#: field:purchase.order,message_summary:0
-msgid "Summary"
+#: view:product.product:0
+msgid "When you sell this service to a customer,"
msgstr ""
#. module: purchase
@@ -360,12 +330,6 @@ msgstr ""
msgid "Quantity"
msgstr ""
-#. module: purchase
-#: code:addons/purchase/purchase.py:819
-#, python-format
-msgid "Shipment <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
#. module: purchase
#: field:purchase.order,fiscal_position:0
msgid "Fiscal Position"
@@ -418,12 +382,6 @@ msgstr ""
msgid "Put an address if you want to deliver directly from the supplier to the customer. Otherwise, keep empty to deliver to your own company."
msgstr ""
-#. module: purchase
-#: code:addons/purchase/purchase.py:824
-#, python-format
-msgid "Draft Invoice of %s %s is <b>waiting for validation</b>."
-msgstr ""
-
#. module: purchase
#: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
msgid "<p>\n"
@@ -440,6 +398,11 @@ msgstr ""
msgid "Scheduled Date"
msgstr ""
+#. module: purchase
+#: field:purchase.order,currency_id:0
+msgid "Currency"
+msgstr ""
+
#. module: purchase
#: field:purchase.order,journal_id:0
msgid "Journal"
@@ -472,6 +435,16 @@ msgstr ""
msgid "Incoming Products"
msgstr ""
+#. module: purchase
+#: view:purchase.order:0
+msgid "Request for Quotation "
+msgstr ""
+
+#. module: purchase
+#: help:purchase.order,partner_ref:0
+msgid "Reference of the sales order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."
+msgstr ""
+
#. module: purchase
#: view:purchase.config.settings:0
#: view:purchase.order.group:0
@@ -489,6 +462,11 @@ msgstr ""
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)."
msgstr ""
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_approved
+msgid "RFQ Approved"
+msgstr ""
+
#. module: purchase
#: view:purchase.config.settings:0
msgid "Apply"
@@ -504,6 +482,11 @@ msgstr ""
msgid "The buyer has to approve the RFQ before being sent to the supplier. The RFQ becomes a confirmed Purchase Order."
msgstr ""
+#. module: purchase
+#: model:mail.message.subtype,name:purchase.mt_rfq_confirmed
+msgid "RFQ Confirmed"
+msgstr ""
+
#. module: purchase
#: view:purchase.order:0
msgid "Customer Address"
@@ -529,7 +512,7 @@ msgid "Supplier"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:508
+#: code:addons/purchase/purchase.py:525
#, python-format
msgid "Define expense account for this company: \"%s\" (id:%d)."
msgstr ""
@@ -553,7 +536,6 @@ msgstr ""
#. module: purchase
#: field:purchase.order,shipped:0
-#: field:purchase.order,shipped_rate:0
msgid "Received"
msgstr ""
@@ -590,6 +572,11 @@ msgstr ""
msgid "Invoices and Receptions"
msgstr ""
+#. module: purchase
+#: model:process.transition,note:purchase.process_transition_packinginvoice0
+msgid "A Pick list generates an invoice. Depending on the Invoicing control of the sales order, the invoice is based on delivered or on ordered quantities."
+msgstr ""
+
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,nbr:0
@@ -597,7 +584,7 @@ msgid "# of Lines"
msgstr ""
#. module: purchase
-#: code:addons/purchase/wizard/purchase_line_invoice.py:110
+#: code:addons/purchase/wizard/purchase_line_invoice.py:106
#, python-format
msgid "Define expense account for this product: \"%s\" (id:%d)."
msgstr ""
@@ -618,8 +605,8 @@ msgid "It indicates that a picking has been done"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:565
-#: code:addons/purchase/purchase.py:572
+#: code:addons/purchase/purchase.py:579
+#: code:addons/purchase/purchase.py:586
#, python-format
msgid "Unable to cancel this purchase order."
msgstr ""
@@ -677,6 +664,15 @@ msgstr ""
msgid "Draft PO"
msgstr ""
+#. module: purchase
+#: code:addons/purchase/purchase.py:941
+#: code:addons/purchase/purchase.py:956
+#: code:addons/purchase/purchase.py:960
+#: code:addons/purchase/wizard/purchase_order_group.py:47
+#, python-format
+msgid "Warning!"
+msgstr ""
+
#. module: purchase
#: model:process.node,name:purchase.process_node_draftpurchaseorder0
#: model:process.node,name:purchase.process_node_draftpurchaseorder1
@@ -708,6 +704,11 @@ msgstr ""
msgid "The tax amount"
msgstr ""
+#. module: purchase
+#: field:purchase.order,shipped_rate:0
+msgid "Received Ratio"
+msgstr ""
+
#. module: purchase
#: selection:purchase.report,month:0
msgid "September"
@@ -740,7 +741,7 @@ msgid "Stock Moves"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1158
+#: code:addons/purchase/purchase.py:1156
#, python-format
msgid "Draft Purchase Order created"
msgstr ""
@@ -760,11 +761,6 @@ msgstr ""
msgid "Terms and Conditions"
msgstr ""
-#. module: purchase
-#: field:purchase.order,currency_id:0
-msgid "unknown"
-msgstr ""
-
#. module: purchase
#: help:purchase.order,date_order:0
msgid "Date on which this document has been created."
@@ -858,12 +854,6 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#. module: purchase
-#: field:purchase.order,message_comment_ids:0
-#: help:purchase.order,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: purchase
#: sql_constraint:purchase.order:0
msgid "Order Reference must be unique per Company!"
@@ -898,14 +888,73 @@ msgid "Date Approved"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:806
-#, python-format
-msgid "Request for quotation <b>created</b>."
+#: view:product.product:0
+msgid "a draft purchase order"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "a draft purchase order"
+#: model:email.template,body_html:purchase.email_template_edi_purchase
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello$ ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: </p>\n"
+" \n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Order number: <strong>${object.name}</strong><br />\n"
+" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
+" Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.partner_ref:\n"
+" Your reference: ${object.partner_ref}<br />\n"
+" % endif\n"
+" % if object.validator:\n"
+" Your contact: <a href=\"mailto:${object.validator.email or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
+" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: purchase
@@ -941,16 +990,11 @@ msgid "Outgoing Mails"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:437
+#: code:addons/purchase/purchase.py:456
#, 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"
@@ -963,11 +1007,16 @@ msgid "Destination Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:973
+#: code:addons/purchase/purchase.py:941
#, python-format
msgid "Selected Unit of Measure does not belong to the same category as the product Unit of Measure."
msgstr ""
+#. module: purchase
+#: view:purchase.order.line_invoice:0
+msgid "Select an Open Sales Order"
+msgstr ""
+
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_unit_measure_purchase
#: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action
@@ -979,19 +1028,13 @@ msgstr ""
msgid "Manage pricelist per supplier"
msgstr ""
-#. module: purchase
-#: code:addons/purchase/purchase.py:833
-#, python-format
-msgid "Purchase Order has been set to <b>draft</b>."
-msgstr ""
-
#. module: purchase
#: view:board.board:0
msgid "Purchase Dashboard"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:566
+#: code:addons/purchase/purchase.py:580
#, python-format
msgid "First cancel all receptions related to this purchase order."
msgstr ""
@@ -1030,8 +1073,8 @@ msgid "Unread Messages"
msgstr ""
#. module: purchase
-#: view:purchase.order.line_invoice:0
-msgid "Select an Open Sale Order"
+#: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
+msgid "Unit of Measure Categories"
msgstr ""
#. module: purchase
@@ -1039,6 +1082,11 @@ msgstr ""
msgid "Set to Draft"
msgstr ""
+#. module: purchase
+#: help:purchase.order,origin:0
+msgid "Reference of the document that generated this purchase order request; a sales order or an internal procurement request."
+msgstr ""
+
#. module: purchase
#: view:purchase.order.line:0
msgid "Notes"
@@ -1069,7 +1117,7 @@ msgid "Stock Move"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:255
+#: code:addons/purchase/purchase.py:260
#, python-format
msgid "Invalid Action!"
msgstr ""
@@ -1162,7 +1210,7 @@ msgid "a draft\n"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:310
+#: code:addons/purchase/purchase.py:320
#, python-format
msgid "Please create Invoices."
msgstr ""
@@ -1250,7 +1298,7 @@ msgid "Purchase Order Line Make Invoice"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:1133
+#: code:addons/purchase/purchase.py:1141
#, python-format
msgid "PO: %s"
msgstr ""
@@ -1261,7 +1309,7 @@ msgid "Send by EMail"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:498
+#: code:addons/purchase/purchase.py:515
#, python-format
msgid "Define purchase journal for this company: \"%s\" (id:%d)."
msgstr ""
@@ -1272,8 +1320,8 @@ msgid "Purchase Order "
msgstr ""
#. module: purchase
-#: view:purchase.order.line:0
-msgid "Manual Invoices"
+#: help:purchase.config.settings,group_costing_method:0
+msgid "Allows you to compute product cost price based on average cost."
msgstr ""
#. module: purchase
@@ -1423,8 +1471,8 @@ msgid "Compute product cost price based on average cost"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:340
-#: code:addons/purchase/wizard/purchase_line_invoice.py:141
+#: code:addons/purchase/purchase.py:350
+#: code:addons/purchase/wizard/purchase_line_invoice.py:137
#: model:ir.actions.act_window,name:purchase.act_res_partner_2_supplier_invoices
#: view:res.partner:0
#, python-format
@@ -1529,8 +1577,9 @@ msgid "Open Purchase Menu"
msgstr ""
#. module: purchase
-#: model:ir.model,name:purchase.model_mail_compose_message
-msgid "Email composition wizard"
+#: code:addons/purchase/purchase.py:1028
+#, python-format
+msgid "No address defined for the supplier"
msgstr ""
#. module: purchase
@@ -1599,11 +1648,11 @@ msgid "Purchase Order"
msgstr ""
#. module: purchase
-#: 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
+#: code:addons/purchase/purchase.py:320
+#: code:addons/purchase/purchase.py:456
+#: code:addons/purchase/purchase.py:514
+#: code:addons/purchase/purchase.py:525
+#: code:addons/purchase/wizard/purchase_line_invoice.py:105
#, python-format
msgid "Error!"
msgstr ""
@@ -1618,11 +1667,6 @@ msgstr ""
msgid "The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception."
msgstr ""
-#. module: purchase
-#: model:process.transition,note:purchase.process_transition_packinginvoice0
-msgid "A Pick list generates an invoice. Depending on the Invoicing control of the sale order, the invoice is based on delivered or on ordered quantities."
-msgstr ""
-
#. module: purchase
#: selection:purchase.order,state:0
#: selection:purchase.order.line,state:0
@@ -1636,9 +1680,8 @@ msgid "# of Purchase Order"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:827
-#, python-format
-msgid "Shipment <b>received</b>."
+#: model:ir.model,name:purchase.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: purchase
@@ -1712,7 +1755,7 @@ msgid "RFQ_${(object.name or '').replace('/','_')}"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:988
+#: code:addons/purchase/purchase.py:956
#, python-format
msgid "The selected supplier only sells this product by %s"
msgstr ""
@@ -1755,6 +1798,12 @@ msgstr ""
msgid "Outgoing products to invoice"
msgstr ""
+#. module: purchase
+#: report:purchase.order:0
+#: field:purchase.report,validator:0
+msgid "Validated By"
+msgstr ""
+
#. module: purchase
#: view:purchase.report:0
#: field:purchase.report,delay_pass:0
@@ -1845,8 +1894,8 @@ msgid "November"
msgstr ""
#. module: purchase
-#: help:purchase.config.settings,group_costing_method:0
-msgid "Allows you to compute product cost price based on average cost."
+#: view:purchase.order.line:0
+msgid "Manual Invoices"
msgstr ""
#. module: purchase
@@ -1866,11 +1915,6 @@ msgid "Based on Purchase Order lines: place individual lines in 'Invoice Control
"Bases on incoming shipments: let you create an invoice when receptions are validated."
msgstr ""
-#. module: purchase
-#: help:purchase.order,origin:0
-msgid "Reference of the document that generated this purchase order request; a sale order or an internal procurement request."
-msgstr ""
-
#. module: purchase
#: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
msgid "Partner Categories"
@@ -1891,71 +1935,6 @@ msgstr ""
msgid "Invoicing Settings"
msgstr ""
-#. module: purchase
-#: model:email.template,body_html:purchase.email_template_edi_purchase
-msgid "\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>\n"
-" \n"
-" <p>Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}: </p>\n"
-" \n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" <strong>REFERENCES</strong><br />\n"
-" Order number: <strong>${object.name}</strong><br />\n"
-" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.partner_ref:\n"
-" Your reference: ${object.partner_ref}<br />\n"
-" % endif\n"
-" % if object.validator:\n"
-" Your contact: <a href=\"mailto:${object.validator.email or ''}?subject=Order%20${object.name}\">${object.validator.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone: ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
-msgstr ""
-
#. module: purchase
#: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
msgid "Total Orders by User per month"
@@ -1967,18 +1946,19 @@ msgid "Based on incoming shipments"
msgstr ""
#. module: purchase
-#: view:purchase.report:0
-#: field:purchase.report,warehouse_id:0
-msgid "Warehouse"
+#: code:addons/purchase/purchase.py:1018
+#, python-format
+msgid "No default supplier defined for this product"
msgstr ""
#. module: purchase
-#: help:purchase.order,partner_ref:0
-msgid "Reference of the sale order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."
+#: view:purchase.report:0
+#: field:purchase.report,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase
-#: code:addons/purchase/purchase.py:991
+#: code:addons/purchase/purchase.py:960
#, python-format
msgid "The selected supplier has a minimal quantity set to %s %s, you should not purchase less."
msgstr ""
@@ -2047,8 +2027,8 @@ msgid " Please note that: \n"
msgstr ""
#. module: purchase
-#: view:product.product:0
-msgid "When you sell this service to a customer,"
+#: field:purchase.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase
@@ -2057,6 +2037,11 @@ msgstr ""
msgid "Pricelist Versions"
msgstr ""
+#. module: purchase
+#: field:purchase.order,payment_term_id:0
+msgid "Payment Term"
+msgstr ""
+
#. module: purchase
#: view:purchase.order:0
msgid "Purchase orders which are in draft state"
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 8d9ed98dec3b4430aaaadfc4da4dd1298c4bbbf3..5b6ea50cb6e4f3449caf73871deba88b46881ae2 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/purchase_double_validation/i18n/purchase_double_validation.pot b/addons/purchase_double_validation/i18n/purchase_double_validation.pot
index e91f0262c16e4f44a21c7990667cb3a011c72d87..537ecfe0c852721d11de3729961830eb66a907aa 100644
--- a/addons/purchase_double_validation/i18n/purchase_double_validation.pot
+++ b/addons/purchase_double_validation/i18n/purchase_double_validation.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index c405bcb62c359df0cd23683a839ab4240ed1392b..7c876fa450bf2bbb47d12d4d8bfc821abb7e0bb1 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,145 +17,91 @@ msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Group By..."
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition.partner,partner_id:0
-msgid "Supplier"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product Detail"
-msgstr ""
-
-#. module: purchase_requisition
-#: help:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\n"
-"Purchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_unread:0
-msgid "Unread Messages"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,company_id:0
-#: field:purchase.requisition.line,company_id:0
-msgid "Company"
+msgid "Request a Quotation"
msgstr ""
#. module: purchase_requisition
-#: help:purchase.requisition,message_unread:0
-msgid "If checked new messages require your attention."
+#: selection:purchase.requisition,exclusive:0
+msgid "Multiple Requisitions"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation."
+#: field:purchase.requisition.line,product_uom_id:0
+msgid "Product Unit of Measure"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition.line,product_qty:0
-msgid "Quantity"
+#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to start a new purchase requisition process. \n"
+" </p><p>\n"
+" A purchase requisition is the step before a request for quotation.\n"
+" In a purchase requisition (or purchase tender), you can record the\n"
+" products you need to buy and trigger the creation of RfQs to\n"
+" suppliers. After the negotiation, once you have reviewed all the\n"
+" supplier's offers, you can validate some and cancel others.\n"
+" </p>\n"
+" "
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,message_ids:0
-msgid "Messages"
+#: view:purchase.requisition:0
+#: field:purchase.requisition,user_id:0
+msgid "Responsible"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_order
#: view:purchase.requisition:0
-msgid "Purchase Order"
+#: field:purchase.requisition,state:0
+msgid "Status"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
-#, python-format
-msgid "Error!"
+#: view:purchase.requisition:0
+msgid "Send to Suppliers"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Products"
+msgid "Group By..."
msgstr ""
#. module: purchase_requisition
+#: view:purchase.requisition:0
#: selection:purchase.requisition,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Quotation Detail"
+msgid "Purchase Done"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,exclusive:0
-msgid "Requisition Type"
+#: field:purchase.requisition,message_follower_ids:0
+msgid "Followers"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Reference"
+msgid "Purchase Requisition in negociation"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Multiple Requisitions"
+#: report:purchase.requisition:0
+#: field:purchase.requisition.partner,partner_id:0
+msgid "Supplier"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Reset to Draft"
-msgstr ""
-
-#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:153
-#, python-format
-msgid "Warning!"
-msgstr ""
-
-#. module: purchase_requisition
-#: model:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to start a new purchase requisition process. \n"
-" </p><p>\n"
-" A purchase requisition is the step before a request for quotation.\n"
-" In a purchase requisition (or purchase tender), you can record the\n"
-" products you need to buy and trigger the creation of RfQs to\n"
-" suppliers. After the negotiation, once you have reviewed all the\n"
-" supplier's offers, you can validate some and cancel others.\n"
-" </p>\n"
-" "
+#: selection:purchase.requisition,state:0
+msgid "New"
msgstr ""
#. module: purchase_requisition
#: report:purchase.requisition:0
-#: view:purchase.requisition:0
-msgid "Source"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: purchase_requisition
-#: field:purchase.requisition,warehouse_id:0
-msgid "Warehouse"
+msgid "Product Detail"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "New"
+#: report:purchase.requisition:0
+msgid "Qty"
msgstr ""
#. module: purchase_requisition
@@ -177,122 +123,140 @@ msgid "Purchase Requisition"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Sent to Suppliers"
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
+msgid "Purchase Requisition Line"
msgstr ""
#. module: purchase_requisition
-#: help:purchase.requisition,message_summary:0
-msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+#: view:purchase.order:0
+msgid "Purchase Orders with requisition"
+msgstr ""
+
+#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_product_product
+#: field:purchase.requisition.line,product_id:0
+msgid "Product"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Approved by Supplier"
+msgid "Quotations"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Send to Suppliers"
+msgid "Terms and Conditions"
msgstr ""
#. module: purchase_requisition
#: report:purchase.requisition:0
-msgid "Order Reference"
+#: field:purchase.requisition,description:0
+msgid "Description"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Order Date"
+#: field:purchase.requisition,message_unread:0
+msgid "Unread Messages"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_procurement_order
-msgid "Procurement"
+#: field:purchase.requisition,company_id:0
+#: field:purchase.requisition.line,company_id:0
+msgid "Company"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Requisition"
+#: view:purchase.requisition.partner:0
+msgid "Create Quotation"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:186
-#, python-format
-msgid "Purchase Requisition has been <b>created</b>."
+#: help:purchase.requisition,message_ids:0
+msgid "Messages and communication history"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
-msgid "Purchase Requisition Partner"
+#: view:purchase.requisition:0
+msgid "Approved by Supplier"
msgstr ""
#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
-msgid "Purchase orders"
+#: view:purchase.requisition.partner:0
+msgid "or"
msgstr ""
#. module: purchase_requisition
-#: selection:purchase.requisition,exclusive:0
-msgid "Purchase Requisition (exclusive)"
+#: view:purchase.requisition:0
+msgid "Reset to Draft"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Confirm Purchase Order"
+msgid "Current Purchase Requisition"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Start Date"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
+msgid "User"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "or"
+#: report:purchase.requisition:0
+msgid "Order Reference"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition.line,product_uom_id:0
-msgid "Product Unit of Measure"
+#: field:purchase.requisition,message_is_follower:0
+msgid "Is a Follower"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,state:0
-msgid "Status"
+#: field:purchase.requisition.line,product_qty:0
+msgid "Quantity"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Terms and Conditions"
+msgid "Unassigned Requisition"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.order:0
-msgid "Purchase Orders with requisition"
+#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
+#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
+msgid "Purchase Requisitions"
+msgstr ""
+
+#. module: purchase_requisition
+#: report:purchase.requisition:0
+msgid "Quotation Detail"
+msgstr ""
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "You have already one %s purchase order for this partner, you must cancel this purchase order to create a new quotation."
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Current Purchase Requisition"
+msgid "End Date"
msgstr ""
#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
-msgid "User"
+#: report:purchase.requisition:0
+#: field:purchase.requisition,name:0
+msgid "Requisition Reference"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,message_is_follower:0
-msgid "Is a Follower"
+#: field:purchase.requisition,line_ids:0
+msgid "Products to Purchase"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,message_comment_ids:0
-#: help:purchase.requisition,message_comment_ids:0
-msgid "Comments and emails"
+#: view:purchase.requisition:0
+#: selection:purchase.requisition,state:0
+msgid "Sent to Suppliers"
msgstr ""
#. module: purchase_requisition
@@ -307,158 +271,159 @@ msgid "No Product in Tender."
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Cancel Purchase Order"
+#: report:purchase.requisition:0
+msgid "Date Ordered"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,message_summary:0
-msgid "Summary"
+#: field:purchase.requisition,message_ids:0
+msgid "Messages"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "New Purchase Requisition"
+#: help:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive): On the confirmation of a purchase order, it cancels the remaining purchase order.\n"
+"Purchase Requisition(Multiple): It allows to have multiple purchase orders.On confirmation of a purchase order it does not cancel the remaining orders"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Quotations"
+msgid "Cancel Purchase Order"
msgstr ""
#. module: purchase_requisition
+#: model:ir.model,name:purchase_requisition.model_purchase_order
#: view:purchase.requisition:0
-msgid "Request a Quotation"
+msgid "Purchase Order"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:103
-#, python-format
-msgid "Purchase Requisition has been <b>cancelled</b>."
+#: field:purchase.requisition,origin:0
+msgid "Source Document"
msgstr ""
#. module: purchase_requisition
-#: field:procurement.order,requisition_id:0
-msgid "Latest Requisition"
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:41
+#, python-format
+msgid "Error!"
msgstr ""
#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Qty"
+#: field:purchase.requisition,exclusive:0
+msgid "Requisition Type"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:94
-#, python-format
-msgid "Draft Requisition has been <b>sent to suppliers</b>."
+#: view:purchase.requisition:0
+msgid "New Purchase Requisition"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition.partner:0
-msgid "Create Quotation"
+#: view:purchase.requisition:0
+msgid "Products"
msgstr ""
#. module: purchase_requisition
#: view:purchase.requisition:0
-msgid "Unassigned"
+msgid "Order Date"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: view:purchase.requisition.partner:0
-msgid "Cancel"
+#: selection:purchase.requisition,state:0
+msgid "Cancelled"
msgstr ""
#. module: purchase_requisition
-#: help:product.product,purchase_requisition:0
-msgid "Check this box to generates purchase requisition instead of generating requests for quotation from procurement."
+#: model:ir.model,name:purchase_requisition.model_purchase_requisition_partner
+msgid "Purchase Requisition Partner"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,purchase_ids:0
-msgid "Purchase Orders"
+#: help:purchase.requisition,message_unread:0
+msgid "If checked new messages require your attention."
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,origin:0
-msgid "Source Document"
+#: report:purchase.requisition:0
+msgid "Purchase for Requisitions"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: field:purchase.requisition,user_id:0
-msgid "Responsible"
+#: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
+msgid "Purchase orders"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-#: selection:purchase.requisition,state:0
-msgid "Purchase Done"
+#: field:purchase.requisition,date_end:0
+msgid "Requisition Deadline"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Purchase Requisition in negociation"
+#: field:purchase.requisition,message_summary:0
+msgid "Summary"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_purchase_requisition_line
-msgid "Purchase Requisition Line"
+#: view:purchase.requisition:0
+msgid "Reference"
msgstr ""
#. module: purchase_requisition
-#: model:ir.model,name:purchase_requisition.model_product_product
-#: field:purchase.requisition.line,product_id:0
-msgid "Product"
+#: model:ir.model,name:purchase_requisition.model_procurement_order
+msgid "Procurement"
msgstr ""
#. module: purchase_requisition
#: report:purchase.requisition:0
-#: field:purchase.requisition,description:0
-msgid "Description"
+#: view:purchase.requisition:0
+msgid "Source"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:97
-#, python-format
-msgid "Purchase Requisition has been set to <b>draft</b>."
+#: field:purchase.requisition,warehouse_id:0
+msgid "Warehouse"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "Unassigned Requisition"
+#: field:procurement.order,requisition_id:0
+msgid "Latest Requisition"
msgstr ""
#. module: purchase_requisition
-#: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
-#: model:ir.ui.menu,name:purchase_requisition.menu_purchase_requisition_pro_mgt
-msgid "Purchase Requisitions"
+#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
+msgid "Manager"
msgstr ""
#. module: purchase_requisition
-#: view:purchase.requisition:0
-msgid "End Date"
+#: selection:purchase.requisition,exclusive:0
+msgid "Purchase Requisition (exclusive)"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,line_ids:0
-msgid "Products to Purchase"
+#: help:purchase.requisition,message_summary:0
+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: purchase_requisition
#: report:purchase.requisition:0
-msgid "Date Ordered"
+msgid "Product UoM"
msgstr ""
#. module: purchase_requisition
-#: report:purchase.requisition:0
-#: field:purchase.requisition,name:0
-msgid "Requisition Reference"
+#: code:addons/purchase_requisition/purchase_requisition.py:134
+#, python-format
+msgid "Warning!"
msgstr ""
#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Product UoM"
+#: view:purchase.requisition:0
+msgid "Confirm Purchase Order"
+msgstr ""
+
+#. module: purchase_requisition
+#: view:purchase.requisition:0
+#: view:purchase.requisition.partner:0
+msgid "Cancel"
msgstr ""
#. module: purchase_requisition
@@ -468,28 +433,27 @@ msgid "Requisition Date"
msgstr ""
#. module: purchase_requisition
-#: help:purchase.requisition,message_ids:0
-msgid "Messages and communication history"
+#: view:purchase.requisition:0
+msgid "Start Date"
msgstr ""
#. module: purchase_requisition
-#: report:purchase.requisition:0
-msgid "Purchase for Requisitions"
+#: view:purchase.requisition:0
+msgid "Unassigned"
msgstr ""
#. module: purchase_requisition
-#: field:purchase.requisition,date_end:0
-msgid "Requisition Deadline"
+#: view:purchase.order:0
+msgid "Requisition"
msgstr ""
#. module: purchase_requisition
-#: code:addons/purchase_requisition/purchase_requisition.py:100
-#, python-format
-msgid "Purchase Requisition has been <b>done</b>."
+#: help:product.product,purchase_requisition:0
+msgid "Check this box to generates purchase requisition instead of generating requests for quotation from procurement."
msgstr ""
#. module: purchase_requisition
-#: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
-msgid "Manager"
+#: field:purchase.requisition,purchase_ids:0
+msgid "Purchase Orders"
msgstr ""
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index e5781a2f1d178bd7a961c78b551972455a55cfa0..2b60c079670b876395f57c1c9e3064e953247720 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot
index ceb1a2e74ad52a0916b8359806a2ebc06257dc46..53283ce7af91fa8d1e745cb5e6347437e4626888 100644
--- a/addons/report_webkit/i18n/report_webkit.pot
+++ b/addons/report_webkit/i18n/report_webkit.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -25,18 +25,13 @@ msgstr ""
msgid "Tabloid 29 279.4 x 431.8 mm"
msgstr ""
-#. module: report_webkit
-#: field:res.company,lib_path:0
-msgid "Webkit Executable Path"
-msgstr ""
-
#. module: report_webkit
#: selection:ir.header_webkit,format:0
msgid "Ledger 28 431.8 x 279.4 mm"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:234
+#: code:addons/report_webkit/webkit_report.py:233
#, python-format
msgid "No header defined for this Webkit report!"
msgstr ""
@@ -63,7 +58,7 @@ msgid "Company"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:235
+#: code:addons/report_webkit/webkit_report.py:234
#, python-format
msgid "Please set a header in company settings."
msgstr ""
@@ -110,12 +105,7 @@ msgid "A4 0 210 x 297 mm, 8.26 x 11.69 inches"
msgstr ""
#. module: report_webkit
-#: selection:ir.header_webkit,format:0
-msgid "B6 20 125 x 176 mm"
-msgstr ""
-
-#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:177
+#: code:addons/report_webkit/webkit_report.py:176
#, python-format
msgid "Webkit error"
msgstr ""
@@ -126,11 +116,11 @@ msgid "B2 17 500 x 707 mm"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:263
-#: code:addons/report_webkit/webkit_report.py:274
-#: code:addons/report_webkit/webkit_report.py:283
-#: code:addons/report_webkit/webkit_report.py:296
-#: code:addons/report_webkit/webkit_report.py:307
+#: code:addons/report_webkit/webkit_report.py:260
+#: code:addons/report_webkit/webkit_report.py:271
+#: code:addons/report_webkit/webkit_report.py:280
+#: code:addons/report_webkit/webkit_report.py:293
+#: code:addons/report_webkit/webkit_report.py:304
#, python-format
msgid "Webkit render!"
msgstr ""
@@ -315,7 +305,7 @@ msgid "B8 22 62 x 88 mm"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:178
+#: code:addons/report_webkit/webkit_report.py:177
#, python-format
msgid "The command 'wkhtmltopdf' failed with error code = %s. Message: %s"
msgstr ""
@@ -361,7 +351,7 @@ msgid "Right Margin (mm)"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
#, python-format
msgid "Webkit report template not found!"
msgstr ""
@@ -372,8 +362,8 @@ msgid "Orientation"
msgstr ""
#. module: report_webkit
-#: help:res.company,lib_path:0
-msgid "Full path to the wkhtmltopdf executable file. Version 0.9.9 is required. Install a static version of the library if you experience missing header/footers on Linux."
+#: selection:ir.header_webkit,format:0
+msgid "B6 20 125 x 176 mm"
msgstr ""
#. module: report_webkit
@@ -413,7 +403,7 @@ msgid "Webkit Logos"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:173
+#: code:addons/report_webkit/webkit_report.py:172
#, python-format
msgid "No diagnosis message was provided"
msgstr ""
@@ -481,7 +471,7 @@ msgid "Left Margin (mm)"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:229
+#: code:addons/report_webkit/webkit_report.py:228
#, python-format
msgid "Error!"
msgstr ""
@@ -502,7 +492,7 @@ msgid "ir.actions.report.xml"
msgstr ""
#. module: report_webkit
-#: code:addons/report_webkit/webkit_report.py:175
+#: code:addons/report_webkit/webkit_report.py:174
#, python-format
msgid "The following diagnosis message was provided:\n"
""
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 09af4e69ff9ed513a41fdcf4e9cdf610b775adf4..da12feb8de64001d450fc7d39367df3f64964f84 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -84,13 +84,13 @@ msgid "Resources"
msgstr ""
#. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
#, python-format
msgid "Make sure the Working time has been configured with proper week days!"
msgstr ""
#. module: resource
-#: code:addons/resource/resource.py:310
+#: code:addons/resource/resource.py:307
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -310,7 +310,7 @@ msgid "(vacation)"
msgstr ""
#. module: resource
-#: code:addons/resource/resource.py:392
+#: code:addons/resource/resource.py:389
#, python-format
msgid "Configuration Error!"
msgstr ""
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 95e3dfbd97819e97673f36bc4ccdb005efb7ff41..1dd573b9b4e879dcb684cfd200584dd73770c964 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,584 +16,591 @@ msgstr ""
"Plural-Forms: \n"
#. module: sale
-#: model:ir.model,name:sale.model_account_config_settings
-msgid "account.config.settings"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "UoS"
+#: view:board.board:0
+msgid "Sales Dashboard"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: view:sale.order:0
-#: field:sale.order,user_id:0
-#: view:sale.order.line:0
-#: field:sale.order.line,salesman_id:0
-#: view:sale.report:0
-#: field:sale.report,user_id:0
-msgid "Salesperson"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
+#, python-format
+msgid "There is no income account defined as global property."
msgstr ""
#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,day:0
-msgid "Day"
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-msgid "Cancel Order"
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
-#, python-format
-msgid "Incorrect Data"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
-#, python-format
-msgid "The value of Advance Amount must be positive."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
msgstr ""
#. module: sale
-#: help:sale.order,message_unread:0
-msgid "If checked new messages require your attention."
+#: view:sale.config.settings:0
+msgid "Product Features"
msgstr ""
#. module: sale
-#: view:res.partner:0
-msgid "False"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid "Allows to define your customer contracts conditions: invoicing\n"
+" method (fixed price, on timesheet, advance invoice), the exact pricing\n"
+" (650€/day for a developer), the duration (one year support contract).\n"
+" You will be able to follow the progress of the contract and invoice automatically.\n"
+" It installs the account_analytic_analysis module."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Tax"
+#: model:email.template,report_name:sale.email_template_edi_sale
+msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
msgstr ""
#. module: sale
-#: help:sale.order,state:0
-msgid "Gives the status of the quotation or sales order. \n"
-"The exception status is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\n"
-"The 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
msgstr ""
#. module: sale
-#: help:sale.order,message_summary:0
-msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Use multiple analytic accounts on sales"
msgstr ""
#. module: sale
-#: help:sale.config.settings,group_discount_per_so_line:0
-msgid "Allows you to apply some discount per sale order line."
+#: selection:sale.report,month:0
+msgid "March"
msgstr ""
#. module: sale
-#: help:sale.config.settings,group_sale_pricelist:0
-msgid "Allows to manage different prices based on rules per category of customers.\n"
-"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
+#: code:addons/sale/sale.py:559
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
msgstr ""
#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
+#: view:sale.order:0
+msgid "Quotation Number"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:662
-#, python-format
-msgid "Invoice <b>paid</b>."
+#: view:sale.order:0
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
msgstr ""
#. module: sale
-#: field:sale.config.settings,group_uom:0
-msgid "Allow using different units of measures"
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
msgstr ""
#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Percentage"
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:787
-#, python-format
-msgid "Please define income account for this product: \"%s\" (id:%d)."
+#: model:mail.message.subtype,description:sale.mt_order_confirmed
+msgid "Quotation confirmed"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,price_total:0
-msgid "Total Price"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
msgstr ""
#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
+#: view:sale.order:0
+msgid "Quotation "
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
msgstr ""
#. module: sale
-#: help:sale.config.settings,timesheet:0
-msgid "For modifying account analytic view to show important data to project manager of services companies.\n"
-" You can also view the report of account analytic summary user-wise as well as month wise.\n"
-" This installs the module account_analytic_analysis."
+#: field:sale.order,partner_shipping_id:0
+msgid "Delivery Address"
msgstr ""
#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
msgstr ""
#. module: sale
-#: field:sale.order,name:0
-#: field:sale.order.line,order_id:0
-msgid "Order Reference"
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning!"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Invoicing Process"
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Sales Order done"
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-#: view:res.partner:0
-msgid "Quotations and Sales"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
msgstr ""
#. module: sale
-#: help:sale.config.settings,group_uom:0
-msgid "Allows you to select and maintain different units of measure for products."
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:293
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:101
#, python-format
-msgid "Pricelist Warning!"
+msgid "Incorrect Data"
msgstr ""
#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:102
+#, python-format
+msgid "The value of Advance Amount must be positive."
msgstr ""
#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Create & View Invoice"
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sales order line."
msgstr ""
#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
+#: view:sale.order.line:0
+msgid "Sales Order Lines that are in 'done' state"
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_warning:0
-msgid "Allow configuring alerts by customer or products"
+#: selection:sale.order.line,type:0
+msgid "on order"
msgstr ""
#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
+#: field:sale.order,message_ids:0
+msgid "Messages"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid "<p>\n"
-" Here is a list of each sales order line to be invoiced. You can\n"
-" invoice sales orders partially, by lines of sales order. You do\n"
-" not need this list if you invoice from the delivery orders or\n"
-" if you invoice sales totally.\n"
-" </p>\n"
-" "
+#: field:sale.report,state:0
+msgid "Order Status"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Quotation "
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
-#, python-format
-msgid "Advance of %s %%"
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
-msgid "Sales in Exception"
+#: field:sale.config.settings,module_project:0
+msgid "Project"
msgstr ""
#. module: sale
-#: help:sale.order.line,address_allotment_id:0
-msgid "A partner to whom the particular product needs to be allotted."
+#: code:addons/sale/sale.py:360
+#: code:addons/sale/sale.py:501
+#: code:addons/sale/sale.py:592
+#: code:addons/sale/sale.py:755
+#: code:addons/sale/sale.py:772
+#, python-format
+msgid "Error!"
msgstr ""
#. module: sale
-#: view:sale.order:0
-#: field:sale.order,state:0
-#: view:sale.order.line:0
-#: field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "Status"
+#: report:sale.order:0
+msgid "Net Total :"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
+#: help:sale.order.line,type:0
+msgid "From stock: When needed, the product is taken from the stock or we wait for replenishment.\n"
+"On order: When needed, the product is purchased or produced."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_orders
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a quotation that can be converted into a sale\n"
-" order.\n"
-" </p><p>\n"
-" OpenERP will help you efficiently handle the complete sales flow:\n"
-" quotation, sale order, delivery, invoicing and payment.\n"
-" </p>\n"
-" "
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid "Allows you to define what is the default function of a specific user on a given account.\n"
+" This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.\n"
+" But the possibility to change these values is still available.\n"
+" This installs the module analytic_user_function."
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
msgstr ""
#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
+#: model:ir.model,name:sale.model_mail_compose_message
+msgid "Email composition wizard"
msgstr ""
#. module: sale
-#: field:sale.order,message_summary:0
-msgid "Summary"
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "View Invoice"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
-#, python-format
-msgid "Advance of %s %s"
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
-#: view:sale.order:0
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
#: view:sale.report:0
-msgid "Quotations"
+#: field:sale.report,shop_id:0
+msgid "Shop"
msgstr ""
#. module: sale
-#: field:sale.advance.payment.inv,qtty:0
-#: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity"
+#: model:ir.actions.act_window,name:sale.action_orders_exception
+msgid "Sales in Exception"
msgstr ""
#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Delivery address for current sales order."
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
+#: view:res.partner:0
+msgid "False"
msgstr ""
#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid "Use All to create the final invoice.\n"
+" Use Percentage to invoice a percentage of the total amount.\n"
+" Use Fixed Price to invoice a specific amound in advance.\n"
+" Use Some Order Lines to invoice a selection of the sales order lines."
msgstr ""
#. module: sale
-#: selection:sale.report,state:0
-msgid "In Progress"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:667
-#, python-format
-msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+#: report:sale.order:0
+msgid "Tax"
msgstr ""
#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid "The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."
+#: code:addons/sale/sale.py:270
+#: code:addons/sale/sale.py:812
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Invalid Action!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:843
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced."
+#: help:sale.order,state:0
+msgid "Gives the status of the quotation or sales order. \n"
+"The exception status is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception).\n"
+"The 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
msgstr ""
#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_config_settings
-msgid "sale.config.settings"
+#: help:sale.order,message_summary:0
+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: sale
-#: selection:sale.order,order_policy:0
-msgid "Before Delivery"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:804
-#, python-format
-msgid "There is no Fiscal Position defined or Income category account defined for default properties of Product categories."
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_delivery_invoice_address
-msgid "Addresses in Sale Orders"
+#: report:sale.order:0
+msgid "Fax :"
msgstr ""
#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract / Analytic"
+#: code:addons/sale/sale.py:270
+#, python-format
+msgid "In order to delete a confirmed sales order, you must cancel it before !"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_invoice_so_lines
-msgid "Enable Invoicing Sale order lines"
+#: view:sale.order:0
+msgid "(update)"
msgstr ""
#. module: sale
+#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
-msgid "Ordered month of the sales order"
+#: field:sale.report,partner_id:0
+msgid "Partner"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:496
-#, python-format
-msgid "You cannot group sales having different currencies for the same partner."
+#: view:sale.config.settings:0
+msgid "Contract Features"
msgstr ""
#. module: sale
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "or"
+#: code:addons/sale/sale.py:280
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#, python-format
+msgid "Sales Order"
msgstr ""
#. module: sale
-#: field:sale.order,invoice_exists:0
-#: field:sale.order,invoiced_rate:0
-#: field:sale.order.line,invoiced:0
-msgid "Invoiced"
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sales order lines"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_analytic_accounting
-msgid "Analytic Accounting for Sales"
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
msgstr ""
#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
msgstr ""
#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sales order has at least one invoice."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-msgid "Invoice Order"
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid "Allows to manage different prices based on rules per category of customers.\n"
+"Example: 10% for retailers, promotion of 5 EUR on this product, etc."
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
msgstr ""
#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_read
-msgid "Sale: Mark read"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sales order"
msgstr ""
#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_sale_journal:0
-msgid "Allow batch invoicing of delivery orders through journals"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
msgstr ""
#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
msgstr ""
#. module: sale
-#: field:sale.config.settings,group_discount_per_so_line:0
-msgid "Allow setting a discount on the sale order lines"
+#: code:addons/sale/sale.py:812
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
msgstr ""
#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Unit of Measure "
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
msgstr ""
#. module: sale
-#: field:sale.config.settings,time_unit:0
-msgid "The default working time unit for services is"
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
msgstr ""
#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
+#: model:mail.message.subtype,name:sale.mt_order_confirmed
+msgid "Sales Order Confirmed"
msgstr ""
#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
msgstr ""
#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "All items in these order lines will be invoiced. You can also invoice a percentage of the sale order \n"
-" or a fixed price (for advances) directly from the sale order form if you prefer."
+#: view:sale.order:0
+msgid "Print"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "(update)"
+#: report:sale.order:0
+msgid "Order N°"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-msgid "Sales Order Line"
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_analytic_user_function:0
-msgid "One employee can have different roles per contract"
+#: report:sale.order:0
+msgid "Disc.(%)"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Print"
+#: code:addons/sale/sale.py:756
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
msgstr ""
#. module: sale
-#: view:sale.order:0
-#: field:sale.order,order_line:0
-msgid "Order Lines"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
msgstr ""
#. module: sale
-#: field:account.config.settings,module_sale_analytic_plans:0
-msgid "Use multiple analytic accounts on sales"
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sales orders."
msgstr ""
#. module: sale
@@ -604,670 +611,625 @@ msgid "Allows you to categorize your sales and deliveries (picking lists) betwee
msgstr ""
#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:659
-#, python-format
-msgid "Sale Order for <em>%s</em> set to <b>Done</b>"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Total :"
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
+#: help:sale.config.settings,timesheet:0
+msgid "For modifying account analytic view to show important data to project manager of services companies.\n"
+" You can also view the report of account analytic summary user-wise as well as month wise.\n"
+" This installs the module account_analytic_analysis."
msgstr ""
#. module: sale
-#: field:sale.order,pricelist_id:0
-#: field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
+#: field:sale.order,create_date:0
+msgid "Creation Date"
msgstr ""
#. module: sale
-#: help:sale.order.line,state:0
-msgid "* The 'Draft' status is set when the related sales order in draft status. \n"
-"* The 'Confirmed' status is set when the related sales order is confirmed. \n"
-"* The 'Exception' status is set when the related sales order is set as exception. \n"
-"* The 'Done' status is set when the sales order line has been picked. \n"
-"* The 'Cancelled' status is set when a user cancel the sales order related."
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:92
-#, python-format
-msgid "There is no income account defined as global property."
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:984
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
-#, python-format
-msgid "Configuration Error!"
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Send by Email"
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
msgstr ""
#. module: sale
-#: code:addons/sale/res_config.py:89
-#, python-format
-msgid "Hour"
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sales Orders"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Shipped"
+#: report:sale.order:0
+msgid "Total :"
msgstr ""
#. module: sale
-#: help:sale.config.settings,group_invoice_so_lines:0
-msgid "To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."
+#: view:sale.order.line:0
+msgid "Sales Order Lines ready to be invoiced"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_res_partner
#: view:sale.report:0
-#: field:sale.report,partner_id:0
-msgid "Partner"
+msgid "My Sales"
msgstr ""
#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Create and View Invoice"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to define a new sale shop.\n"
-" </p><p>\n"
-" Each quotation or sale order must be linked to a shop. The\n"
-" shop also defines the warehouse from which the products will be\n"
-" delivered for each particular sales.\n"
-" </p>\n"
-" "
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: selection:sale.report,month:0
+msgid "July"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:590
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
+#: help:sale.order.line,state:0
+msgid "* The 'Draft' status is set when the related sales order in draft status. \n"
+"* The 'Confirmed' status is set when the related sales order is confirmed. \n"
+"* The 'Exception' status is set when the related sales order is set as exception. \n"
+"* The 'Done' status is set when the sales order line has been picked. \n"
+"* The 'Cancelled' status is set when a user cancel the sales order related."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:966
-#, python-format
-msgid "You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.config.settings:0
+msgid "Default Options"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,categ_id:0
-msgid "Category of Product"
+#: code:addons/sale/sale.py:953
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:91
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:95
+#, python-format
+msgid "Configuration Error!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:555
-#, python-format
-msgid "Cannot cancel this sales order!"
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "Recreate Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:263
-#, python-format
-msgid "In order to delete a confirmed sale order, you must cancel it before !"
+#: view:sale.advance.payment.inv:0
+msgid "After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
+#: view:sale.order:0
+msgid "Send by Email"
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Demand"
+#: code:addons/sale/edi/sale_order.py:140
+#, python-format
+msgid "EDI Pricelist (%s)"
msgstr ""
#. module: sale
-#: field:sale.order,currency_id:0
-msgid "unknown"
+#: selection:sale.order,order_policy:0
+msgid "On Delivery Order"
msgstr ""
#. module: sale
-#: field:sale.order,message_is_follower:0
-msgid "Is a Follower"
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
msgstr ""
#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
+#: view:sale.order:0
+msgid "Order Date"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
+#: view:sale.order:0
+msgid "Sales Order done"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
+#: code:addons/sale/sale.py:361
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
msgstr ""
#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid "Select a product of type service which is called 'Advance Product'.\n"
-" You may have to create it and set it as a default value on this field."
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
msgstr ""
#. module: sale
-#: help:sale.config.settings,module_warning:0
-msgid "Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer.\n"
-"Example: Product: this product is deprecated, do not purchase more than 5.\n"
-" Supplier: don't forget to ask for an express delivery."
+#: field:sale.order,invoiced:0
+msgid "Paid"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:979
-#, python-format
-msgid "No valid pricelist line found ! :"
+#: help:sale.config.settings,group_uom:0
+msgid "Allows you to select and maintain different units of measure for products."
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_sale_margin:0
-msgid "Display margins on sales orders"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
msgstr ""
#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
+#: view:sale.order.line:0
+msgid "Sales order lines done"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
msgstr ""
#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancel0
-#: view:sale.advance.payment.inv:0
-#: view:sale.make.invoice:0
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.order.line.make.invoice:0
-msgid "Cancel"
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
msgstr ""
#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
+#: code:addons/sale/sale.py:300
+#, python-format
+msgid "Pricelist Warning!"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:976
-#, python-format
-msgid "Cannot find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
msgstr ""
#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#, 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"
+"2.The Sales Order Line is Invoiced!"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
+#: view:sale.order.line.make.invoice:0
+msgid "Create & View Invoice"
msgstr ""
#. module: sale
-#: help:sale.config.settings,module_sale_stock:0
-msgid "Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock.\n"
-" This installs the module sale_stock."
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
msgstr ""
#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Price"
+#: selection:sale.report,month:0
+msgid "December"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Quotation Number"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
msgstr ""
#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
+#: view:sale.order.line:0
+msgid "Shipped"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
msgstr ""
#. module: sale
-#: help:account.config.settings,group_analytic_account_for_sales:0
-msgid "Allows you to specify an analytic account on sale orders."
+#: field:sale.order,currency_id:0
+msgid "Currency"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
+#: view:sale.order.line:0
+msgid "Uninvoiced"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:647
-#, python-format
-msgid "Quotation for <em>%s</em> <b>created</b>."
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
msgstr ""
#. module: sale
-#: help:sale.order,message_ids:0
-msgid "Messages and communication history"
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "Cannot cancel this sales order!"
msgstr ""
#. module: sale
#: view:sale.order:0
-msgid "New Copy of Quotation"
+msgid "Recreate Invoice"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'."
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_mrp_properties
-msgid "Properties on lines"
+#: field:sale.shop,name:0
+msgid "Shop Name"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:888
-#, python-format
-msgid "Before choosing a product,\n"
-" select a customer in the sales form."
+#: view:sale.order:0
+msgid "My Sales Orders"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
+#: report:sale.order:0
+msgid "Taxes :"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
+#: field:sale.order,invoice_exists:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
msgstr ""
#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#, python-format
+msgid "Advance Invoice"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Order Lines to Invoice"
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid "To allow your salesman to make invoices for sales order lines using the menu 'Lines to Invoice'."
msgstr ""
#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-#: view:sale.report:0
-msgid "Group By..."
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Product Features"
+#: code:addons/sale/sale.py:592
+#, python-format
+msgid "You cannot confirm a sales order which has no line."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
#: selection:sale.report,state:0
-msgid "Waiting Schedule"
+msgid "In Progress"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-#: field:sale.report,product_uom:0
-msgid "Unit of Measure"
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "No Customer Defined !"
msgstr ""
#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Trigger delivery orders automatically from sales orders"
msgstr ""
#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Invoice the whole sale order"
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
msgstr ""
#. module: sale
-#: view:sale.order:0
-#: field:sale.order,message_unread:0
-msgid "Unread Messages"
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-msgid "Draft Quotation"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:106
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,address_allotment_id:0
+msgid "A partner to whom the particular product needs to be allotted."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract / Analytic"
msgstr ""
#. module: sale
#: selection:sale.order,state:0
-msgid "Sale Order"
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
msgstr ""
#. module: sale
-#: field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
+#: field:sale.order,note:0
+msgid "Terms and conditions"
msgstr ""
#. module: sale
+#: model:ir.actions.act_window,name:sale.action_orders
+#: model:ir.ui.menu,name:sale.menu_sale_order
#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
+msgid "Sales Orders"
msgstr ""
#. module: sale
-#: help:sale.config.settings,module_analytic_user_function:0
-msgid "Allows you to define what is the default function of a specific user on a given account.\n"
-" This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.\n"
-" But the possibility to change these values is still available.\n"
-" This installs the module analytic_user_function."
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
msgstr ""
#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
+#: field:sale.order,invoiced_rate:0
+msgid "Invoiced Ratio"
msgstr ""
#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:263
-#: code:addons/sale/sale.py:843
-#: code:addons/sale/sale.py:1007
-#, python-format
-msgid "Invalid Action!"
+#: selection:sale.report,month:0
+msgid "August"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
msgstr ""
#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
+#: view:sale.order.line:0
+msgid "To Do"
msgstr ""
#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
+#: selection:sale.report,month:0
+msgid "June"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:294
-#, python-format
-msgid "If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated."
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to define a new sale shop.\n"
+" </p><p>\n"
+" Each quotation or sales order must be linked to a shop. The\n"
+" shop also defines the warehouse from which the products will be\n"
+" delivered for each particular sales.\n"
+" </p>\n"
+" "
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-msgid "Make Invoices"
+#: view:sale.order.line:0
+msgid "Order"
msgstr ""
#. module: sale
-#: field:res.partner,sale_order_count:0
-msgid "# of Sales Order"
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
msgstr ""
#. module: sale
-#: view:sale.order:0
#: view:sale.order.line:0
-msgid "To Invoice"
+msgid "Sales Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
msgstr ""
#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
#: view:sale.report:0
-msgid "Ordered Year of the sales order"
+#: field:sale.report,user_id:0
+msgid "Salesperson"
msgstr ""
#. module: sale
#: selection:sale.report,month:0
-msgid "July"
+msgid "November"
msgstr ""
#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu."
+#: view:sale.report:0
+msgid "Extended Filters..."
msgstr ""
#. module: sale
-#: help:sale.order,invoice_exists:0
-msgid "It indicates that sale order has at least one invoice."
+#: model:process.node,name:sale.process_node_quotation0
+#: view:sale.order:0
+#: selection:sale.report,state:0
+msgid "Quotation"
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Shipping Exception"
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
msgstr ""
#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
+#: selection:sale.order.line,state:0
+msgid "Exception"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:651
-#, python-format
-msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+#: selection:sale.report,month:0
+msgid "October"
msgstr ""
#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Invoice Sale Order"
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid "The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'."
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Contracts Management"
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,month:0
-msgid "Month"
+#: help:sale.config.settings,module_sale_stock:0
+msgid "Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock.\n"
+" This installs the module sale_stock."
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
+#: help:sale.advance.payment.inv,product_id:0
+msgid "Select a product of type service which is called 'Advance Product'.\n"
+" You may have to create it and set it as a default value on this field."
msgstr ""
#. module: sale
-#: view:sale.make.invoice:0
-#: view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: selection:sale.report,month:0
+msgid "January"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sales order lines"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+msgid "Sales Order in Progress"
msgstr ""
#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
+#: view:sale.order.line.make.invoice:0
+msgid "All items in these order lines will be invoiced. You can also invoice a percentage of the sales order\n"
+" or a fixed price (for advances) directly from the sales order form if you prefer."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all
-#: view:sale.report:0
-msgid "Sales Analysis"
+#: help:sale.config.settings,module_warning:0
+msgid "Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer.\n"
+"Example: Product: this product is deprecated, do not purchase more than 5.\n"
+" Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
msgstr ""
#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
#: view:sale.order:0
-#: selection:sale.report,state:0
-msgid "Quotation"
+msgid "View Invoice"
msgstr ""
#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid "The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_html:sale.email_template_edi_sale
-msgid "\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
-"\n"
-" <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>\n"
-" \n"
-" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
-"\n"
-" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-" <strong>REFERENCES</strong><br />\n"
-" Order number: <strong>${object.name}</strong><br />\n"
-" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
-" Order date: ${object.date_order}<br />\n"
-" % if object.origin:\n"
-" Order reference: ${object.origin}<br />\n"
-" % endif\n"
-" % if object.client_order_ref:\n"
-" Your reference: ${object.client_order_ref}<br />\n"
-" % endif\n"
-" % if object.user_id:\n"
-" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
-" % endif\n"
-" </p>\n"
-"\n"
-" % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state != 'draft':\n"
-" <%\n"
-" comp_name = quote(object.company_id.name)\n"
-" order_name = quote(object.name)\n"
-" paypal_account = quote(object.company_id.paypal_account)\n"
-" order_amount = quote(str(object.amount_total))\n"
-" cur_name = quote(object.pricelist_id.currency_id.name)\n"
-" paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s\" \\\n"
-" \"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1\" \\\n"
-" \"&bn=OpenERP_Order_PayNow_%s\" % \\\n"
-" (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)\n"
-" %>\n"
-" <br/>\n"
-" <p>It is also possible to directly pay with Paypal:</p>\n"
-" <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
-" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-" </a>\n"
-" % endif\n"
-"\n"
-" <br/>\n"
-" <p>If you have any question, do not hesitate to contact us.</p>\n"
-" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-" <br/>\n"
-" <br/>\n"
-" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
-" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;\">\n"
-" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-" </div>\n"
-" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
-" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-" % if object.company_id.street:\n"
-" ${object.company_id.street}<br/>\n"
-" % endif\n"
-" % if object.company_id.street2:\n"
-" ${object.company_id.street2}<br/>\n"
-" % endif\n"
-" % if object.company_id.city or object.company_id.zip:\n"
-" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
-" % endif\n"
-" </span>\n"
-" % if object.company_id.phone:\n"
-" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
-" Phone: ${object.company_id.phone}\n"
-" </div>\n"
-" % endif\n"
-" % if object.company_id.website:\n"
-" <div>\n"
-" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-" </div>\n"
-" %endif\n"
-" <p></p>\n"
-" </div>\n"
-"</div>\n"
-" "
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
msgstr ""
#. module: sale
@@ -1276,782 +1238,769 @@ msgid "Use pricelists to adapt your price per customers"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid "The sale order will automatically create the invoice proposition (draft invoice). You have to choose if you want your invoice based on ordered "
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid "The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:435
+#: code:addons/sale/sale.py:935
#, python-format
-msgid "Customer Invoices"
+msgid "You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
-#: view:sale.order:0
-#: view:sale.report:0
-msgid "Sales"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
msgstr ""
#. module: sale
-#: help:sale.config.settings,module_sale_margin:0
-msgid "This adds the 'Margin' on sales order.\n"
-" This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n"
-" This installs the module sale_margin."
+#: code:addons/sale/sale.py:948
+#, python-format
+msgid "No valid pricelist line found ! :"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:113
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:115
+#, python-format
+msgid "Advance of %s %s"
msgstr ""
#. module: sale
-#: view:sale.order:0
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Done"
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
-#: model:process.node,name:sale.process_node_invoice0
+#: model:ir.actions.act_window,name:sale.action_quotations
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
#: view:sale.order:0
-#, python-format
-msgid "Invoice"
+#: view:sale.report:0
+msgid "Quotations"
msgstr ""
#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
+#: view:sale.order:0
+msgid "Ignore Exception"
msgstr ""
#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
+#: help:sale.order,partner_shipping_id:0
+msgid "Delivery address for current sales order."
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-#: field:sale.order.line,product_id:0
-#: view:sale.report:0
-#: field:sale.report,product_id:0
-msgid "Product"
+#: help:sale.order,invoice_ids:0
+msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
msgstr ""
#. module: sale
-#: field:sale.config.settings,group_invoice_so_lines:0
-msgid "Generate invoices based on the sale order lines"
+#: report:sale.order:0
+msgid "Your Reference"
msgstr ""
#. module: sale
-#: help:sale.order,order_policy:0
-msgid "On demand: A draft invoice can be created from the sales order when needed. \n"
-"On delivery order: A draft invoice can be created from the delivery order when the products have been delivered. \n"
-"Before delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
msgstr ""
#. module: sale
-#: view:account.invoice.report:0
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: field:sale.report,date:0
+msgid "Date Order"
msgstr ""
#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
msgstr ""
#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Fixed price (deposit)"
+#: report:sale.order:0
+msgid "TVA :"
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
+#: code:addons/sale/sale.py:441
+#, python-format
+msgid "Customer Invoices"
msgstr ""
#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
msgstr ""
#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
msgstr ""
#. module: sale
-#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
-msgid "Sale: Mark unread"
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
+#: code:addons/sale/sale.py:301
+#, python-format
+msgid "If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated."
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Confirm Sale"
+#: view:sale.order.line:0
+msgid "Qty"
msgstr ""
#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
+#: selection:sale.order.line,type:0
+msgid "from stock"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
+#: report:sale.order:0
+msgid "Quotation Date"
msgstr ""
#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid "Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
msgstr ""
#. module: sale
-#: selection:sale.advance.payment.inv,advance_payment_method:0
-msgid "Some order lines"
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
msgstr ""
#. module: sale
-#: view:res.partner:0
-msgid "sale.group_delivery_invoice_address"
+#: report:sale.order:0
+msgid "Invoice address :"
msgstr ""
#. module: sale
-#: model:res.groups,name:sale.group_discount_per_so_line
-msgid "Discount on lines"
+#: code:addons/sale/wizard/sale_line_invoice.py:124
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+#, python-format
+msgid "Invoice"
msgstr ""
#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
msgstr ""
#. module: sale
-#: field:sale.order,amount_total:0
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
#: view:sale.order.line:0
-msgid "Total"
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
msgstr ""
#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Select how you want to invoice this order. This\n"
-" will create a draft invoice that can be modified\n"
-" before validation."
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
msgstr ""
#. module: sale
-#: view:board.board:0
-msgid "Sales Dashboard"
+#: code:addons/sale/sale.py:937
+#, python-format
+msgid "No Pricelist ! : "
msgstr ""
#. module: sale
-#: help:sale.advance.payment.inv,advance_payment_method:0
-msgid "Use All to create the final invoice.\n"
-" Use Percentage to invoice a percentage of the total amount.\n"
-" Use Fixed Price to invoice a specific amound in advance.\n"
-" Use Some Order Lines to invoice a selection of the sale order lines."
+#: view:sale.order:0
+msgid "Sales Order "
msgstr ""
#. module: sale
-#: help:sale.config.settings,module_account_analytic_analysis:0
-msgid "Allows to define your customer contracts conditions: invoicing\n"
-" method (fixed price, on timesheet, advance invoice), the exact pricing\n"
-" (650€/day for a developer), the duration (one year support contract).\n"
-" You will be able to follow the progress of the contract and invoice automatically.\n"
-" It installs the account_analytic_analysis module."
+#: model:mail.message.subtype,description:sale.mt_order_sent
+#: model:mail.message.subtype,name:sale.mt_order_sent
+msgid "Quotation send"
msgstr ""
#. module: sale
-#: model:email.template,report_name:sale.email_template_edi_sale
-msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
msgstr ""
#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:556
-#, python-format
-msgid "First cancel all invoices attached to this sales order."
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
msgstr ""
#. module: sale
-#: field:sale.order,company_id:0
-#: field:sale.order.line,company_id:0
-#: view:sale.report:0
-#: field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid "<p>\n"
+" Here is a list of each sales order line to be invoiced. You can\n"
+" invoice sales orders partially, by lines of sales order. You do\n"
+" not need this list if you invoice from the delivery orders or\n"
+" if you invoice sales totally.\n"
+" </p>\n"
+" "
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.report,state:0
-msgid "Invoice Exception"
+#: report:sale.order:0
+msgid "Shipping address :"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:502
#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Delivery Address"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Sale to Invoice"
+msgid "You cannot group sales having different currencies for the same partner."
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Warehouse Features"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sales Order"
msgstr ""
#. module: sale
-#: field:sale.order,message_ids:0
-msgid "Messages"
+#: help:sale.order,invoice_quantity:0
+msgid "The sales order will automatically create the invoice proposition (draft invoice). You have to choose if you want your invoice based on ordered "
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_project:0
-msgid "Project"
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:354
-#: code:addons/sale/sale.py:495
-#: code:addons/sale/sale.py:590
-#: code:addons/sale/sale.py:786
-#: code:addons/sale/sale.py:803
+#: code:addons/sale/sale.py:945
#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid "From stock: When needed, the product is taken from the stock or we wait for replenishment.\n"
-"On order: When needed, the product is purchased or produced."
+msgid "Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
msgstr ""
#. module: sale
-#: selection:sale.order,state:0
-#: selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "Quotation Sent"
+msgid "Create Invoice"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_mail_compose_message
-msgid "Email composition wizard"
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: field:sale.order,shop_id:0
-#: view:sale.report:0
-#: field:sale.report,shop_id:0
-msgid "Shop"
+#: view:sale.order.line:0
+msgid "Order reference"
msgstr ""
#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:355
-#, python-format
-msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Contract Features"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
-#: model:res.request.link,name:sale.req_link_sale_order
#: view:sale.order:0
-#, python-format
-msgid "Sales Order"
+msgid "Other Information"
msgstr ""
#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+" <p>Hello ${object.partner_id.name},</p>\n"
+" \n"
+" <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+" <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+" <strong>REFERENCES</strong><br />\n"
+" Order number: <strong>${object.name}</strong><br />\n"
+" Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
+" Order date: ${object.date_order}<br />\n"
+" % if object.origin:\n"
+" Order reference: ${object.origin}<br />\n"
+" % endif\n"
+" % if object.client_order_ref:\n"
+" Your reference: ${object.client_order_ref}<br />\n"
+" % endif\n"
+" % if object.user_id:\n"
+" Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+" % endif\n"
+" </p>\n"
+"\n"
+" % if object.paypal_url:\n"
+" <br/>\n"
+" <p>It is also possible to directly pay with Paypal:</p>\n"
+" <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+" <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+" </a>\n"
+" % endif\n"
+"\n"
+" <br/>\n"
+" <p>If you have any question, do not hesitate to contact us.</p>\n"
+" <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+" <br/>\n"
+" <br/>\n"
+" <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+" <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #DDD;\">\n"
+" <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+" </div>\n"
+" <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+" <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+" % if object.company_id.street:\n"
+" ${object.company_id.street}<br/>\n"
+" % endif\n"
+" % if object.company_id.street2:\n"
+" ${object.company_id.street2}<br/>\n"
+" % endif\n"
+" % if object.company_id.city or object.company_id.zip:\n"
+" ${object.company_id.zip} ${object.company_id.city}<br/>\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 ''}<br/>\n"
+" % endif\n"
+" </span>\n"
+" % if object.company_id.phone:\n"
+" <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+" Phone: ${object.company_id.phone}\n"
+" </div>\n"
+" % endif\n"
+" % if object.company_id.website:\n"
+" <div>\n"
+" Web : <a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+" </div>\n"
+" %endif\n"
+" <p></p>\n"
+" </div>\n"
+"</div>\n"
+" "
msgstr ""
#. module: sale
#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,note:0
-msgid "Terms and conditions"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,message_follower_ids:0
-msgid "Followers"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
+#: field:sale.order.line,product_id:0
#: view:sale.report:0
-#: field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Sales Order Lines"
+#: field:sale.report,product_id:0
+msgid "Product"
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Default Options"
+#: help:sale.order,amount_total:0
+msgid "The total amount."
msgstr ""
#. module: sale
-#: field:account.config.settings,group_analytic_account_for_sales:0
-msgid "Analytic accounting for sales"
+#: view:sale.order:0
+msgid "Confirm Sale"
msgstr ""
#. module: sale
-#: code:addons/sale/edi/sale_order.py:139
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a quotation or sale order for this customer.\n"
-" </p><p>\n"
-" OpenERP will help you efficiently handle the complete sale flow:\n"
-" quotation, sale order, delivery, invoicing and\n"
-" payment.\n"
-" </p><p>\n"
-" The social feature helps you organize discussions on each sale\n"
-" order, and allow your customer to keep track of the evolution\n"
-" of the sale order.\n"
-" </p>\n"
-" "
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
msgstr ""
#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "On Delivery Order"
+#: selection:sale.report,month:0
+msgid "May"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Reference Unit of Measure"
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} ${object.state in ('draft', 'sent') and 'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_quotations
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-" Click to create a quotation, the first step of a new sale.\n"
-" </p><p>\n"
-" OpenERP will help you handle efficiently the complete sale flow:\n"
-" from the quotation to the sale order, the\n"
-" delivery, the invoicing and the payment collection.\n"
-" </p><p>\n"
-" The social feature helps you organize discussions on each sale\n"
-" order, and allow your customers to keep track of the evolution\n"
-" of the sale order.\n"
-" </p>\n"
-" "
+#: report:sale.order:0
+msgid "Price"
msgstr ""
#. module: sale
-#: 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"
-"2.The Sales Order Line is Invoiced!"
+#: help:sale.order,order_policy:0
+msgid "On demand: A draft invoice can be created from the sales order when needed. \n"
+"On delivery order: A draft invoice can be created from the delivery order when the products have been delivered. \n"
+"Before delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid "This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application."
msgstr ""
#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
msgstr ""
#. module: sale
-#: field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: report:sale.order:0
+msgid "Tel. :"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: view:sale.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:96
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+#: model:ir.actions.act_window,help:sale.action_quotations
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a quotation, the first step of a new sale.\n"
+" </p><p>\n"
+" OpenERP will help you handle efficiently the complete sale flow:\n"
+" from the quotation to the sales order, the\n"
+" delivery, the invoicing and the payment collection.\n"
+" </p><p>\n"
+" The social feature helps you organize discussions on each sales\n"
+" order, and allow your customers to keep track of the evolution\n"
+" of the sales order.\n"
+" </p>\n"
+" "
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: code:addons/sale/sale.py:773
+#, python-format
+msgid "There is no Fiscal Position defined or Income category account defined for default properties of Product categories."
msgstr ""
#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
-#, python-format
-msgid "Advance Invoice"
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
msgstr ""
#. module: sale
-#: model:ir.actions.client,name:sale.action_client_sale_menu
-msgid "Open Sale Menu"
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
msgstr ""
#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
+#: view:sale.order:0
+msgid "Order Number"
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_sale_stock:0
-msgid "Trigger delivery orders automatically from sale orders"
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
msgstr ""
#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Sale Order "
+#: selection:sale.report,month:0
+msgid "February"
msgstr ""
#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: model:ir.actions.act_window,help:sale.action_orders
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a quotation that can be converted into a sales\n"
+" order.\n"
+" </p><p>\n"
+" OpenERP will help you efficiently handle the complete sales flow:\n"
+" quotation, sales order, delivery, invoicing and payment.\n"
+" </p>\n"
+" "
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-msgid "Email Templates"
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Sales Orders"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
msgstr ""
#. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sales Shop"
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
msgstr ""
#. module: sale
#: selection:sale.report,month:0
-msgid "November"
+msgid "September"
msgstr ""
#. module: sale
-#: field:sale.order,message_comment_ids:0
-#: help:sale.order,message_comment_ids:0
-msgid "Comments and emails"
+#: report:sale.order:0
+msgid "Date Ordered"
msgstr ""
#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
+#: selection:sale.order,order_policy:0
+msgid "Before Delivery"
msgstr ""
#. module: sale
-#: help:sale.order.line,sequence:0
-msgid "Gives the sequence order when displaying a list of sales order lines."
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
-msgid "Sales Order in Progress"
+#: field:sale.order,origin:0
+msgid "Source Document"
msgstr ""
#. module: sale
-#: field:sale.config.settings,timesheet:0
-msgid "Prepare invoices based on timesheets"
+#: selection:sale.report,month:0
+msgid "April"
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
msgstr ""
#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
+#: code:addons/sale/wizard/sale_line_invoice.py:110
+#: code:addons/sale/wizard/sale_make_invoice.py:43
+#, python-format
+msgid "Warning!"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,delay:0
-msgid "Commitment Delay"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
msgstr ""
#. module: sale
-#: field:sale.report,state:0
-msgid "Order Status"
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+" Click to create a quotation or sales order for this customer.\n"
+" </p><p>\n"
+" OpenERP will help you efficiently handle the complete sale flow:\n"
+" quotation, sales order, delivery, invoicing and\n"
+" payment.\n"
+" </p><p>\n"
+" The social feature helps you organize discussions on each sales\n"
+" order, and allow your customer to keep track of the evolution\n"
+" of the sales order.\n"
+" </p>\n"
+" "
msgstr ""
#. module: sale
-#: view:sale.advance.payment.inv:0
-msgid "Show Lines to Invoice"
+#: field:sale.order,message_summary:0
+msgid "Summary"
msgstr ""
#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
msgstr ""
#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
msgstr ""
#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.config.settings:0
+msgid "Use contract to be able to manage your services with\n"
+" multiple invoicing as part of the same contract with\n"
+" your customer."
msgstr ""
#. module: sale
-#: code:addons/sale/sale.py:968
-#, python-format
-msgid "No Pricelist ! : "
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sale Orders"
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
msgstr ""
#. module: sale
-#: field:sale.config.settings,module_account_analytic_analysis:0
-msgid "Use contracts management"
+#: view:sale.order.line:0
+msgid "Confirmed sales order lines, not yet delivered"
msgstr ""
#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid "Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,name:0
-msgid "Description"
+#: view:sale.order:0
+msgid "UoS"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
msgstr ""
#. module: sale
-#: view:sale.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
+#: code:addons/sale/sale.py:976
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
msgstr ""
#. module: sale
-#: view:sale.order:0
-msgid "Order Number"
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
msgstr ""
#. module: sale
#: view:sale.order:0
-#: field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
+msgid "Sales Order ready to be invoiced"
msgstr ""
#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sales order lines"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
msgstr ""
#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
msgstr ""
#. module: sale
-#: view:sale.config.settings:0
-msgid "Use contract to be able to manage your services with\n"
-" multiple invoicing as part of the same contract with\n"
-" your customer."
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
msgstr ""
#. module: sale
-#: view:sale.order:0
-#: view:sale.order.line:0
-msgid "Search Sales Order"
+#: report:sale.order:0
+msgid "Quotation N°"
msgstr ""
#. module: sale
-#: field:sale.advance.payment.inv,advance_payment_method:0
-msgid "What do you want to invoice?"
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
msgstr ""
#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Sequence"
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
msgstr ""
#. module: sale
-#: report:sale.order:0
-#: field:sale.order,payment_term:0
-msgid "Payment Term"
+#: view:sale.report:0
+msgid "Picked"
msgstr ""
#. module: sale
-#: help:account.config.settings,module_sale_analytic_plans:0
-msgid "This allows install module sale_analytic_plans."
+#: help:sale.config.settings,module_sale_margin:0
+msgid "This adds the 'Margin' on sales order.\n"
+" This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n"
+" This installs the module sale_margin."
msgstr ""
#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid "This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application."
+#: code:addons/sale/sale.py:857
+#, python-format
+msgid "Before choosing a product,\n"
+" select a customer in the sales form."
msgstr ""
#. module: sale
-#: report:sale.order:0
-msgid "Quotation N°"
+#: view:sale.order:0
+msgid "Total Tax Included"
msgstr ""
#. module: sale
-#: view:sale.report:0
-msgid "Picked"
+#: view:sale.order:0
+msgid "New Copy of Quotation"
msgstr ""
#. module: sale
-#: view:sale.report:0
-#: field:sale.report,year:0
-msgid "Year"
+#: view:sale.advance.payment.inv:0
+msgid "Select how you want to invoice this order. This\n"
+" will create a draft invoice that can be modified\n"
+" before validation."
msgstr ""
#. module: sale
-#: view:sale.order.line.make.invoice:0
-msgid "Do you want to invoice the selected sale order lines?"
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
msgstr ""
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index af9d5788df2382863428e22ac289f21325d23d57..ad7b5894f8622a1aa9ca28924fe775ea87dbd8cb 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 3b652c1dfd364867e4f0831aa41365cfe13751e8..c6266237cc33667ce0c4e92ea1e6294707e86e66 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -54,7 +54,12 @@ msgstr ""
#. module: sale_crm
#: help:crm.make.sale,close:0
-msgid "Check this to close the opportunity after having created the sale order."
+msgid "Check this to close the opportunity after having created the sales order."
+msgstr ""
+
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_sent
+msgid "Quotation Send"
msgstr ""
#. module: sale_crm
@@ -112,6 +117,11 @@ msgstr ""
msgid "No addresse(s) defined for this customer."
msgstr ""
+#. module: sale_crm
+#: model:mail.message.subtype,name:sale_crm.mt_salesteam_order_confirmed
+msgid "Sales Order Confirmed"
+msgstr ""
+
#. module: sale_crm
#: view:account.invoice:0
#: field:account.invoice,section_id:0
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index 4905681a2c3f2da316b2e2161236120e46150696..f64bb415e82338c4c78419dd919cc702fa85bf05 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index 10e5c4a146500e4dbf44c2feaafb3d0dd6238a1c..83d855966c9c6e5e1ecb02df0594fae76ade3a74 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index 45a8960fa4bc99346dadb11416a215d40729639e..00a17ed8675365ed6b06f278110d899697904fef 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index 99620d3e442b2a8d6dec6faf5c9293ba3f438ff2..8a45a8a46af9a6bdc679dc822e86206477de82d6 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
index 950c5e64ffd079ffadccc19bb1b9fea6c886df87..d6f19319852d08ce598b9704305df04030d9a77f 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -20,22 +20,11 @@ msgstr ""
msgid "To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."
msgstr ""
-#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:470
-#, python-format
-msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
-msgstr ""
-
#. module: sale_stock
#: model:process.node,name:sale_stock.process_node_deliveryorder0
msgid "Delivery Order"
msgstr ""
-#. module: sale_stock
-#: help:sale.config.settings,group_sale_delivery_address:0
-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
@@ -43,7 +32,7 @@ msgid "Deliveries to Invoice"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:569
+#: code:addons/sale_stock/sale_stock.py:544
#, python-format
msgid "Picking Information ! : "
msgstr ""
@@ -54,7 +43,7 @@ msgid "Pick List"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:564
+#: code:addons/sale_stock/sale_stock.py:539
#, python-format
msgid "You selected a quantity of %d Units.\n"
"But it's not compatible with the selected packaging.\n"
@@ -99,7 +88,7 @@ msgid "For every sales order line, a procurement order is created to supply the
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:640
+#: code:addons/sale_stock/sale_stock.py:615
#, python-format
msgid "Error!"
msgstr ""
@@ -110,7 +99,7 @@ msgid "Shipping Policy"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:641
+#: code:addons/sale_stock/sale_stock.py:616
#, python-format
msgid "You cannot make an advance on a sales order that is defined as 'Automatic Invoice after delivery'."
msgstr ""
@@ -141,21 +130,14 @@ msgstr ""
msgid "Project Timesheet"
msgstr ""
-#. module: sale_stock
-#: help:sale.config.settings,module_delivery:0
-msgid "Allows you to add delivery methods in sale orders and delivery orders.\n"
-" You can define your own carrier and delivery grids for prices.\n"
-" This installs the module delivery."
-msgstr ""
-
#. module: sale_stock
#: field:sale.config.settings,group_sale_delivery_address:0
msgid "Allow a different address for delivery and invoicing "
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:571
-#: code:addons/sale_stock/sale_stock.py:622
+#: code:addons/sale_stock/sale_stock.py:546
+#: code:addons/sale_stock/sale_stock.py:597
#, python-format
msgid "Configuration Error!"
msgstr ""
@@ -223,13 +205,13 @@ msgid "Delivery Lead Time"
msgstr ""
#. module: sale_stock
-#: view:sale.order:0
-msgid "View Delivery Order"
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
msgstr ""
#. module: sale_stock
-#: selection:sale.config.settings,default_order_policy:0
-msgid "Invoice based on sales orders"
+#: view:sale.order:0
+msgid "View Delivery Order"
msgstr ""
#. module: sale_stock
@@ -276,14 +258,13 @@ msgid "A procurement order is automatically created as soon as a sales order is
msgstr ""
#. module: sale_stock
-#: field:sale.config.settings,group_invoice_deli_orders:0
-msgid "Generate invoices after and based on delivery orders"
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sales order lines with properties."
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:473
-#, python-format
-msgid "Order <b>delivered</b>."
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
msgstr ""
#. module: sale_stock
@@ -306,6 +287,13 @@ msgstr ""
msgid "International Commercial Terms are a series of predefined commercial terms used in international transactions."
msgstr ""
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid "Allows you to add delivery methods in sales orders and delivery orders.\n"
+" You can define your own carrier and delivery grids for prices.\n"
+" This installs the module delivery."
+msgstr ""
+
#. module: sale_stock
#: field:sale.config.settings,default_picking_policy:0
msgid "Deliver all at once when all products are available."
@@ -380,6 +368,11 @@ 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
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid "Allows you to specify different delivery and invoice addresses on a sales order."
+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."
@@ -391,7 +384,7 @@ msgid "Assign"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:617
+#: code:addons/sale_stock/sale_stock.py:592
#, python-format
msgid "Not enough stock ! : "
msgstr ""
@@ -407,8 +400,8 @@ msgid "Sales order by default will be configured to deliver all products at once
msgstr ""
#. module: sale_stock
-#: model:process.node,note:sale_stock.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
msgstr ""
#. module: sale_stock
@@ -445,11 +438,6 @@ msgstr ""
msgid "Create Invoice"
msgstr ""
-#. module: sale_stock
-#: help:sale.config.settings,group_mrp_properties:0
-msgid "Allows you to tag sale order lines with properties."
-msgstr ""
-
#. module: sale_stock
#: field:sale.config.settings,task_work:0
msgid "Prepare invoices based on task's activities"
@@ -461,13 +449,13 @@ msgid "Sales Advance Payment Invoice"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:522
+#: code:addons/sale_stock/sale_stock.py:497
#, python-format
msgid "You must first cancel stock moves attached to this sales order line."
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:560
+#: code:addons/sale_stock/sale_stock.py:535
#, python-format
msgid "(n/a)"
msgstr ""
@@ -478,7 +466,7 @@ msgid "Incoterm"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:521
+#: code:addons/sale_stock/sale_stock.py:496
#, python-format
msgid "Cannot cancel sales order line!"
msgstr ""
@@ -529,7 +517,7 @@ msgid "Ignore Exception"
msgstr ""
#. module: sale_stock
-#: code:addons/sale_stock/sale_stock.py:613
+#: code:addons/sale_stock/sale_stock.py:588
#, python-format
msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
"The real stock is %.2f %s. (without reservations)"
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index dc77004aba4e62a4885c07959ea255c0d60e26a9..b18e5ce9df23ca719688c31c14e9493052cfef91 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -16,13 +16,13 @@ msgstr ""
"Plural-Forms: \n"
#. module: share
-#: code:addons/share/wizard/share_wizard.py:837
+#: code:addons/share/wizard/share_wizard.py:841
#, python-format
msgid "Invitation to collaborate about %s"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
#, python-format
msgid "The share engine has not been able to fetch a record_id for your invitation."
msgstr ""
@@ -63,8 +63,8 @@ msgid "Share Title"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:843
-#: code:addons/share/wizard/share_wizard.py:872
+#: code:addons/share/wizard/share_wizard.py:847
+#: code:addons/share/wizard/share_wizard.py:876
#, python-format
msgid "The documents are not attached, you can view them online directly on my OpenERP server at:\n"
" %s\n"
@@ -78,8 +78,8 @@ msgid "Sharing"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:838
-#: code:addons/share/wizard/share_wizard.py:870
+#: code:addons/share/wizard/share_wizard.py:842
+#: code:addons/share/wizard/share_wizard.py:874
#, python-format
msgid "Hello,\n"
"\n"
@@ -99,26 +99,33 @@ msgid "New user email"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:882
+#: code:addons/share/wizard/share_wizard.py:886
#, python-format
msgid "You may use your current login (%s) and password to view them.\n"
""
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:616
+#: code:addons/share/wizard/share_wizard.py:620
#, python-format
msgid "(Modified)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:660
+#: code:addons/share/wizard/share_wizard.py:664
#, python-format
msgid "You must be a member of the Share/User group to use the share wizard."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:594
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:63
+#, python-format
+msgid "Embed"
+msgstr ""
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:598
#, python-format
msgid "Sharing filter created by user %s (%s) for group %s"
msgstr ""
@@ -130,8 +137,8 @@ msgid "Share URL"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:844
-#: code:addons/share/wizard/share_wizard.py:876
+#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:880
#, python-format
msgid "These are your credentials to access this protected area:\n"
""
@@ -143,18 +150,21 @@ msgid "Access info"
msgstr ""
#. module: share
+#. openerp-web
+#: code:addons/share/static/src/js/share.js:60
#: view:share.wizard:0
+#, python-format
msgid "Share"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:566
+#: code:addons/share/wizard/share_wizard.py:570
#, python-format
msgid "(Duplicated for modified sharing permissions)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:664
+#: code:addons/share/wizard/share_wizard.py:668
#, python-format
msgid "Please indicate the emails of the persons to share with, one per line."
msgstr ""
@@ -170,14 +180,14 @@ msgid "Next"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:657
+#: code:addons/share/wizard/share_wizard.py:661
#, python-format
msgid "Action and Access Mode are required to create a shared access."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:845
-#: code:addons/share/wizard/share_wizard.py:877
+#: code:addons/share/wizard/share_wizard.py:849
+#: code:addons/share/wizard/share_wizard.py:881
#, python-format
msgid "Username"
msgstr ""
@@ -215,8 +225,8 @@ msgid "Share Group"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
#, python-format
msgid "Email required"
msgstr ""
@@ -243,8 +253,8 @@ msgid "Direct link or embed code"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:851
-#: code:addons/share/wizard/share_wizard.py:885
+#: code:addons/share/wizard/share_wizard.py:855
+#: code:addons/share/wizard/share_wizard.py:889
#, python-format
msgid "OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
"It is open source and can be found on http://www.openerp.com."
@@ -272,13 +282,13 @@ msgstr ""
#. module: share
#: code:addons/share/wizard/share_wizard.py:61
-#: code:addons/share/wizard/share_wizard.py:652
+#: code:addons/share/wizard/share_wizard.py:656
#, python-format
msgid "Sharing access cannot be created."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:775
+#: code:addons/share/wizard/share_wizard.py:779
#, python-format
msgid "Record id not found"
msgstr ""
@@ -299,7 +309,7 @@ msgid "The action that opens the screen containing the data you wish to share."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:541
+#: code:addons/share/wizard/share_wizard.py:545
#, python-format
msgid "(Copy for sharing)"
msgstr ""
@@ -315,7 +325,7 @@ msgid "Title for the share (displayed to users as menu and shortcut name)"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:631
+#: code:addons/share/wizard/share_wizard.py:635
#, python-format
msgid "Indirect sharing filter created by user %s (%s) for group %s"
msgstr ""
@@ -337,7 +347,7 @@ msgid "User"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:653
+#: code:addons/share/wizard/share_wizard.py:657
#, python-format
msgid "Sorry, the current screen and filter you are trying to share are not supported at the moment.\n"
"You may want to try a simpler filter."
@@ -349,8 +359,8 @@ msgid "Use this link"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:847
-#: code:addons/share/wizard/share_wizard.py:879
+#: code:addons/share/wizard/share_wizard.py:851
+#: code:addons/share/wizard/share_wizard.py:883
#, python-format
msgid "Database"
msgstr ""
@@ -382,13 +392,13 @@ msgid "Embed this code in your documents to provide a link to the shared documen
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:508
+#: code:addons/share/wizard/share_wizard.py:512
#, python-format
msgid "Copied access for sharing"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:812
+#: code:addons/share/wizard/share_wizard.py:816
#, python-format
msgid "Invitation"
msgstr ""
@@ -404,7 +414,7 @@ msgid "Or insert the following code where you want to embed your documents"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:881
+#: code:addons/share/wizard/share_wizard.py:885
#, python-format
msgid "The documents have been automatically added to your current OpenERP documents.\n"
""
@@ -426,7 +436,7 @@ msgid "Select the type of user(s) you would like to share data with."
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:839
+#: code:addons/share/wizard/share_wizard.py:843
#, python-format
msgid "I have shared %s (%s) with you!\n"
"\n"
@@ -466,7 +476,7 @@ msgid "Share Wizard"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:788
+#: code:addons/share/wizard/share_wizard.py:792
#, python-format
msgid "Shared access created!"
msgstr ""
@@ -478,7 +488,7 @@ msgid "\n"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:848
+#: code:addons/share/wizard/share_wizard.py:852
#, python-format
msgid "The documents have been automatically added to your subscriptions.\n"
"\n"
@@ -491,7 +501,7 @@ msgid "Users"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:871
+#: code:addons/share/wizard/share_wizard.py:875
#, python-format
msgid "I've shared %s with you!\n"
"\n"
@@ -509,8 +519,8 @@ msgid "Invite users to OpenSocial record"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:846
-#: code:addons/share/wizard/share_wizard.py:878
+#: code:addons/share/wizard/share_wizard.py:850
+#: code:addons/share/wizard/share_wizard.py:882
#: field:share.wizard.result.line,password:0
#, python-format
msgid "Password"
@@ -534,8 +544,8 @@ msgid "Personal Message"
msgstr ""
#. module: share
-#: code:addons/share/wizard/share_wizard.py:830
-#: code:addons/share/wizard/share_wizard.py:861
+#: code:addons/share/wizard/share_wizard.py:834
+#: code:addons/share/wizard/share_wizard.py:865
#, python-format
msgid "The current user must have an email address configured in User Preferences to be able to send outgoing emails."
msgstr ""
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index d62666475ac4420b6c64516eb842c5b5e48b9136..962314de9887367ca16cbe7a520b889b9c6a6f50 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-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:02+0000\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 17:04+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -70,9 +70,10 @@ msgid "Upstream Traceability"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1448
-#, python-format
-msgid "Products have been <b>delivered</b>."
+#: field:stock.picking,date_done:0
+#: field:stock.picking.in,date_done:0
+#: field:stock.picking.out,date_done:0
+msgid "Date of Transfer"
msgstr ""
#. module: stock
@@ -111,8 +112,8 @@ msgid "Product Moves"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
#, python-format
msgid "Please provide proper quantity."
msgstr ""
@@ -134,7 +135,7 @@ msgid "You cannot perform this operation on more than one Stock Inventories."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
#, python-format
msgid "Quantity cannot be negative."
msgstr ""
@@ -187,18 +188,11 @@ msgid "Analyse a Period"
msgstr ""
#. module: stock
-#: field:product.category,property_stock_journal:0
#: view:report.stock.move:0
#: field:stock.change.standard.price,stock_journal:0
msgid "Stock journal"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1449
-#, python-format
-msgid "Products have been <b>received</b>."
-msgstr ""
-
#. module: stock
#: view:report.stock.move:0
msgid "Incoming"
@@ -251,7 +245,6 @@ msgid "Not Applicable"
msgstr ""
#. module: stock
-#: help:stock.change.product.qty,message_unread:0
#: help:stock.picking,message_unread:0
#: help:stock.picking.in,message_unread:0
#: help:stock.picking.out,message_unread:0
@@ -299,7 +292,7 @@ msgid "Reference"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1619
+#: code:addons/stock/stock.py:1548
#, python-format
msgid "Products to Process"
msgstr ""
@@ -325,7 +318,6 @@ msgid "_Validate"
msgstr ""
#. module: stock
-#: help:stock.change.product.qty,message_summary:0
#: help:stock.picking,message_summary:0
#: help:stock.picking.in,message_summary:0
#: help:stock.picking.out,message_summary:0
@@ -333,22 +325,22 @@ msgid "Holds the Chatter summary (number of messages, ...). This summary is dire
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:773
-#: code:addons/stock/stock.py:2546
-#: code:addons/stock/stock.py:2589
-#: code:addons/stock/stock.py:2650
-#: code:addons/stock/wizard/stock_change_product_qty.py:92
+#: code:addons/stock/stock.py:768
+#: code:addons/stock/stock.py:2475
+#: code:addons/stock/stock.py:2519
+#: code:addons/stock/stock.py:2580
+#: code:addons/stock/wizard/stock_change_product_qty.py:91
#: code:addons/stock/wizard/stock_fill_inventory.py:124
#: code:addons/stock/wizard/stock_inventory_merge.py:43
#: code:addons/stock/wizard/stock_inventory_merge.py:63
#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
-#: code:addons/stock/wizard/stock_partial_picking.py:173
-#: code:addons/stock/wizard/stock_partial_picking.py:180
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:174
+#: code:addons/stock/wizard/stock_partial_picking.py:181
+#: code:addons/stock/wizard/stock_partial_picking.py:192
#: code:addons/stock/wizard/stock_return_picking.py:99
#: code:addons/stock/wizard/stock_return_picking.py:106
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
#, python-format
msgid "Warning!"
msgstr ""
@@ -547,12 +539,12 @@ msgid "Location Type"
msgstr ""
#. module: stock
-#: view:stock.config.settings:0
-msgid "Location & Warehouse"
+#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
+msgid "Draft Physical Inventories"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1848
+#: code:addons/stock/stock.py:1777
#, 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 ""
@@ -583,7 +575,7 @@ msgid "Item Labels"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1444
+#: code:addons/stock/stock.py:1356
#, python-format
msgid "Back order <em>%s</em> has been <b>created</b>."
msgstr ""
@@ -695,9 +687,7 @@ msgid "Destination Address "
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1402
#: field:product.product,reception_count:0
-#, python-format
msgid "Reception"
msgstr ""
@@ -770,20 +760,14 @@ msgstr ""
msgid "Packs"
msgstr ""
-#. module: stock
-#: view:stock.move:0
-msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
-
#. module: stock
#: selection:stock.location.product,type:0
msgid "Analyse Current Inventory"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1202
-#, python-format
-msgid "You cannot remove the picking which is in %s state!"
+#: view:stock.move:0
+msgid "To Do"
msgstr ""
#. module: stock
@@ -830,13 +814,12 @@ msgid "When doing real-time inventory valuation, this is the Accounting Journal
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2323
+#: code:addons/stock/stock.py:2252
#, python-format
msgid "Please define stock output account for this product or its category: \"%s\" (id: %d)"
msgstr ""
#. module: stock
-#: field:stock.change.product.qty,message_summary:0
#: field:stock.picking,message_summary:0
#: field:stock.picking.in,message_summary:0
#: field:stock.picking.out,message_summary:0
@@ -863,7 +846,7 @@ msgid "Time"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:443
+#: code:addons/stock/product.py:447
#, python-format
msgid "Future Receptions"
msgstr ""
@@ -932,8 +915,8 @@ msgid "IT Suppliers"
msgstr ""
#. module: stock
-#: model:ir.actions.act_window,name:stock.action_inventory_form_draft
-msgid "Draft Physical Inventories"
+#: view:stock.config.settings:0
+msgid "Location & Warehouse"
msgstr ""
#. module: stock
@@ -943,7 +926,7 @@ msgid "Transit Location for Inter-Companies Transfers"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1193
+#: code:addons/stock/stock.py:1190
#, python-format
msgid "You cannot cancel the picking as some moves have been done. You should cancel the picking lines."
msgstr ""
@@ -954,8 +937,8 @@ msgid "Decimal precision on weight"
msgstr ""
#. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
msgstr ""
#. module: stock
@@ -964,7 +947,7 @@ msgid "Change Product Quantity"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:459
+#: code:addons/stock/product.py:463
#, python-format
msgid "Future P&L"
msgstr ""
@@ -994,7 +977,7 @@ msgid "You must assign a serial number for this product."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2326
+#: code:addons/stock/stock.py:2255
#, python-format
msgid "Please define journal on the product category: \"%s\" (id: %d)"
msgstr ""
@@ -1032,8 +1015,9 @@ msgid "Pickings already processed"
msgstr ""
#. module: stock
-#: view:report.stock.move:0
-msgid "Month Planned"
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
msgstr ""
#. module: stock
@@ -1043,12 +1027,6 @@ msgstr ""
msgid "Journal"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1409
-#, python-format
-msgid "is scheduled %s."
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
msgid "Create Draft Invoices"
@@ -1102,6 +1080,11 @@ msgstr ""
msgid "Reverse Transfer"
msgstr ""
+#. module: stock
+#: field:stock.config.settings,group_uos:0
+msgid "Invoice products in a different unit of measure than the sales order"
+msgstr ""
+
#. module: stock
#: help:stock.location,active:0
msgid "By unchecking the active field, you may hide a location without deleting it."
@@ -1202,7 +1185,7 @@ msgid "Author"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1893
+#: code:addons/stock/stock.py:1822
#, python-format
msgid "You are moving %.2f %s but only %.2f %s available for this serial number."
msgstr ""
@@ -1213,9 +1196,8 @@ msgid "Internal Shipment :"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1401
-#, python-format
-msgid "Delivery Order"
+#: view:stock.inventory.line:0
+msgid "Split Inventory Line"
msgstr ""
#. module: stock
@@ -1224,10 +1206,8 @@ msgid "Manual Operation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1427
#: view:report.stock.move:0
#: field:report.stock.move,picking_id:0
-#, python-format
msgid "Shipment"
msgstr ""
@@ -1239,22 +1219,20 @@ msgid "Supplier"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2929
+#: code:addons/stock/stock.py:2859
#, python-format
msgid "In order to cancel this inventory, you must first unpost related journal entries."
msgstr ""
#. module: stock
-#: field:stock.picking,date_done:0
-#: field:stock.picking.in,date_done:0
-#: field:stock.picking.out,date_done:0
-msgid "Date Done"
+#: code:addons/stock/product.py:113
+#, python-format
+msgid "Please specify company in Location."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1450
-#, python-format
-msgid "Products have been <b>moved</b>."
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
msgstr ""
#. module: stock
@@ -1391,13 +1369,7 @@ msgid "Technical field used to record the product cost set by the user during a
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1414
-#, python-format
-msgid "is in draft state."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1961
+#: code:addons/stock/stock.py:1890
#, python-format
msgid "Warning: No Back Order"
msgstr ""
@@ -1419,13 +1391,13 @@ msgid "To be refunded/invoiced"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2521
+#: code:addons/stock/stock.py:2450
#, python-format
msgid "You can only delete draft moves."
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1665
#, python-format
msgid "You cannot move product %s to a location of type view %s."
msgstr ""
@@ -1442,10 +1414,13 @@ msgid "Ready"
msgstr ""
#. module: stock
-#: view:stock.picking:0
-#: view:stock.picking.in:0
-#: view:stock.picking.out:0
-msgid "Calendar View"
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: selection:stock.inventory,state:0
+#: selection:stock.picking,state:0
+#: selection:stock.picking.in,state:0
+#: selection:stock.picking.out,state:0
+msgid "Draft"
msgstr ""
#. module: stock
@@ -1459,10 +1434,9 @@ msgid "Additional Info"
msgstr ""
#. module: stock
-#: field:stock.partial.move.line,move_id:0
-#: field:stock.partial.picking.line,move_id:0
-#: field:stock.return.picking.memory,move_id:0
-msgid "Move"
+#: code:addons/stock/stock.py:2648
+#, python-format
+msgid "Missing partial picking data for move #%s."
msgstr ""
#. module: stock
@@ -1500,9 +1474,10 @@ msgid "Internal Picking List"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1453
-#, python-format
-msgid "Products have been <b>%s</b>."
+#: selection:report.stock.inventory,state:0
+#: selection:report.stock.move,state:0
+#: view:stock.picking:0
+msgid "Waiting"
msgstr ""
#. module: stock
@@ -1517,8 +1492,15 @@ msgid "Delivery Slip"
msgstr ""
#. module: stock
-#: view:stock.move:0
-msgid "Expected"
+#: model:ir.actions.act_window,name:stock.open_board_warehouse
+#: model:ir.model,name:stock.model_stock_warehouse
+#: model:ir.ui.menu,name:stock.menu_board_warehouse
+#: model:ir.ui.menu,name:stock.menu_stock_config_settings
+#: model:ir.ui.menu,name:stock.menu_stock_root
+#: model:ir.ui.menu,name:stock.next_id_61
+#: field:product.product,warehouse_id:0
+#: view:stock.warehouse:0
+msgid "Warehouse"
msgstr ""
#. module: stock
@@ -1554,18 +1536,6 @@ msgstr ""
msgid "Address of customer or supplier."
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1434
-#, python-format
-msgid "%s has been <b>created</b>."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1438
-#, python-format
-msgid "%s has been <b>confirmed</b>."
-msgstr ""
-
#. module: stock
#: selection:report.stock.inventory,location_type:0
#: field:res.partner,property_stock_customer:0
@@ -1624,7 +1594,7 @@ msgid "Order Date"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:93
+#: code:addons/stock/wizard/stock_change_product_qty.py:92
#, python-format
msgid "INV: %s"
msgstr ""
@@ -1662,7 +1632,7 @@ msgid "Stock Invoice Onshipping"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2546
+#: code:addons/stock/stock.py:2475
#, python-format
msgid "Please provide a positive quantity to scrap."
msgstr ""
@@ -1708,9 +1678,8 @@ msgid "Stock Statistics"
msgstr ""
#. module: stock
-#: field:stock.partial.move.line,currency:0
-#: field:stock.partial.picking.line,currency:0
-msgid "Currency"
+#: view:report.stock.move:0
+msgid "Month Planned"
msgstr ""
#. module: stock
@@ -1807,12 +1776,6 @@ msgstr ""
msgid "Shelf 2"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1410
-#, python-format
-msgid "is ready to process."
-msgstr ""
-
#. module: stock
#: code:addons/stock/stock.py:529
#, python-format
@@ -1838,7 +1801,7 @@ msgid "Localization"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:455
+#: code:addons/stock/product.py:459
#, python-format
msgid "Delivered Qty"
msgstr ""
@@ -1893,7 +1856,6 @@ msgid "Date"
msgstr ""
#. module: stock
-#: field:stock.change.product.qty,message_is_follower:0
#: field:stock.picking,message_is_follower:0
#: field:stock.picking.in,message_is_follower:0
#: field:stock.picking.out,message_is_follower:0
@@ -1912,7 +1874,7 @@ msgid "Location Stock"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:96
+#: code:addons/stock/wizard/stock_partial_picking.py:97
#, python-format
msgid "_Deliver"
msgstr ""
@@ -2090,14 +2052,7 @@ msgid "Generate accounting entries per stock movement"
msgstr ""
#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.picking:0
-msgid "Waiting"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/product.py:445
+#: code:addons/stock/product.py:449
#, python-format
msgid "Received Qty"
msgstr ""
@@ -2125,7 +2080,6 @@ msgstr ""
#. module: stock
#: field:stock.incoterms,name:0
-#: field:stock.move,name:0
#: field:stock.warehouse,name:0
msgid "Name"
msgstr ""
@@ -2161,8 +2115,8 @@ msgid "Customer Locations"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2520
-#: code:addons/stock/stock.py:2928
+#: code:addons/stock/stock.py:2449
+#: code:addons/stock/stock.py:2858
#, python-format
msgid "User Error!"
msgstr ""
@@ -2178,7 +2132,6 @@ msgid "Create Invoice/Refund"
msgstr ""
#. module: stock
-#: help:stock.change.product.qty,message_ids:0
#: help:stock.picking,message_ids:0
#: help:stock.picking.in,message_ids:0
#: help:stock.picking.out,message_ids:0
@@ -2214,7 +2167,7 @@ msgid "Creation"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1847
+#: code:addons/stock/stock.py:1776
#, python-format
msgid "Operation forbidden !"
msgstr ""
@@ -2295,12 +2248,6 @@ msgstr ""
msgid "Inventory loss"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1405
-#, python-format
-msgid "Document"
-msgstr ""
-
#. module: stock
#: view:stock.inventory:0
#: field:stock.inventory.line.split,product_uom:0
@@ -2324,7 +2271,6 @@ msgid "Track serial number on products"
msgstr ""
#. module: stock
-#: field:stock.change.product.qty,message_unread:0
#: field:stock.picking,message_unread:0
#: field:stock.picking.in,message_unread:0
#: field:stock.picking.out,message_unread:0
@@ -2385,7 +2331,7 @@ msgid "Warehouse board"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:465
+#: code:addons/stock/product.py:469
#, python-format
msgid "Future Qty"
msgstr ""
@@ -2447,12 +2393,7 @@ msgid "Products"
msgstr ""
#. module: stock
-#: view:stock.inventory.line:0
-msgid "Split Inventory Line"
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2314
+#: code:addons/stock/stock.py:2243
#, python-format
msgid "Cannot create Journal Entry, Output Account of this product and Valuation account on category of this product are same."
msgstr ""
@@ -2490,7 +2431,7 @@ msgid "Outgoing Products"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2320
+#: code:addons/stock/stock.py:2249
#, python-format
msgid "Please define stock input account for this product or its category: \"%s\" (id: %d)"
msgstr ""
@@ -2501,19 +2442,14 @@ msgid "Delay(Days)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2718
-#, python-format
-msgid "Missing partial picking data for move #%s."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:1457
-#, python-format
-msgid "%s has been <b>cancelled</b>."
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:461
+#: code:addons/stock/product.py:465
#, python-format
msgid "P&L Qty"
msgstr ""
@@ -2611,7 +2547,7 @@ msgid "Support multiple variants per products "
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2317
+#: code:addons/stock/stock.py:2246
#, python-format
msgid "Cannot create Journal Entry, Input Account of this product and Valuation account on category of this product are same."
msgstr ""
@@ -2633,15 +2569,14 @@ msgid "scrap"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1962
+#: code:addons/stock/stock.py:1891
#, python-format
msgid "By changing the quantity here, you accept the new quantity as complete: OpenERP will not automatically generate a Back Order."
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:113
-#, python-format
-msgid "Please specify company in Location."
+#: report:stock.inventory.move:0
+msgid "Manual Quantity"
msgstr ""
#. module: stock
@@ -2688,7 +2623,7 @@ msgid "Track different dates on products and serial numbers.\n"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:173
+#: code:addons/stock/wizard/stock_partial_picking.py:174
#, python-format
msgid "Please provide proper Quantity."
msgstr ""
@@ -2700,6 +2635,7 @@ msgstr ""
#. module: stock
#: model:ir.model,name:stock.model_stock_journal
+#: field:product.category,property_stock_journal:0
#: field:report.stock.move,stock_journal:0
#: view:stock.journal:0
#: field:stock.journal,name:0
@@ -2710,13 +2646,13 @@ msgid "Stock Journal"
msgstr ""
#. module: stock
-#: selection:report.stock.inventory,location_type:0
-#: selection:stock.location,usage:0
-msgid "Procurement"
+#: code:addons/stock/wizard/stock_return_picking.py:171
+#, python-format
+msgid "%s-%s-return"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:83
+#: code:addons/stock/wizard/stock_change_product_qty.py:82
#, python-format
msgid "Active ID is not set in Context"
msgstr ""
@@ -2744,13 +2680,19 @@ msgid "Serial number is used to put a serial number on the production"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:99
+#: code:addons/stock/wizard/stock_partial_picking.py:100
#, python-format
msgid "Receive Products"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:101
+#: selection:report.stock.inventory,location_type:0
+#: selection:stock.location,usage:0
+msgid "Procurement"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:102
#: model:ir.actions.act_window,name:stock.action_out_picking_move
#: model:ir.ui.menu,name:stock.menu_action_pdct_out
#, python-format
@@ -2778,7 +2720,7 @@ msgid "Date of Completion"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1734
+#: code:addons/stock/stock.py:1663
#, python-format
msgid "You cannot move product %s from a location of type view %s."
msgstr ""
@@ -2841,12 +2783,6 @@ msgstr ""
msgid "Logistic Serial Number"
msgstr ""
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:115
-#, python-format
-msgid "<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location."
-msgstr ""
-
#. module: stock
#: field:stock.production.lot.revision,date:0
msgid "Revision Date"
@@ -2855,7 +2791,6 @@ msgstr ""
#. module: stock
#: view:report.stock.inventory:0
#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
#: report:stock.picking.list:0
msgid "Lot"
msgstr ""
@@ -2876,12 +2811,6 @@ msgstr ""
msgid "Quantity (UOS)"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1413
-#, python-format
-msgid "is waiting."
-msgstr ""
-
#. module: stock
#: view:stock.move:0
msgid "Set Available"
@@ -2892,36 +2821,13 @@ msgstr ""
msgid "Contact Address :"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,name:stock.action_production_lot_form
-#: model:ir.model,name:stock.model_stock_production_lot
-#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
-#: model:res.request.link,name:stock.req_link_tracking
-#: field:stock.change.product.qty,prodlot_id:0
-#: field:stock.inventory.line,prod_lot_id:0
-#: field:stock.inventory.line.split.lines,name:0
-#: field:stock.inventory.line.split.lines,prodlot_id:0
-#: field:stock.move,prodlot_id:0
-#: view:stock.move.split:0
-#: field:stock.move.split.lines,name:0
-#: 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
-#: field:stock.report.prodlots,prodlot_id:0
-msgid "Serial Number"
-msgstr ""
-
#. module: stock
#: help:stock.config.settings,group_stock_tracking_lot:0
msgid "When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:94
+#: code:addons/stock/wizard/stock_partial_picking.py:95
#, python-format
msgid "_Receive"
msgstr ""
@@ -2939,7 +2845,7 @@ msgid "Properties"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1126
+#: code:addons/stock/stock.py:1120
#, python-format
msgid "Error, no partner !"
msgstr ""
@@ -3012,13 +2918,6 @@ msgstr ""
msgid "Inventory Reference"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1403
-#: code:addons/stock/stock.py:1428
-#, python-format
-msgid "Internal picking"
-msgstr ""
-
#. module: stock
#: model:ir.actions.act_window,help:stock.action_out_picking_move
msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -3044,18 +2943,6 @@ msgstr ""
msgid "Revision Name"
msgstr ""
-#. module: stock
-#: model:ir.actions.act_window,name:stock.open_board_warehouse
-#: model:ir.model,name:stock.model_stock_warehouse
-#: model:ir.ui.menu,name:stock.menu_board_warehouse
-#: model:ir.ui.menu,name:stock.menu_stock_config_settings
-#: model:ir.ui.menu,name:stock.menu_stock_root
-#: model:ir.ui.menu,name:stock.next_id_61
-#: field:product.product,warehouse_id:0
-#: view:stock.warehouse:0
-msgid "Warehouse"
-msgstr ""
-
#. module: stock
#: model:res.groups,name:stock.group_tracking_lot
msgid "Manage Logistic Serial Numbers"
@@ -3079,7 +2966,7 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1441
+#: code:addons/stock/stock.py:2496
#, python-format
msgid "%s %s %s has been <b>moved to</b> scrap."
msgstr ""
@@ -3126,7 +3013,7 @@ msgid "Date done"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1127
+#: code:addons/stock/stock.py:1121
#, python-format
msgid "Please put a partner on the picking list if you want to generate invoice."
msgstr ""
@@ -3150,7 +3037,7 @@ msgstr ""
#. module: stock
#: view:stock.move:0
-msgid "To Do"
+msgid "Scheduled"
msgstr ""
#. module: stock
@@ -3193,7 +3080,7 @@ msgid "Stock"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:212
+#: code:addons/stock/wizard/stock_return_picking.py:219
#, python-format
msgid "Returned Picking"
msgstr ""
@@ -3256,7 +3143,7 @@ msgid "Assigned Internal Moves"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:795
+#: code:addons/stock/stock.py:790
#, python-format
msgid "You cannot process picking without stock moves."
msgstr ""
@@ -3421,11 +3308,6 @@ msgstr ""
msgid "Internal Shippings"
msgstr ""
-#. module: stock
-#: field:stock.config.settings,group_uos:0
-msgid "Invoice products in a different unit of measure than the sale order"
-msgstr ""
-
#. module: stock
#: field:stock.change.standard.price,enable_stock_in_out_acc:0
msgid "Enable Related Account"
@@ -3467,7 +3349,7 @@ msgid "Inventory Move"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:471
+#: code:addons/stock/product.py:475
#, python-format
msgid "Future Productions"
msgstr ""
@@ -3556,12 +3438,6 @@ msgstr ""
msgid "Product Unit of Measure"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1426
-#, python-format
-msgid "Delivery order"
-msgstr ""
-
#. module: stock
#: view:stock.move:0
msgid "Put in current pack"
@@ -3573,8 +3449,26 @@ msgid "Lot Inventory"
msgstr ""
#. module: stock
-#: view:stock.move:0
-msgid "Reason"
+#: model:ir.actions.act_window,name:stock.action_production_lot_form
+#: model:ir.model,name:stock.model_stock_production_lot
+#: model:ir.ui.menu,name:stock.menu_action_production_lot_form
+#: model:res.request.link,name:stock.req_link_tracking
+#: field:stock.change.product.qty,prodlot_id:0
+#: field:stock.inventory.line,prod_lot_id:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: field:stock.move,prodlot_id:0
+#: view:stock.move.split:0
+#: field:stock.move.split.lines,name:0
+#: 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
+#: field:stock.report.prodlots,prodlot_id:0
+msgid "Serial Number"
msgstr ""
#. module: stock
@@ -3609,7 +3503,6 @@ msgid "When doing real-time inventory valuation, counterpart journal items for a
msgstr ""
#. module: stock
-#: field:stock.change.product.qty,message_ids:0
#: field:stock.picking,message_ids:0
#: field:stock.picking.in,message_ids:0
#: field:stock.picking.out,message_ids:0
@@ -3631,16 +3524,16 @@ msgstr ""
#: code:addons/stock/report/report_stock.py:78
#: code:addons/stock/report/report_stock.py:134
#: code:addons/stock/stock.py:529
-#: code:addons/stock/stock.py:795
-#: code:addons/stock/stock.py:1193
-#: code:addons/stock/stock.py:1202
-#: code:addons/stock/stock.py:2314
-#: code:addons/stock/stock.py:2317
-#: code:addons/stock/stock.py:2320
-#: code:addons/stock/stock.py:2323
-#: code:addons/stock/stock.py:2326
-#: code:addons/stock/stock.py:2329
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:790
+#: code:addons/stock/stock.py:1190
+#: code:addons/stock/stock.py:1199
+#: code:addons/stock/stock.py:2243
+#: code:addons/stock/stock.py:2246
+#: code:addons/stock/stock.py:2249
+#: code:addons/stock/stock.py:2252
+#: code:addons/stock/stock.py:2255
+#: code:addons/stock/stock.py:2258
+#: code:addons/stock/stock.py:2585
#: code:addons/stock/wizard/stock_fill_inventory.py:59
#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
#: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3673,9 +3566,10 @@ msgid "Confirmed Delivery Orders"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:164
-#, python-format
-msgid "%s-return"
+#: view:stock.move:0
+#: field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
+msgid "Picking"
msgstr ""
#. module: stock
@@ -3685,7 +3579,7 @@ msgid "This picking list does not require invoicing."
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:180
+#: code:addons/stock/wizard/stock_partial_picking.py:181
#, python-format
msgid "The unit of measure rounding does not allow you to ship \"%s %s\", only roundings of \"%s %s\" is accepted by the Unit of Measure."
msgstr ""
@@ -3715,7 +3609,7 @@ msgid "Determines whether this location is chained to another location, i.e. any
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1924
+#: code:addons/stock/stock.py:1853
#, python-format
msgid "By changing this quantity here, you accept the new quantity as complete: OpenERP will not automatically generate a back order."
msgstr ""
@@ -3777,7 +3671,6 @@ msgid "Check this box to allow using this location to put scrapped/damaged goods
msgstr ""
#. module: stock
-#: field:stock.change.product.qty,message_follower_ids:0
#: field:stock.picking,message_follower_ids:0
#: field:stock.picking.in,message_follower_ids:0
#: field:stock.picking.out,message_follower_ids:0
@@ -3785,7 +3678,7 @@ msgid "Followers"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2655
+#: code:addons/stock/stock.py:2585
#, python-format
msgid "Cannot consume a move with negative or zero quantity."
msgstr ""
@@ -3824,9 +3717,8 @@ msgid "Product Category"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1407
-#, python-format
-msgid " for the "
+#: view:stock.move:0
+msgid "Serial Number"
msgstr ""
#. module: stock
@@ -3856,7 +3748,7 @@ msgid "If cost price is increased, stock variation account will be debited and s
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2881
+#: code:addons/stock/stock.py:2811
#, python-format
msgid "INV:"
msgstr ""
@@ -3874,7 +3766,7 @@ msgid "Chaining Journal"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:773
+#: code:addons/stock/stock.py:768
#, python-format
msgid "Not enough stock, unable to reserve the products."
msgstr ""
@@ -3889,19 +3781,13 @@ msgstr ""
msgid "This is the quantity of products from an inventory point of view. For moves in the state 'done', this is the quantity of products that were actually moved. For other moves, this is the quantity of product that is planned to be moved. Lowering this quantity does not generate a backorder. Changing this quantity on assigned moves affects the product reservation, and should be done with care."
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1411
-#, python-format
-msgid "is cancelled."
-msgstr ""
-
#. module: stock
#: help:stock.location,valuation_in_account_id:0
msgid "Used for real-time inventory valuation. When set on a virtual location (non internal type), this account will be used to hold the value of products being moved from an internal location into this location, instead of the generic Stock Output Account set on the product. This has no effect for internal locations."
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:453
+#: code:addons/stock/product.py:457
#, python-format
msgid "Future Deliveries"
msgstr ""
@@ -3924,7 +3810,7 @@ msgid "Auto Validate"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1892
+#: code:addons/stock/stock.py:1821
#, python-format
msgid "Insufficient Stock for Serial Number !"
msgstr ""
@@ -3941,8 +3827,8 @@ msgid "December"
msgstr ""
#. module: stock
-#: view:stock.production.lot:0
-msgid "Available Product Lots"
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
msgstr ""
#. module: stock
@@ -4015,12 +3901,18 @@ msgid "Invoiced"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1923
+#: code:addons/stock/stock.py:1852
#: view:product.template:0
#, python-format
msgid "Information"
msgstr ""
+#. module: stock
+#: code:addons/stock/stock.py:1199
+#, python-format
+msgid "You cannot remove the picking which is in %s state!"
+msgstr ""
+
#. module: stock
#: help:res.partner,property_stock_customer:0
msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
@@ -4070,13 +3962,10 @@ msgid "Internal"
msgstr ""
#. module: stock
-#: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.picking,state:0
-#: selection:stock.picking.in,state:0
-#: selection:stock.picking.out,state:0
-msgid "Draft"
+#: view:stock.picking:0
+#: view:stock.picking.in:0
+#: view:stock.picking.out:0
+msgid "Calendar View"
msgstr ""
#. module: stock
@@ -4099,13 +3988,18 @@ msgstr ""
msgid "Do you want to merge theses inventories?"
msgstr ""
+#. module: stock
+#: view:stock.picking.out:0
+msgid "Date of Delivery"
+msgstr ""
+
#. module: stock
#: field:stock.location,posy:0
msgid "Shelves (Y)"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:2329
+#: code:addons/stock/stock.py:2258
#, python-format
msgid "Please define inventory valuation account on the product category: \"%s\" (id: %d)"
msgstr ""
@@ -4128,7 +4022,7 @@ msgid "Adds a Claim link to the delivery order.\n"
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:198
+#: code:addons/stock/wizard/stock_return_picking.py:205
#, python-format
msgid "Please specify at least one non-zero quantity."
msgstr ""
@@ -4161,23 +4055,11 @@ msgid "November"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:467
+#: code:addons/stock/product.py:471
#, python-format
msgid "Unplanned Qty"
msgstr ""
-#. module: stock
-#: field:stock.change.product.qty,message_comment_ids:0
-#: help:stock.change.product.qty,message_comment_ids:0
-#: field:stock.picking,message_comment_ids:0
-#: help:stock.picking,message_comment_ids:0
-#: field:stock.picking.in,message_comment_ids:0
-#: help:stock.picking.in,message_comment_ids:0
-#: field:stock.picking.out,message_comment_ids:0
-#: help:stock.picking.out,message_comment_ids:0
-msgid "Comments and emails"
-msgstr ""
-
#. module: stock
#: field:stock.location,chained_company_id:0
msgid "Chained Company"
@@ -4188,15 +4070,6 @@ msgstr ""
msgid "Check Availability"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1430
-#: view:stock.move:0
-#: field:stock.partial.move,picking_id:0
-#: field:stock.partial.picking,picking_id:0
-#, python-format
-msgid "Picking"
-msgstr ""
-
#. module: stock
#: selection:report.stock.inventory,month:0
#: selection:report.stock.move,month:0
@@ -4230,14 +4103,14 @@ msgid "Move History (parent moves)"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:449
+#: code:addons/stock/product.py:453
#, python-format
msgid "Future Stock"
msgstr ""
#. module: stock
-#: code:addons/stock/stock.py:1734
-#: code:addons/stock/stock.py:1736
+#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1665
#, python-format
msgid "Error"
msgstr ""
@@ -4376,6 +4249,7 @@ msgid "Real"
msgstr ""
#. module: stock
+#: field:stock.move,name:0
#: report:stock.picking.list:0
#: view:stock.production.lot.revision:0
#: field:stock.production.lot.revision,description:0
@@ -4421,7 +4295,7 @@ msgid "Location Content"
msgstr ""
#. module: stock
-#: code:addons/stock/product.py:473
+#: code:addons/stock/product.py:477
#, python-format
msgid "Produced Qty"
msgstr ""
@@ -4452,12 +4326,6 @@ msgstr ""
msgid "Production"
msgstr ""
-#. module: stock
-#: code:addons/stock/stock.py:1412
-#, python-format
-msgid "is done."
-msgstr ""
-
#. module: stock
#: view:stock.location:0
#: selection:stock.location,chained_location_type:0
@@ -4487,6 +4355,11 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
" "
msgstr ""
+#. module: stock
+#: view:stock.picking.in:0
+msgid "Date of Reception"
+msgstr ""
+
#. module: stock
#: help:stock.config.settings,group_stock_multiple_locations:0
msgid "This allows to configure and use multiple stock locations and warehouses,\n"
@@ -4562,7 +4435,7 @@ msgid "Shipping Type of the Picking List that will contain the chained move (lea
msgstr ""
#. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:191
+#: code:addons/stock/wizard/stock_partial_picking.py:192
#, python-format
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 ""
diff --git a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
index eae4887bfce4d5d78eb54367b407459201b57c22..cb51a94fc258284e15e3ef15d5019a08540c65b0 100644
--- a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
+++ b/addons/stock_invoice_directly/i18n/stock_invoice_directly.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index 5d1487a29cbc0104fcde62cbffc0c9122c53538c..554be5282c11fc8eb55a725e2aab87e6f31d0a69 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -275,6 +275,16 @@ msgstr ""
msgid "Move for pulled procurement coming from original location %s, pull rule %s, via original Procurement %s (#%d)"
msgstr ""
+#. module: stock_location
+#: view:product.product:0
+msgid "Push Flow"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pull Flow"
+msgstr ""
+
#. module: stock_location
#: model:ir.model,name:stock_location.model_procurement_order
msgid "Procurement"
diff --git a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
index f9b0757ba6def7809faca18fb541fa49bc5601d7..3f49938ab34556bc737ccdb629fa3e3032d1a769 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-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index 8806bf706092872ae0e98136b9db4c526714d7e5..79ec01c3a33234e54fc404b75152e6b0b1293e7f 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index e2395ac8acccfd7e44f323a81f7e0c4886176932..b7e9fcbb924b06d974779a916b6a435884515e00 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgid "Single Textboxes"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:473
+#: code:addons/survey/survey.py:471
#, python-format
msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -170,7 +170,7 @@ msgid "Add Comment Field"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:452
+#: code:addons/survey/survey.py:450
#, python-format
msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -191,7 +191,7 @@ msgid "survey.name.wiz"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:485
+#: code:addons/survey/survey.py:483
#, python-format
msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -208,7 +208,7 @@ msgid "Send Reminder for Existing User"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:527
+#: code:addons/survey/survey.py:525
#, python-format
msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -272,7 +272,7 @@ msgid " Column heading"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
#, python-format
msgid "The following surveys are not in open state: %s"
msgstr ""
@@ -304,8 +304,8 @@ msgid "Rating Scale"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:189
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:187
#, python-format
msgid "This survey has no question defined. Please define the questions and answers first."
msgstr ""
@@ -326,7 +326,7 @@ msgid "Survey Open Date"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:801
+#: code:addons/survey/wizard/survey_answer.py:800
#, python-format
msgid "You cannot select the same answer more than one time."
msgstr ""
@@ -347,8 +347,8 @@ msgid "Edit Survey"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:962
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:961
#, python-format
msgid "Please enter an integer value."
msgstr ""
@@ -359,7 +359,7 @@ msgid "Menu Choice"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:495
+#: code:addons/survey/survey.py:493
#, python-format
msgid "You must enter one or more menu choices in column heading."
msgstr ""
@@ -381,7 +381,7 @@ msgid "Survey Answer Line"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:75
+#: code:addons/survey/wizard/survey_send_invitation.py:72
#, python-format
msgid "\n"
"Hello %%(name)s, \n"
@@ -464,7 +464,7 @@ msgid "Don't Validate Comment Text."
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:534
+#: code:addons/survey/survey.py:532
#, python-format
msgid "You must enter one or more menu choices in column heading."
msgstr ""
@@ -500,9 +500,9 @@ msgid "Evaluation Plan Phase"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:188
+#: code:addons/survey/wizard/survey_send_invitation.py:185
+#: code:addons/survey/wizard/survey_send_invitation.py:196
#: code:addons/survey/wizard/survey_send_invitation.py:199
-#: code:addons/survey/wizard/survey_send_invitation.py:202
#, python-format
msgid "Unknown"
msgstr ""
@@ -544,8 +544,8 @@ msgid "Email"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:98
-#: code:addons/survey/survey.py:261
+#: code:addons/survey/survey.py:96
+#: code:addons/survey/survey.py:259
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -566,7 +566,7 @@ msgid "Select Partner"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:527
#, python-format
msgid "Maximum Required Answer is greater than Minimum Required Answer."
msgstr ""
@@ -619,7 +619,7 @@ msgid "Error Message"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:126
+#: code:addons/survey/wizard/survey_answer.py:124
#, python-format
msgid "You cannot answer this survey more than %s times."
msgstr ""
@@ -676,7 +676,7 @@ msgid "Paragraph of Text"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:479
+#: code:addons/survey/survey.py:477
#, python-format
msgid "Maximum Required Answer you entered for your maximum is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -696,7 +696,7 @@ msgid "Options"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:438
+#: code:addons/survey/survey.py:436
#, python-format
msgid "You must enter one or more Answers for question \"%s\" of page %s."
msgstr ""
@@ -799,8 +799,8 @@ msgid "Set to one if you require only one Answer per user"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:514
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:512
#, python-format
msgid "You must enter one or more column headings for question \"%s\" of page %s."
msgstr ""
@@ -817,7 +817,7 @@ msgid "Message"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:499
+#: code:addons/survey/survey.py:497
#, python-format
msgid "You must enter one or more menu choices in column heading (white spaces not allowed)."
msgstr ""
@@ -1108,7 +1108,7 @@ msgid "Skiped"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:536
+#: code:addons/survey/survey.py:534
#, python-format
msgid "You must enter one or more menu choices in column heading (white spaces not allowed)."
msgstr ""
@@ -1136,7 +1136,7 @@ msgid "Survey Response Line"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:171
+#: code:addons/survey/survey.py:169
#, python-format
msgid "This survey has no pages defined. Please define pages first."
msgstr ""
@@ -1289,7 +1289,7 @@ msgid "Open"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:510
+#: code:addons/survey/survey.py:508
#, python-format
msgid "You must enter one or more answers for question \"%s\" of page %s ."
msgstr ""
@@ -1300,7 +1300,7 @@ msgid "Total Started Survey"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:517
#, python-format
msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -1351,7 +1351,7 @@ msgid "Email Notification on Answer"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:446
+#: code:addons/survey/wizard/survey_answer.py:445
#, python-format
msgid "Complete Survey Answer"
msgstr ""
@@ -1425,8 +1425,8 @@ msgid "Portrait(Vertical)"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_send_invitation.py:70
-#: code:addons/survey/wizard/survey_send_invitation.py:71
+#: code:addons/survey/wizard/survey_send_invitation.py:67
+#: code:addons/survey/wizard/survey_send_invitation.py:68
#, python-format
msgid "Invitation for %s"
msgstr ""
@@ -1443,19 +1443,19 @@ msgid "Supplier Selection"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:993
+#: code:addons/survey/wizard/survey_answer.py:992
#, python-format
msgid "You cannot select same answer more than one time.'"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:687
+#: code:addons/survey/survey.py:685
#, python-format
msgid "You cannot duplicate the resource!"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:525
+#: code:addons/survey/survey.py:523
#, python-format
msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -1482,7 +1482,7 @@ msgid "Pages"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:457
+#: code:addons/survey/survey.py:455
#, python-format
msgid "#Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -1527,58 +1527,58 @@ msgid "Error message"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:154
-#: code:addons/survey/survey.py:171
-#: code:addons/survey/survey.py:189
-#: code:addons/survey/survey.py:426
-#: code:addons/survey/survey.py:438
-#: code:addons/survey/survey.py:452
-#: code:addons/survey/survey.py:457
-#: code:addons/survey/survey.py:467
-#: code:addons/survey/survey.py:473
-#: code:addons/survey/survey.py:479
-#: code:addons/survey/survey.py:485
-#: code:addons/survey/survey.py:489
-#: code:addons/survey/survey.py:495
-#: code:addons/survey/survey.py:499
-#: code:addons/survey/survey.py:510
-#: code:addons/survey/survey.py:514
-#: code:addons/survey/survey.py:519
+#: code:addons/survey/survey.py:152
+#: code:addons/survey/survey.py:169
+#: code:addons/survey/survey.py:187
+#: code:addons/survey/survey.py:424
+#: code:addons/survey/survey.py:436
+#: code:addons/survey/survey.py:450
+#: code:addons/survey/survey.py:455
+#: code:addons/survey/survey.py:465
+#: code:addons/survey/survey.py:471
+#: code:addons/survey/survey.py:477
+#: code:addons/survey/survey.py:483
+#: code:addons/survey/survey.py:487
+#: code:addons/survey/survey.py:493
+#: code:addons/survey/survey.py:497
+#: code:addons/survey/survey.py:508
+#: code:addons/survey/survey.py:512
+#: code:addons/survey/survey.py:517
+#: code:addons/survey/survey.py:523
#: code:addons/survey/survey.py:525
#: code:addons/survey/survey.py:527
-#: code:addons/survey/survey.py:529
+#: code:addons/survey/survey.py:532
#: code:addons/survey/survey.py:534
-#: code:addons/survey/survey.py:536
-#: code:addons/survey/survey.py:687
-#: code:addons/survey/wizard/survey_answer.py:119
-#: code:addons/survey/wizard/survey_answer.py:126
-#: code:addons/survey/wizard/survey_answer.py:708
-#: code:addons/survey/wizard/survey_answer.py:747
-#: code:addons/survey/wizard/survey_answer.py:767
-#: code:addons/survey/wizard/survey_answer.py:796
-#: code:addons/survey/wizard/survey_answer.py:801
-#: code:addons/survey/wizard/survey_answer.py:809
-#: code:addons/survey/wizard/survey_answer.py:820
-#: code:addons/survey/wizard/survey_answer.py:829
-#: code:addons/survey/wizard/survey_answer.py:834
-#: code:addons/survey/wizard/survey_answer.py:908
-#: code:addons/survey/wizard/survey_answer.py:944
-#: code:addons/survey/wizard/survey_answer.py:962
-#: code:addons/survey/wizard/survey_answer.py:990
-#: code:addons/survey/wizard/survey_answer.py:993
-#: code:addons/survey/wizard/survey_answer.py:996
-#: code:addons/survey/wizard/survey_answer.py:1008
-#: code:addons/survey/wizard/survey_answer.py:1015
-#: code:addons/survey/wizard/survey_answer.py:1018
+#: code:addons/survey/survey.py:685
+#: code:addons/survey/wizard/survey_answer.py:117
+#: code:addons/survey/wizard/survey_answer.py:124
+#: code:addons/survey/wizard/survey_answer.py:707
+#: code:addons/survey/wizard/survey_answer.py:746
+#: code:addons/survey/wizard/survey_answer.py:766
+#: code:addons/survey/wizard/survey_answer.py:795
+#: code:addons/survey/wizard/survey_answer.py:800
+#: code:addons/survey/wizard/survey_answer.py:808
+#: code:addons/survey/wizard/survey_answer.py:819
+#: code:addons/survey/wizard/survey_answer.py:828
+#: code:addons/survey/wizard/survey_answer.py:833
+#: code:addons/survey/wizard/survey_answer.py:907
+#: code:addons/survey/wizard/survey_answer.py:943
+#: code:addons/survey/wizard/survey_answer.py:961
+#: code:addons/survey/wizard/survey_answer.py:989
+#: code:addons/survey/wizard/survey_answer.py:992
+#: code:addons/survey/wizard/survey_answer.py:995
+#: code:addons/survey/wizard/survey_answer.py:1007
+#: code:addons/survey/wizard/survey_answer.py:1014
+#: code:addons/survey/wizard/survey_answer.py:1017
#: code:addons/survey/wizard/survey_selection.py:80
#: code:addons/survey/wizard/survey_selection.py:83
-#: code:addons/survey/wizard/survey_send_invitation.py:74
+#: code:addons/survey/wizard/survey_send_invitation.py:71
#, python-format
msgid "Warning!"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:467
+#: code:addons/survey/survey.py:465
#, python-format
msgid "Minimum Required Answer you entered is greater than the number of answer. Please use a number that is smaller than %d."
msgstr ""
@@ -1594,7 +1594,7 @@ msgid "ID"
msgstr ""
#. module: survey
-#: code:addons/survey/survey.py:489
+#: code:addons/survey/survey.py:487
#, python-format
msgid "Maximum Required Answer is greater than Minimum Required Answer"
msgstr ""
@@ -1696,7 +1696,7 @@ msgid "Table"
msgstr ""
#. module: survey
-#: code:addons/survey/wizard/survey_answer.py:119
+#: code:addons/survey/wizard/survey_answer.py:117
#, python-format
msgid "You cannot answer because the survey is not open."
msgstr ""
diff --git a/addons/warning/i18n/warning.pot b/addons/warning/i18n/warning.pot
index 64a7a4ebb0fd940a0b63a708dc5bff074c840a8c..8a8167faa0ca0aa78a423acc722ea5696cba9d13 100644
--- a/addons/warning/i18n/warning.pot
+++ b/addons/warning/i18n/warning.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-03 16:04+0000\n"
+"POT-Creation-Date: 2012-12-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -26,11 +26,6 @@ msgstr ""
msgid "Incoming Shipments"
msgstr ""
-#. module: warning
-#: field:product.product,sale_line_warn_msg:0
-msgid "Message for Sale Order Line"
-msgstr ""
-
#. module: warning
#: field:product.product,purchase_line_warn_msg:0
msgid "Message for Purchase Order Line"
@@ -41,11 +36,6 @@ msgstr ""
msgid "Picking List"
msgstr ""
-#. module: warning
-#: field:product.product,sale_line_warn:0
-msgid "Sale Order Line"
-msgstr ""
-
#. module: warning
#: view:product.product:0
msgid "Warning when Purchasing this Product"
@@ -98,11 +88,6 @@ msgstr ""
msgid "Warning when Selling this Product"
msgstr ""
-#. module: warning
-#: field:res.partner,sale_warn:0
-msgid "Sale Order"
-msgstr ""
-
#. module: warning
#: field:res.partner,picking_warn:0
msgid "Stock Picking"
@@ -114,11 +99,6 @@ msgstr ""
msgid "Purchase Order"
msgstr ""
-#. module: warning
-#: field:res.partner,sale_warn_msg:0
-msgid "Message for Sale Order"
-msgstr ""
-
#. module: warning
#: field:res.partner,purchase_warn_msg:0
msgid "Message for Purchase Order"
@@ -140,20 +120,30 @@ msgstr ""
#: code:addons/warning/warning.py:67
#: code:addons/warning/warning.py:96
#: code:addons/warning/warning.py:130
-#: code:addons/warning/warning.py:161
-#: code:addons/warning/warning.py:191
-#: code:addons/warning/warning.py:217
-#: code:addons/warning/warning.py:265
-#: code:addons/warning/warning.py:298
+#: code:addons/warning/warning.py:162
+#: code:addons/warning/warning.py:192
+#: code:addons/warning/warning.py:218
+#: code:addons/warning/warning.py:266
+#: code:addons/warning/warning.py:299
#, python-format
msgid "Alert for %s !"
msgstr ""
+#. module: warning
+#: view:res.partner:0
+msgid "Warning on the Sales Order"
+msgstr ""
+
#. module: warning
#: field:res.partner,invoice_warn_msg:0
msgid "Message for Invoice"
msgstr ""
+#. module: warning
+#: field:res.partner,sale_warn_msg:0
+msgid "Message for Sales Order"
+msgstr ""
+
#. module: warning
#: view:res.partner:0
msgid "Warning on the Picking"
@@ -168,18 +158,18 @@ msgstr ""
#: code:addons/warning/warning.py:68
#: code:addons/warning/warning.py:97
#: code:addons/warning/warning.py:132
-#: code:addons/warning/warning.py:162
-#: code:addons/warning/warning.py:192
-#: code:addons/warning/warning.py:218
-#: code:addons/warning/warning.py:266
-#: code:addons/warning/warning.py:299
+#: code:addons/warning/warning.py:163
+#: code:addons/warning/warning.py:193
+#: code:addons/warning/warning.py:219
+#: code:addons/warning/warning.py:267
+#: code:addons/warning/warning.py:300
#, python-format
msgid "Warning for %s"
msgstr ""
#. module: warning
-#: view:res.partner:0
-msgid "Warning on the Sale Order"
+#: field:product.product,sale_line_warn_msg:0
+msgid "Message for Sales Order Line"
msgstr ""
#. module: warning
@@ -204,6 +194,7 @@ msgstr ""
#. module: warning
#: model:ir.model,name:warning.model_sale_order
+#: field:res.partner,sale_warn:0
msgid "Sales Order"
msgstr ""
@@ -214,6 +205,7 @@ msgstr ""
#. module: warning
#: model:ir.model,name:warning.model_sale_order_line
+#: field:product.product,sale_line_warn:0
msgid "Sales Order Line"
msgstr ""
diff --git a/addons/web_linkedin/i18n/web_linkedin.pot b/addons/web_linkedin/i18n/web_linkedin.pot
index baee4e11eb6b4c25a995b648354b1e72fac6ee45..c28e927f8dfd0cc3fecb83a01ed1fc0e12e19137 100644
--- a/addons/web_linkedin/i18n/web_linkedin.pot
+++ b/addons/web_linkedin/i18n/web_linkedin.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
diff --git a/addons/web_shortcuts/i18n/web_shortcuts.pot b/addons/web_shortcuts/i18n/web_shortcuts.pot
index e6ddfb110c7e0053ca42779ed20c8a8e32f5620e..2babdff3864dd9a3d7b48363eea102d62e19375a 100644
--- a/addons/web_shortcuts/i18n/web_shortcuts.pot
+++ b/addons/web_shortcuts/i18n/web_shortcuts.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-21 17:06+0000\n"
+"PO-Revision-Date: 2012-12-21 17:06+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"