diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 5177e99cba0..cd1d5fb1801 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-10 08:43+0000\n"
-"PO-Revision-Date: 2016-10-10 08:43+0000\n"
+"POT-Creation-Date: 2016-11-14 15:53+0000\n"
+"PO-Revision-Date: 2016-11-14 15:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -104,21 +104,21 @@ msgid "${object.subject}"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:466
+#: code:addons/account/models/account_bank_statement.py:467
#, python-format
msgid "%d transactions were automatically reconciled."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:603
+#: code:addons/account/models/account.py:610
#, python-format
msgid "%s (Copy)"
msgstr ""
#. module: account
#: code:addons/account/models/account.py:170
-#: code:addons/account/models/account.py:335
-#: code:addons/account/models/account.py:336
+#: code:addons/account/models/account.py:342
+#: code:addons/account/models/account.py:343
#, python-format
msgid "%s (copy)"
msgstr ""
@@ -144,7 +144,7 @@ msgid "-> View partially reconciled entries"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:467
+#: code:addons/account/models/account_bank_statement.py:468
#, python-format
msgid "1 transaction was automatically reconciled."
msgstr ""
@@ -768,19 +768,19 @@ msgid "A Cash Register allows you to manage cash entries in your cash\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1379
+#: code:addons/account/models/account_invoice.py:1399
#, python-format
msgid "A Payment Term should have its last line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1382
+#: code:addons/account/models/account_invoice.py:1402
#, python-format
msgid "A Payment Term should have only one line of type Balance."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:528
+#: code:addons/account/models/account.py:535
#, python-format
msgid "A bank account can only belong to one journal."
msgstr ""
@@ -827,14 +827,14 @@ msgid "A product in Odoo is something you sell or buy \n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:730
+#: code:addons/account/models/account_move.py:731
#, python-format
msgid "A reconciliation must involve at least 2 move lines."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:865
-#: code:addons/account/models/account_bank_statement.py:868
+#: code:addons/account/models/account_bank_statement.py:867
+#: code:addons/account/models/account_bank_statement.py:870
#, python-format
msgid "A selected move line was already reconciled."
msgstr ""
@@ -851,7 +851,7 @@ msgid "A tax fiscal position could be defined only once time on same taxes."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:379
+#: code:addons/account/models/account_bank_statement.py:380
#, python-format
msgid "A transaction can't have a 0 amount."
msgstr ""
@@ -1517,7 +1517,9 @@ msgstr ""
#: model:ir.model.fields,field_description:account.field_cash_box_in_amount
#: model:ir.model.fields,field_description:account.field_cash_box_out_amount
#: model:ir.model.fields,field_description:account.field_tax_adjustments_wizard_amount
+#: model:ir.ui.view,arch_db:account.view_account_payment_tree
#: model:ir.ui.view,arch_db:account.view_account_reconcile_model_form
+#: model:ir.ui.view,arch_db:account.view_account_supplier_payment_tree
#: model:ir.ui.view,arch_db:account.view_move_line_form
#, python-format
msgid "Amount"
@@ -1798,7 +1800,7 @@ msgid "Automatic reconciliation"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:472
+#: code:addons/account/models/account_bank_statement.py:473
#, python-format
msgid "Automatically reconciled items"
msgstr ""
@@ -1856,7 +1858,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:685
+#: code:addons/account/models/chart_template.py:687
#: model:ir.model.fields,field_description:account.field_account_journal_bank_id
#: model:ir.model.fields,field_description:account.field_res_partner_bank_account_count
#, python-format
@@ -2203,32 +2205,32 @@ msgid "Cancelled Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:172
+#: code:addons/account/models/account_move.py:173
#, python-format
msgid "Cannot create moves for different companies."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:204
+#: code:addons/account/models/account_move.py:205
#, python-format
msgid "Cannot create unbalanced journal entry."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:474
+#: code:addons/account/models/account_invoice.py:477
#, python-format
msgid "Cannot find a chart of accounts for this company, You should configure it. \n"
"Please go to Account Configuration."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:418
+#: code:addons/account/models/account.py:425
#, python-format
msgid "Cannot generate an unused account code."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:448
+#: code:addons/account/models/account.py:455
#, python-format
msgid "Cannot generate an unused journal code. Please fill the 'Shortcode' field."
msgstr ""
@@ -2248,7 +2250,7 @@ msgstr ""
#. module: account
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.journal,type:0
-#: code:addons/account/models/chart_template.py:685
+#: code:addons/account/models/chart_template.py:687
#, python-format
msgid "Cash"
msgstr ""
@@ -2670,7 +2672,7 @@ msgid "Complete set of taxes"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:411
+#: code:addons/account/models/account_invoice.py:414
#, python-format
msgid "Compose Email"
msgstr ""
@@ -2699,21 +2701,21 @@ msgid "Configuration Error !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:340
+#: code:addons/account/models/account_invoice.py:343
#, python-format
msgid "Configuration error!\n"
"Could not find any account to create the invoice, are you sure you have a chart of account installed?"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:294
+#: code:addons/account/models/account.py:301
#, python-format
msgid "Configuration error!\n"
"The currency of the journal should be the same than the default credit account."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:296
+#: code:addons/account/models/account.py:303
#, python-format
msgid "Configuration error!\n"
"The currency of the journal should be the same than the default debit account."
@@ -3112,8 +3114,8 @@ msgid "Currency as per company's country."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1320
-#: code:addons/account/models/account_move.py:1330
+#: code:addons/account/models/account_move.py:1329
+#: code:addons/account/models/account_move.py:1339
#, python-format
msgid "Currency exchange rate difference"
msgstr ""
@@ -3670,7 +3672,7 @@ msgid "Due date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:892
+#: code:addons/account/models/account_invoice.py:906
#, python-format
msgid "Duplicated vendor reference detected. You probably encoded twice the same vendor bill/refund."
msgstr ""
@@ -3696,7 +3698,7 @@ msgid "Efficiency at its finest"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:883
+#: code:addons/account/models/account_move.py:884
#, python-format
msgid "Either pass both debit and credit or none."
msgstr ""
@@ -3772,7 +3774,7 @@ msgid "Entries Sorted by"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:848
+#: code:addons/account/models/account_move.py:849
#, python-format
msgid "Entries are not of the same account!"
msgstr ""
@@ -4094,7 +4096,7 @@ msgid "Forces all moves for this account to have this secondary currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:78
+#: code:addons/account/models/account_invoice.py:81
#, python-format
msgid "Free Reference"
msgstr ""
@@ -4237,7 +4239,7 @@ msgid "Go to bank statements"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:475
+#: code:addons/account/models/account_invoice.py:478
#, python-format
msgid "Go to the configuration panel"
msgstr ""
@@ -4397,7 +4399,7 @@ msgid "INV"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:385
+#: code:addons/account/models/account_bank_statement.py:386
#, python-format
msgid "If \"Amount Currency\" is specified, then \"Amount\" must be as well."
msgstr ""
@@ -4542,7 +4544,7 @@ msgid "In Odoo,"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:405
+#: code:addons/account/models/account_bank_statement.py:406
#, python-format
msgid "In order to delete a bank statement line, you must first cancel it to delete related journal items."
msgstr ""
@@ -4697,7 +4699,7 @@ msgid "Invite Users"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:942
+#: code:addons/account/models/account_invoice.py:956
#: model:ir.model,name:account.model_account_invoice
#: model:ir.model.fields,field_description:account.field_account_invoice_tax_invoice_id
#: model:ir.model.fields,field_description:account.field_res_partner_invoice_warn
@@ -4774,37 +4776,37 @@ msgid "Invoice id"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:552
+#: code:addons/account/models/account_invoice.py:555
#, python-format
msgid "Invoice must be a draft in order to set it to Pro-forma."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:532
+#: code:addons/account/models/account_invoice.py:535
#, python-format
msgid "Invoice must be cancelled in order to reset it to draft."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:560
+#: code:addons/account/models/account_invoice.py:563
#, python-format
msgid "Invoice must be in draft or Pro-forma state in order to validate it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:584
+#: code:addons/account/models/account_invoice.py:587
#, python-format
msgid "Invoice must be in draft,Pro-forma or open state in order to be cancelled."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:578
+#: code:addons/account/models/account_invoice.py:581
#, python-format
msgid "Invoice must be paid in order to set it to register payemnt."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:570
+#: code:addons/account/models/account_invoice.py:573
#, python-format
msgid "Invoice must be validated in order to set it to register payemnt."
msgstr ""
@@ -4821,7 +4823,7 @@ msgid "Invoice refund"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1468
+#: code:addons/account/models/account_invoice.py:1488
#, python-format
msgid "Invoice sent"
msgstr ""
@@ -4934,13 +4936,13 @@ msgid "It indicates that the invoice has been sent."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:881
+#: code:addons/account/models/account_move.py:882
#, python-format
msgid "It is mandatory to specify an account and a journal to create a write-off."
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:407
+#: code:addons/account/models/account_bank_statement.py:408
#, python-format
msgid "It is not allowed to delete a bank statement line that already created a journal entry since it would create a gap in the numbering. You should create the journal entry again and cancel it thanks to a regular revert."
msgstr ""
@@ -5024,13 +5026,16 @@ msgid "Journal & Partner"
msgstr ""
#. module: account
+#: code:addons/account/models/account_bank_statement.py:253
#: model:ir.actions.act_window,name:account.action_move_journal_line
#: model:ir.actions.act_window,name:account.action_move_select
#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_entry_ids
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_account_journal_form
+#: model:ir.ui.view,arch_db:account.view_bank_statement_form
#: model:ir.ui.view,arch_db:account.view_move_tree
+#, python-format
msgid "Journal Entries"
msgstr ""
@@ -5074,7 +5079,6 @@ msgid "Journal Item Label"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:253
#: code:addons/account/models/account_payment.py:271
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
#: model:ir.actions.act_window,name:account.act_account_move_to_account_move_line_open
@@ -5093,7 +5097,6 @@ msgstr ""
#: model:ir.ui.menu,name:account.menu_action_account_moves_all
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.view_account_payment_form
-#: model:ir.ui.view,arch_db:account.view_bank_statement_form
#: model:ir.ui.view,arch_db:account.view_move_form
#: model:ir.ui.view,arch_db:account.view_move_line_pivot
#: model:ir.ui.view,arch_db:account.view_move_line_tree
@@ -5453,7 +5456,7 @@ msgid "Legal mentions that have to be printed on the invoices."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:146
+#: code:addons/account/models/account_invoice.py:149
#, python-format
msgid "Less Payment"
msgstr ""
@@ -5790,7 +5793,7 @@ msgid "Move line ids"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1146
+#: code:addons/account/models/account_move.py:1155
#, python-format
msgid "Move name (id): %s (%s)"
msgstr ""
@@ -5872,7 +5875,7 @@ msgid "New Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1123
+#: code:addons/account/models/account_move.py:1132
#, python-format
msgid "New expected payment date: "
msgstr ""
@@ -5898,7 +5901,7 @@ msgid "No Message"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1066
+#: code:addons/account/models/account_invoice.py:1080
#, python-format
msgid "No appropriate payment method enabled on journal %s"
msgstr ""
@@ -6129,7 +6132,7 @@ msgid "Only a draft payment can be posted. Trying to post a payment in state %s.
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:778
+#: code:addons/account/models/chart_template.py:780
#, python-format
msgid "Only administrators can change the settings"
msgstr ""
@@ -6180,7 +6183,7 @@ msgid "Operation Templates"
msgstr ""
#. module: account
-#: code:addons/account/models/account_bank_statement.py:983
+#: code:addons/account/models/account_bank_statement.py:1000
#, python-format
msgid "Operation not allowed. Since your statement line already received a number, you cannot reconcile it entirely with existing journal entries otherwise it would make a gap in the numbering. You should book an entry and make a regular revert of it in case you want to cancel it."
msgstr ""
@@ -6262,7 +6265,7 @@ msgid "Outstanding Transactions"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:113
+#: code:addons/account/models/account_invoice.py:116
#, python-format
msgid "Outstanding credits"
msgstr ""
@@ -6273,7 +6276,7 @@ msgid "Outstanding credits debits widget"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:116
+#: code:addons/account/models/account_invoice.py:119
#, python-format
msgid "Outstanding debits"
msgstr ""
@@ -6685,7 +6688,7 @@ msgid "Percentage of balance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1450
+#: code:addons/account/models/account_invoice.py:1470
#, python-format
msgid "Percentages for Payment Terms Line must be between 0 and 100."
msgstr ""
@@ -6723,7 +6726,7 @@ msgid "Please check that the field 'Transfer Account' is set on the company."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:797
+#: code:addons/account/models/account_invoice.py:811
#, python-format
msgid "Please create some invoice lines."
msgstr ""
@@ -6735,7 +6738,7 @@ msgid "Please define a sequence on the journal."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:795
+#: code:addons/account/models/account_invoice.py:809
#, python-format
msgid "Please define sequence on the journal related to this invoice."
msgstr ""
@@ -7206,7 +7209,7 @@ msgid "Reference/Description"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:944
+#: code:addons/account/models/account_invoice.py:958
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
#: model:ir.ui.view,arch_db:account.invoice_form
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
@@ -7845,6 +7848,7 @@ msgid "States count"
msgstr ""
#. module: account
+#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_state
#: model:ir.model.fields,field_description:account.field_account_bank_statement_state
#: model:ir.model.fields,field_description:account.field_account_invoice_state
#: model:ir.model.fields,field_description:account.field_account_move_state
@@ -7926,8 +7930,8 @@ msgid "Tax"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:759
-#: code:addons/account/models/chart_template.py:762
+#: code:addons/account/models/chart_template.py:761
+#: code:addons/account/models/chart_template.py:764
#, python-format
msgid "Tax %.2f%%"
msgstr ""
@@ -7989,7 +7993,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "Tax ID (VAT)"
+msgid "Tax ID"
msgstr ""
#. module: account
@@ -8243,7 +8247,7 @@ msgid "The Deposit Ticket module can also be used to settle credit card batch ma
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:850
+#: code:addons/account/models/account_move.py:851
#, python-format
msgid "The account %s (%s) is not marked as reconciliable !"
msgstr ""
@@ -8265,19 +8269,19 @@ msgid "The amount expressed in the related account currency if not equal to the
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:425
+#: code:addons/account/models/account_move.py:426
#, python-format
msgid "The amount expressed in the secondary currency must be positive when account is debited and negative when account is credited."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:598
+#: code:addons/account/models/account.py:605
#, python-format
msgid "The application scope of taxes in a group must be either the same as the group or \"None\"."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:303
+#: code:addons/account/models/account.py:310
#, python-format
msgid "The bank account of a bank journal must belong to the same company (%s)."
msgstr ""
@@ -8332,7 +8336,7 @@ msgstr ""
#. module: account
#: model:ir.ui.view,arch_db:account.account_planner
-msgid "The first step is to set up your company information. This is mostly used for invoicing."
+msgid "The first step is to set up your company's information. This is mostly used in printed business documents like orders and invoices."
msgstr ""
#. module: account
@@ -8341,7 +8345,7 @@ msgid "The fiscal position will determine taxes and accounts used for the partne
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:307
+#: code:addons/account/models/account.py:314
#, python-format
msgid "The holder of a journal's bank account must be the company (%s)."
msgstr ""
@@ -8406,7 +8410,7 @@ msgid "The partner has at least one unreconciled debit and credit since last tim
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:852
+#: code:addons/account/models/account_move.py:853
#, python-format
msgid "The partner has to be the same on all lines for receivable and payable accounts!"
msgstr ""
@@ -8433,13 +8437,13 @@ msgid "The residual amount on a journal item expressed in the company currency."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:410
+#: code:addons/account/models/account_move.py:411
#, python-format
msgid "The selected account of your Journal Entry forces to provide a secondary currency. You should remove the secondary currency on the account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1311
+#: code:addons/account/models/account_invoice.py:1325
#, python-format
msgid "The selected unit of measure is not compatible with the unit of measure of the product."
msgstr ""
@@ -8494,7 +8498,7 @@ msgid "These users handle billing specifically."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1043
+#: code:addons/account/models/account_invoice.py:1057
#, python-format
msgid "This %s has been created from: %s"
msgstr ""
@@ -8625,13 +8629,13 @@ msgid "This is the accounting dashboard. If you have not yet\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:344
+#: code:addons/account/models/account.py:351
#, python-format
msgid "This journal already contains items, therefore you cannot modify its company."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:347
+#: code:addons/account/models/account.py:354
#, python-format
msgid "This journal already contains items, therefore you cannot modify its short name."
msgstr ""
@@ -8739,7 +8743,12 @@ msgid "To manage the tax applied when invoicing a Company, Odoo uses the concept
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:846
+#: model:ir.ui.view,arch_db:account.invoice_supplier_tree
+msgid "To pay"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:847
#, python-format
msgid "To reconcile the entries company should be the same for all entries!"
msgstr ""
@@ -8920,7 +8929,7 @@ msgid "Type"
msgstr ""
#. module: account
-#: code:addons/account/models/chart_template.py:817
+#: code:addons/account/models/chart_template.py:819
#, python-format
msgid "Undistributed Profits/Losses"
msgstr ""
@@ -8939,7 +8948,7 @@ msgid "Unit of Measure"
msgstr ""
#. module: account
-#: code:addons/account/report/account_aged_partner_balance.py:185
+#: code:addons/account/report/account_aged_partner_balance.py:187
#, python-format
msgid "Unknown Partner"
msgstr ""
@@ -9161,7 +9170,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:943
+#: code:addons/account/models/account_invoice.py:957
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9202,7 +9211,7 @@ msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
-#: code:addons/account/models/account_invoice.py:945
+#: code:addons/account/models/account_invoice.py:959
#: code:addons/account/models/account_payment.py:491
#: model:ir.ui.view,arch_db:account.report_invoice_document
#, python-format
@@ -9244,7 +9253,7 @@ msgid "Warning"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:496
+#: code:addons/account/models/account_invoice.py:499
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -9255,8 +9264,8 @@ msgid "Warning on the Invoice"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1251
-#: code:addons/account/models/account_invoice.py:1310
+#: code:addons/account/models/account_invoice.py:1265
+#: code:addons/account/models/account_invoice.py:1324
#, python-format
msgid "Warning!"
msgstr ""
@@ -9345,7 +9354,7 @@ msgid "Wizard for Tax Adjustments"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:887
+#: code:addons/account/models/account_move.py:888
#: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full
#, python-format
msgid "Write-Off"
@@ -9377,7 +9386,7 @@ msgid "Wrong credit or debit value in accounting entry !"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:844
+#: code:addons/account/models/account_move.py:845
#, python-format
msgid "You are trying to reconcile some entries that are already reconciled!"
msgstr ""
@@ -9423,19 +9432,19 @@ msgid "You can set up here the format you want this record to be displayed. If y
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:184
+#: code:addons/account/models/account_move.py:185
#, python-format
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:186
+#: code:addons/account/models/account_move.py:187
#, python-format
msgid "You cannot add/modify entries prior to and inclusive of the lock date %s. Check the company settings or ask someone with the 'Adviser' role"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:924
+#: code:addons/account/models/account_invoice.py:938
#, python-format
msgid "You cannot cancel an invoice which is partially paid. You need to unreconcile related payment entries first."
msgstr ""
@@ -9447,45 +9456,51 @@ msgid "You cannot change the owner company of an account that already contains j
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:417
+#: code:addons/account/models/account.py:187
+#, python-format
+msgid "You cannot change the value of the reconciliation on this account as it already has some moves"
+msgstr ""
+
+#. module: account
+#: code:addons/account/models/account_move.py:418
#, python-format
msgid "You cannot create journal items with a secondary currency without filling both 'currency' and 'amount currency' field."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:448
+#: code:addons/account/models/account_invoice.py:451
#, python-format
msgid "You cannot delete an invoice after it has been validated (and received a number). You can set it back to \"Draft\" state and modify its content, then re-confirm it."
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:446
+#: code:addons/account/models/account_invoice.py:449
#, python-format
msgid "You cannot delete an invoice which is not draft or cancelled. You should refund it instead."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:186
+#: code:addons/account/models/account.py:193
#, python-format
msgid "You cannot do that on an account that contains journal items."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1148
+#: code:addons/account/models/account_move.py:1157
#, python-format
msgid "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n"
"%s."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1150
+#: code:addons/account/models/account_move.py:1159
#, 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."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:359
+#: code:addons/account/models/account.py:366
#, python-format
msgid "You cannot empty the account number once set.\n"
"If you would like to delete the account number, you can do it from the Bank Accounts list."
@@ -9518,7 +9533,7 @@ msgid "You cannot modify a posted entry of this journal.\n"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:572
+#: code:addons/account/models/account_invoice.py:575
#, python-format
msgid "You cannot pay an invoice which is partially paid. You need to reconcile payment entries first."
msgstr ""
@@ -9530,20 +9545,20 @@ msgid "You cannot put/take money in/out for a bank statement which is closed."
msgstr ""
#. module: account
-#: code:addons/account/models/account.py:191
+#: code:addons/account/models/account.py:198
#, python-format
msgid "You cannot remove/deactivate an account which is set on a customer or vendor."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1008
-#: code:addons/account/models/account_move.py:1114
+#: code:addons/account/models/account_move.py:1014
+#: code:addons/account/models/account_move.py:1123
#, python-format
msgid "You cannot use deprecated account."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1046
+#: code:addons/account/models/account_move.py:1055
#, python-format
msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal."
msgstr ""
@@ -9561,7 +9576,7 @@ msgid "You must define a Start Date"
msgstr ""
#. module: account
-#: code:addons/account/models/account_invoice.py:1252
+#: code:addons/account/models/account_invoice.py:1266
#, python-format
msgid "You must first select a partner!"
msgstr ""
@@ -9579,19 +9594,19 @@ msgid "You must set a start date."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1304
+#: code:addons/account/models/account_move.py:1313
#, python-format
msgid "You should configure the 'Exchange Rate Journal' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:1306
+#: code:addons/account/models/account_move.py:1315
#, 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 ""
#. module: account
-#: code:addons/account/models/account_move.py:1308
+#: code:addons/account/models/account_move.py:1317
#, 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 ""
@@ -9843,7 +9858,7 @@ msgid "report.account.report_trialbalance"
msgstr ""
#. module: account
-#: code:addons/account/models/account_move.py:214
+#: code:addons/account/models/account_move.py:215
#, python-format
msgid "reversal of: "
msgstr ""
diff --git a/addons/barcodes/i18n/barcodes.pot b/addons/barcodes/i18n/barcodes.pot
index b2212e378de..925251d5af3 100644
--- a/addons/barcodes/i18n/barcodes.pot
+++ b/addons/barcodes/i18n/barcodes.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:56+0000\n"
-"PO-Revision-Date: 2016-09-07 08:56+0000\n"
+"POT-Creation-Date: 2016-11-14 15:54+0000\n"
+"PO-Revision-Date: 2016-11-14 15:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -141,6 +141,13 @@ msgstr ""
msgid "Credit Card"
msgstr ""
+#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:100
+#, python-format
+msgid "Discard"
+msgstr ""
+
#. module: barcodes
#: selection:barcode.rule,type:0
msgid "Discounted Product"
@@ -175,14 +182,14 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:62
#, python-format
msgid "Error : Document not editable"
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:60
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:66
#, python-format
msgid "Error : No last scanned barcode"
msgstr ""
@@ -263,6 +270,13 @@ msgstr ""
msgid "Rules"
msgstr ""
+#. module: barcodes
+#. openerp-web
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:86
+#, python-format
+msgid "Select"
+msgstr ""
+
#. module: barcodes
#: model:ir.model.fields,field_description:barcodes.field_barcode_rule_sequence
msgid "Sequence"
@@ -270,7 +284,7 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:77
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:85
#, python-format
msgid "Set quantity"
msgstr ""
@@ -310,14 +324,14 @@ msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:56
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:62
#, python-format
msgid "To modify this document, please first start edition."
msgstr ""
#. module: barcodes
#. openerp-web
-#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:60
+#: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:66
#, python-format
msgid "To set the quantity please scan a barcode first."
msgstr ""
diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot
index bc7b244e6df..e0b0f867794 100644
--- a/addons/base_import/i18n/base_import.pot
+++ b/addons/base_import/i18n/base_import.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:56+0000\n"
-"PO-Revision-Date: 2016-09-07 08:56+0000\n"
+"POT-Creation-Date: 2016-11-14 15:54+0000\n"
+"PO-Revision-Date: 2016-11-14 15:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,14 +17,14 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:595
+#: code:addons/base_import/static/src/js/base_import.js:598
#, python-format
msgid "(%d more)"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:373
+#: code:addons/base_import/static/src/js/base_import.js:375
#, python-format
msgid "A single column was found in the file, this often means the file separator is incorrect"
msgstr ""
@@ -37,23 +37,23 @@ msgid "Cancel"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:608
-#, python-format
-msgid "Column %s contains incorrect values (value: %s does not match date format"
-msgstr ""
-
-#. module: base_import
-#: code:addons/base_import/models/base_import.py:590
+#: code:addons/base_import/models/base_import.py:599
#, python-format
msgid "Column %s contains incorrect values (value: %s)"
msgstr ""
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:619
+#, python-format
+msgid "Column %s contains incorrect values. Error in line %d: %s"
+msgstr ""
+
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:244
-#: code:addons/base_import/static/src/js/base_import.js:255
-#: code:addons/base_import/static/src/js/base_import.js:262
-#: code:addons/base_import/static/src/js/base_import.js:274
+#: code:addons/base_import/static/src/js/base_import.js:245
+#: code:addons/base_import/static/src/js/base_import.js:256
+#: code:addons/base_import/static/src/js/base_import.js:263
+#: code:addons/base_import/static/src/js/base_import.js:275
#, python-format
msgid "Comma"
msgstr ""
@@ -95,8 +95,8 @@ msgid "Created on"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:151
-#: code:addons/base_import/models/base_import.py:156
+#: code:addons/base_import/models/base_import.py:152
+#: code:addons/base_import/models/base_import.py:157
#, python-format
msgid "Database ID"
msgstr ""
@@ -110,7 +110,14 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:127
+#: code:addons/base_import/static/src/js/base_import.js:126
+#, python-format
+msgid "Datetime Format:"
+msgstr ""
+
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/base_import.js:128
#, python-format
msgid "Decimal Separator:"
msgstr ""
@@ -135,15 +142,15 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:416
+#: code:addons/base_import/static/src/js/base_import.js:419
#, python-format
msgid "Don't import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:263
-#: code:addons/base_import/static/src/js/base_import.js:281
+#: code:addons/base_import/static/src/js/base_import.js:264
+#: code:addons/base_import/static/src/js/base_import.js:282
#, python-format
msgid "Dot"
msgstr ""
@@ -156,21 +163,27 @@ msgid "Encoding:"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:233
+#: code:addons/base_import/models/base_import.py:621
+#, python-format
+msgid "Error Parsing Date [%s:L%d]: %s"
+msgstr ""
+
+#. module: base_import
+#: code:addons/base_import/models/base_import.py:234
#, python-format
msgid "Error cell found while reading XLS/XLSX file: %s"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:572
+#: code:addons/base_import/static/src/js/base_import.js:575
#, python-format
msgid "Everything seems valid."
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:116
-#: code:addons/base_import/models/base_import.py:150
+#: code:addons/base_import/models/base_import.py:117
+#: code:addons/base_import/models/base_import.py:151
#, python-format
msgid "External ID"
msgstr ""
@@ -204,7 +217,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:619
+#: code:addons/base_import/static/src/js/base_import.js:622
#, python-format
msgid "Get all possible values"
msgstr ""
@@ -218,7 +231,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:606
+#: code:addons/base_import/static/src/js/base_import.js:609
#, python-format
msgid "Here are the possible values:"
msgstr ""
@@ -275,7 +288,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:181
+#: code:addons/base_import/static/src/js/base_import.js:182
#, python-format
msgid "Import a File"
msgstr ""
@@ -374,7 +387,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:482
+#: code:addons/base_import/static/src/js/base_import.js:485
#, python-format
msgid "Normal Fields"
msgstr ""
@@ -398,14 +411,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:122
-#, python-format
-msgid "Quoting:"
-msgstr ""
-
-#. module: base_import
-#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:483
+#: code:addons/base_import/static/src/js/base_import.js:486
#, python-format
msgid "Relation Fields"
msgstr ""
@@ -426,7 +432,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:245
+#: code:addons/base_import/static/src/js/base_import.js:246
#, python-format
msgid "Semicolon"
msgstr ""
@@ -452,18 +458,25 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:247
+#: code:addons/base_import/static/src/js/base_import.js:248
#, python-format
msgid "Space"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:246
+#: code:addons/base_import/static/src/js/base_import.js:247
#, python-format
msgid "Tab"
msgstr ""
+#. module: base_import
+#. openerp-web
+#: code:addons/base_import/static/src/js/base_import.js:122
+#, python-format
+msgid "Text Delimiter:"
+msgstr ""
+
#. module: base_import
#. openerp-web
#: code:addons/base_import/static/src/xml/base_import.xml:68
@@ -474,9 +487,9 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:126
+#: code:addons/base_import/static/src/js/base_import.js:127
#, python-format
-msgid "Thousand Separator:"
+msgid "Thousands Separator:"
msgstr ""
#. module: base_import
@@ -487,13 +500,13 @@ msgid "Track history during import"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:198
+#: code:addons/base_import/models/base_import.py:199
#, python-format
msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\""
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:199
+#: code:addons/base_import/models/base_import.py:200
#, python-format
msgid "Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX"
msgstr ""
@@ -522,14 +535,14 @@ msgid "Value"
msgstr ""
#. module: base_import
-#: code:addons/base_import/models/base_import.py:528
+#: code:addons/base_import/models/base_import.py:537
#, python-format
msgid "You must configure at least one field to import"
msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:589
+#: code:addons/base_import/static/src/js/base_import.js:592
#, python-format
msgid "at row %d"
msgstr ""
@@ -606,7 +619,7 @@ msgstr ""
#. module: base_import
#. openerp-web
-#: code:addons/base_import/static/src/js/base_import.js:591
+#: code:addons/base_import/static/src/js/base_import.js:594
#, python-format
msgid "between rows %d and %d"
msgstr ""
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 0826c2f10c3..a3b226b2fdf 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: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-10 08:43+0000\n"
-"PO-Revision-Date: 2016-10-10 08:43+0000\n"
+"POT-Creation-Date: 2016-11-14 15:53+0000\n"
+"PO-Revision-Date: 2016-11-14 15:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -35,14 +35,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:108
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:117
#, python-format
msgid "An apple a day keeps the doctor away"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:97
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:106
#, python-format
msgid "Another good day's work! See you soon!"
msgstr ""
@@ -197,6 +197,11 @@ msgstr ""
msgid "Configuration"
msgstr ""
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.hr_employee_attendance_action_kanban
+msgid "Create a few employees to be able to select an employee here and perform his check in / check out."
+msgstr ""
+
#. module: hr_attendance
#: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance_create_uid
msgid "Created by"
@@ -224,14 +229,14 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:114
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:123
#, python-format
msgid "Early to bed and early to rise, makes a man healthy, wealthy and wise"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:106
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:115
#, python-format
msgid "Eat breakfast as a king, lunch as a merchant and supper as a beggar"
msgstr ""
@@ -314,43 +319,43 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:61
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:70
#, python-format
msgid "First come, first served"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:77
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:85
#, python-format
msgid "Glad to have you back, it's been a while!"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:68
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:76
#, python-format
msgid "Good afternoon"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:70
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:78
#, python-format
msgid "Good evening"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:65
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:73
#, python-format
msgid "Good morning"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:55
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:72
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:64
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:80
#, python-format
msgid "Good night"
msgstr ""
@@ -369,28 +374,28 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:111
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:120
#, python-format
msgid "Have a good afternoon"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:102
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:111
#, python-format
msgid "Have a good day!"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:116
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:125
#, python-format
msgid "Have a good evening"
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:104
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:113
#, python-format
msgid "Have a nice lunch!"
msgstr ""
@@ -412,7 +417,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:80
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:88
#, python-format
msgid "If a job is worth doing, it is worth doing well!"
msgstr ""
@@ -520,6 +525,11 @@ msgstr ""
msgid "Please enter your PIN to check out"
msgstr ""
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action
+msgid "Please make sure you're using the correct filter if you expected to see any."
+msgstr ""
+
#. module: hr_attendance
#. openerp-web
#: code:addons/hr_attendance/static/src/xml/attendance.xml:82
@@ -569,12 +579,12 @@ msgstr ""
#. module: hr_attendance
#: model:ir.actions.act_window,help:hr_attendance.hr_attendance_action
-msgid "The Time Tracking functionality aims to manage employee attendances from Check in/Check out actions. You can also link this feature to an attendance device using Odoo's web service features."
+msgid "The attendance records of your employees will be displayed here."
msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:59
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:68
#, python-format
msgid "The early bird catches the worm"
msgstr ""
@@ -589,6 +599,11 @@ msgstr ""
msgid "The user will have to enter his PIN to check in and out manually at the company screen."
msgstr ""
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.hr_employee_attendance_action_kanban
+msgid "To create employees go to the Employees menu."
+msgstr ""
+
#. module: hr_attendance
#: model:ir.ui.view,arch_db:hr_attendance.hr_attendance_view_filter
msgid "Today"
@@ -596,7 +611,7 @@ msgstr ""
#. module: hr_attendance
#. openerp-web
-#: code:addons/hr_attendance/static/src/js/greeting_message.js:94
+#: code:addons/hr_attendance/static/src/js/greeting_message.js:102
#, python-format
msgid "Warning! Last check in was over 12 hours ago.
If this isn't right, please contact Human Resources."
msgstr ""
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index d82d43920f1..ad80776dc3c 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-11-14 15:53+0000\n"
+"PO-Revision-Date: 2016-11-14 15:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -115,6 +115,11 @@ msgstr ""
msgid "Accounting Date"
msgstr ""
+#. module: hr_expense
+#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_sheet_form
+msgid "Accounting Entries"
+msgstr ""
+
#. module: hr_expense
#: model:ir.ui.view,arch_db:hr_expense.view_hr_expense_filter
msgid "Actual expense sheets, not the refused ones"
@@ -220,7 +225,7 @@ msgid "Click here to create new expenses."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:287
+#: code:addons/hr_expense/models/hr_expense.py:304
#, python-format
msgid "Click to add a new expense,"
msgstr ""
@@ -540,19 +545,19 @@ msgid "Expenses by Month"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:381
+#: code:addons/hr_expense/models/hr_expense.py:399
#, python-format
msgid "Expenses must belong to the same Employee."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:486
+#: code:addons/hr_expense/models/hr_expense.py:511
#, python-format
msgid "Expenses must have an expense journal specified to generate accounting entries."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:385
+#: code:addons/hr_expense/models/hr_expense.py:403
#, python-format
msgid "Expenses must have been paid by the same entity (Company or employee)"
msgstr ""
@@ -646,7 +651,7 @@ msgstr ""
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_refuse_wizard_id
#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_register_payment_wizard_id
-#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_8892
+#: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet_id_8893
msgid "ID"
msgstr ""
@@ -748,19 +753,19 @@ msgid "New Mail"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:235
+#: code:addons/hr_expense/models/hr_expense.py:251
#, python-format
msgid "No Expense account found for the product %s (or for it's category), please configure one."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:204
+#: code:addons/hr_expense/models/hr_expense.py:218
#, python-format
msgid "No Home Address found for the employee %s, please configure one."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:200
+#: code:addons/hr_expense/models/hr_expense.py:197
#, python-format
msgid "No credit account found for the %s journal, please configure one."
msgstr ""
@@ -865,7 +870,7 @@ msgid "Planner"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:239
+#: code:addons/hr_expense/models/hr_expense.py:255
#, python-format
msgid "Please configure Default Expense account for Product expense: `property_account_expense_categ_id`."
msgstr ""
@@ -1238,7 +1243,7 @@ msgid "We hope this feature helped you manage your expenses efficiently."
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:483
+#: code:addons/hr_expense/models/hr_expense.py:508
#, python-format
msgid "You can only generate accounting entry for approved expense(s)."
msgstr ""
@@ -1259,6 +1264,12 @@ msgid "You can setup a generic email alias to create\n"
" in the mail subject to set it on the expense too."
msgstr ""
+#. module: hr_expense
+#: code:addons/hr_expense/models/hr_expense.py:425
+#, python-format
+msgid "You cannot delete a posted expense."
+msgstr ""
+
#. module: hr_expense
#: code:addons/hr_expense/models/hr_expense.py:106
#, python-format
@@ -1288,7 +1299,7 @@ msgid "Your Email Address"
msgstr ""
#. module: hr_expense
-#: code:addons/hr_expense/models/hr_expense.py:465
+#: code:addons/hr_expense/models/hr_expense.py:490
#, python-format
msgid "Your Expense %s has been refused.
We appreciate your feedback. It helps us to improve continuously.
\n" " \n" "\n"
" \n"
diff --git a/addons/rating_project_issue/i18n/rating_project_issue.pot b/addons/rating_project_issue/i18n/rating_project_issue.pot
index ca8e523827c..12384296cb7 100644
--- a/addons/rating_project_issue/i18n/rating_project_issue.pot
+++ b/addons/rating_project_issue/i18n/rating_project_issue.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:57+0000\n"
-"PO-Revision-Date: 2016-09-07 08:57+0000\n"
+"POT-Creation-Date: 2016-11-14 15:54+0000\n"
+"PO-Revision-Date: 2016-11-14 15:54+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -76,3 +76,8 @@ msgstr ""
msgid "Ratings"
msgstr ""
+#. module: rating_project_issue
+#: model:ir.model,name:rating_project_issue.model_project_task_type
+msgid "Task Stage"
+msgstr ""
+
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 0491ca308da..f3602b49c9b 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-10 08:42+0000\n"
-"PO-Revision-Date: 2016-10-10 08:42+0000\n"
+"POT-Creation-Date: 2016-11-14 15:53+0000\n"
+"PO-Revision-Date: 2016-11-14 15:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
#. module: sale
#: model:mail.template,report_name:sale.email_template_edi_sale
-msgid "${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''}"
+msgid "${(object.name or '').replace('/','_')}${object.state == 'draft' and '_draft' or ''}"
msgstr ""
#. module: sale
@@ -294,7 +294,7 @@ msgid "Addresses in Sales Orders"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:146
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
#, python-format
msgid "Advance: %s"
msgstr ""
@@ -732,7 +732,7 @@ msgid "Do not personalize sales orders and invoice reports"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:85
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:84
#, python-format
msgid "Down Payment"
msgstr ""
@@ -758,7 +758,7 @@ msgid "Down payment (percentage)"
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:82
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:81
#, python-format
msgid "Down payment of %s%%"
msgstr ""
@@ -2010,25 +2010,25 @@ msgid "The printed reports will display the incoterms for the sales orders and t
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:144
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:147
#, python-format
msgid "The product used to invoice a down payment should be of type 'Service'. Please use another product or update this product."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:145
#, python-format
msgid "The product used to invoice a down payment should have an invoice policy set to \"Ordered quantities\". Please update your deposit product to be able to create a deposit invoice."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:79
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:78
#, python-format
msgid "The value of the down payment amount must be positive."
msgstr ""
#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:75
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:74
#, python-format
msgid "There is no income account defined for this product: \"%s\". You may have to install a chart of account from Accounting app, settings menu."
msgstr ""
@@ -2190,7 +2190,7 @@ msgid "Warning"
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:853
+#: code:addons/sale/models/sale.py:854
#, python-format
msgid "Warning for %s"
msgstr ""
@@ -2237,7 +2237,7 @@ msgid "You can not delete a sent quotation or a sales order! Try to cancel it be
msgstr ""
#. module: sale
-#: code:addons/sale/models/sale.py:882
+#: code:addons/sale/models/sale.py:883
#, python-format
msgid "You can not remove a sale order line.\n"
"Discard changes and try setting the quantity to 0."
diff --git a/addons/web_editor/i18n/web_editor.pot b/addons/web_editor/i18n/web_editor.pot
index 2bf6d27f4c9..dfd701b5159 100644
--- a/addons/web_editor/i18n/web_editor.pot
+++ b/addons/web_editor/i18n/web_editor.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 14:00+0000\n"
-"PO-Revision-Date: 2016-09-29 14:00+0000\n"
+"POT-Creation-Date: 2016-11-14 15:55+0000\n"
+"PO-Revision-Date: 2016-11-14 15:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:894
+#: code:addons/web_editor/static/src/js/rte.summernote.js:891
#, python-format
msgid "(YouTube, Vimeo, Vine, Instagram, DailyMotion or Youku)"
msgstr ""
@@ -66,7 +66,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:946
+#: code:addons/web_editor/static/src/js/rte.summernote.js:943
#, python-format
msgid "Action"
msgstr ""
@@ -92,21 +92,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:928
+#: code:addons/web_editor/static/src/js/rte.summernote.js:925
#, python-format
msgid "Align center"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:927
+#: code:addons/web_editor/static/src/js/rte.summernote.js:924
#, python-format
msgid "Align left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:929
+#: code:addons/web_editor/static/src/js/rte.summernote.js:926
#, python-format
msgid "Align right"
msgstr ""
@@ -151,7 +151,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:935
+#: code:addons/web_editor/static/src/js/rte.summernote.js:932
#: code:addons/web_editor/static/src/xml/snippets.xml:49
#, python-format
msgid "Background Color"
@@ -232,7 +232,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:855
+#: code:addons/web_editor/static/src/js/rte.summernote.js:852
#, python-format
msgid "Bold"
msgstr ""
@@ -253,7 +253,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:944
+#: code:addons/web_editor/static/src/js/rte.summernote.js:941
#: code:addons/web_editor/static/src/js/translator.js:74
#: code:addons/web_editor/static/src/xml/ace.xml:17
#, python-format
@@ -262,14 +262,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:906
+#: code:addons/web_editor/static/src/js/rte.summernote.js:903
#, python-format
msgid "Code"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:921
+#: code:addons/web_editor/static/src/js/rte.summernote.js:918
#, python-format
msgid "Code View"
msgstr ""
@@ -393,21 +393,21 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:948
+#: code:addons/web_editor/static/src/js/rte.summernote.js:945
#, python-format
msgid "Document Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:830
+#: code:addons/web_editor/static/src/js/rte.summernote.js:827
#, python-format
msgid "Double-click to edit"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:875
+#: code:addons/web_editor/static/src/js/rte.summernote.js:872
#, python-format
msgid "Drag an image here"
msgstr ""
@@ -429,7 +429,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/js/rte.summernote.js:159
-#: code:addons/web_editor/static/src/js/rte.summernote.js:884
+#: code:addons/web_editor/static/src/js/rte.summernote.js:881
#, python-format
msgid "Edit"
msgstr ""
@@ -467,6 +467,13 @@ msgstr ""
msgid "Extra Small"
msgstr ""
+#. module: web_editor
+#. openerp-web
+#: code:addons/web_editor/static/src/js/rte.summernote.js:864
+#, python-format
+msgid "File / Image"
+msgstr ""
+
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/snippets.xml:25
@@ -476,42 +483,42 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:872
+#: code:addons/web_editor/static/src/js/rte.summernote.js:869
#, python-format
msgid "Float Left"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:874
+#: code:addons/web_editor/static/src/js/rte.summernote.js:871
#, python-format
msgid "Float None"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:873
+#: code:addons/web_editor/static/src/js/rte.summernote.js:870
#, python-format
msgid "Float Right"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:936
+#: code:addons/web_editor/static/src/js/rte.summernote.js:933
#, python-format
msgid "Font Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:863
+#: code:addons/web_editor/static/src/js/rte.summernote.js:860
#, python-format
msgid "Font Family"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:864
+#: code:addons/web_editor/static/src/js/rte.summernote.js:861
#, python-format
msgid "Font Size"
msgstr ""
@@ -525,7 +532,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:920
+#: code:addons/web_editor/static/src/js/rte.summernote.js:917
#, python-format
msgid "Full Screen"
msgstr ""
@@ -567,49 +574,49 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:907
+#: code:addons/web_editor/static/src/js/rte.summernote.js:904
#, python-format
msgid "Header 1"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:908
+#: code:addons/web_editor/static/src/js/rte.summernote.js:905
#, python-format
msgid "Header 2"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:909
+#: code:addons/web_editor/static/src/js/rte.summernote.js:906
#, python-format
msgid "Header 3"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:910
+#: code:addons/web_editor/static/src/js/rte.summernote.js:907
#, python-format
msgid "Header 4"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:911
+#: code:addons/web_editor/static/src/js/rte.summernote.js:908
#, python-format
msgid "Header 5"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:912
+#: code:addons/web_editor/static/src/js/rte.summernote.js:909
#, python-format
msgid "Header 6"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:919
+#: code:addons/web_editor/static/src/js/rte.summernote.js:916
#, python-format
msgid "Help"
msgstr ""
@@ -642,7 +649,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:877
+#: code:addons/web_editor/static/src/js/rte.summernote.js:874
#, python-format
msgid "Image URL"
msgstr ""
@@ -656,7 +663,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:926
+#: code:addons/web_editor/static/src/js/rte.summernote.js:923
#, python-format
msgid "Indent"
msgstr ""
@@ -671,49 +678,49 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:900
+#: code:addons/web_editor/static/src/js/rte.summernote.js:897
#, python-format
msgid "Insert Horizontal Rule"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:868
+#: code:addons/web_editor/static/src/js/rte.summernote.js:865
#, python-format
msgid "Insert Image"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:882
+#: code:addons/web_editor/static/src/js/rte.summernote.js:879
#, python-format
msgid "Insert Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:892
+#: code:addons/web_editor/static/src/js/rte.summernote.js:889
#, python-format
msgid "Insert Video"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:856
+#: code:addons/web_editor/static/src/js/rte.summernote.js:853
#, python-format
msgid "Italic"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:930
+#: code:addons/web_editor/static/src/js/rte.summernote.js:927
#, python-format
msgid "Justify full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:943
+#: code:addons/web_editor/static/src/js/rte.summernote.js:940
#, python-format
msgid "Keyboard shortcuts"
msgstr ""
@@ -743,14 +750,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:862
+#: code:addons/web_editor/static/src/js/rte.summernote.js:859
#, python-format
msgid "Line Height"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:881
+#: code:addons/web_editor/static/src/js/rte.summernote.js:878
#: code:addons/web_editor/static/src/xml/editor.xml:254
#, python-format
msgid "Link"
@@ -779,7 +786,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:934
+#: code:addons/web_editor/static/src/js/rte.summernote.js:931
#, python-format
msgid "More Color"
msgstr ""
@@ -813,7 +820,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:904
+#: code:addons/web_editor/static/src/js/rte.summernote.js:901
#, python-format
msgid "Normal"
msgstr ""
@@ -827,7 +834,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:887
+#: code:addons/web_editor/static/src/js/rte.summernote.js:884
#: code:addons/web_editor/static/src/xml/editor.xml:235
#, python-format
msgid "Open in new window"
@@ -835,14 +842,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:916
+#: code:addons/web_editor/static/src/js/rte.summernote.js:913
#, python-format
msgid "Ordered list"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:925
+#: code:addons/web_editor/static/src/js/rte.summernote.js:922
#, python-format
msgid "Outdent"
msgstr ""
@@ -856,14 +863,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:924
+#: code:addons/web_editor/static/src/js/rte.summernote.js:921
#, python-format
msgid "Paragraph"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:947
+#: code:addons/web_editor/static/src/js/rte.summernote.js:944
#, python-format
msgid "Paragraph formatting"
msgstr ""
@@ -875,13 +882,6 @@ msgstr ""
msgid "Pictogram"
msgstr ""
-#. module: web_editor
-#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:867
-#, python-format
-msgid "Picture"
-msgstr ""
-
#. module: web_editor
#. openerp-web
#: code:addons/web_editor/static/src/xml/editor.xml:196
@@ -901,7 +901,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:905
+#: code:addons/web_editor/static/src/js/rte.summernote.js:902
#, python-format
msgid "Quote"
msgstr ""
@@ -915,14 +915,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:933
+#: code:addons/web_editor/static/src/js/rte.summernote.js:930
#, python-format
msgid "Recent Color"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:952
+#: code:addons/web_editor/static/src/js/rte.summernote.js:949
#, python-format
msgid "Redo"
msgstr ""
@@ -943,14 +943,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:861
+#: code:addons/web_editor/static/src/js/rte.summernote.js:858
#, python-format
msgid "Remove Font Style"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:878
+#: code:addons/web_editor/static/src/js/rte.summernote.js:875
#, python-format
msgid "Remove Image"
msgstr ""
@@ -985,7 +985,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:939
+#: code:addons/web_editor/static/src/js/rte.summernote.js:936
#, python-format
msgid "Reset"
msgstr ""
@@ -999,28 +999,28 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:940
+#: code:addons/web_editor/static/src/js/rte.summernote.js:937
#, python-format
msgid "Reset to default"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:869
+#: code:addons/web_editor/static/src/js/rte.summernote.js:866
#, python-format
msgid "Resize Full"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:870
+#: code:addons/web_editor/static/src/js/rte.summernote.js:867
#, python-format
msgid "Resize Half"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:871
+#: code:addons/web_editor/static/src/js/rte.summernote.js:868
#, python-format
msgid "Resize Quarter"
msgstr ""
@@ -1078,7 +1078,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:876
+#: code:addons/web_editor/static/src/js/rte.summernote.js:873
#, python-format
msgid "Select from files"
msgstr ""
@@ -1099,7 +1099,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:938
+#: code:addons/web_editor/static/src/js/rte.summernote.js:935
#, python-format
msgid "Set transparent"
msgstr ""
@@ -1142,14 +1142,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:858
+#: code:addons/web_editor/static/src/js/rte.summernote.js:855
#, python-format
msgid "Strikethrough"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:903
+#: code:addons/web_editor/static/src/js/rte.summernote.js:900
#: code:addons/web_editor/static/src/xml/editor.xml:246
#, python-format
msgid "Style"
@@ -1157,7 +1157,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:859
+#: code:addons/web_editor/static/src/js/rte.summernote.js:856
#, python-format
msgid "Subscript"
msgstr ""
@@ -1172,35 +1172,35 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:860
+#: code:addons/web_editor/static/src/js/rte.summernote.js:857
#, python-format
msgid "Superscript"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:897
+#: code:addons/web_editor/static/src/js/rte.summernote.js:894
#, python-format
msgid "Table"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/ace.js:215
+#: code:addons/web_editor/static/src/js/ace.js:220
#, python-format
msgid "Template ID: %s"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:945
+#: code:addons/web_editor/static/src/js/rte.summernote.js:942
#, python-format
msgid "Text formatting"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:885
+#: code:addons/web_editor/static/src/js/rte.summernote.js:882
#, python-format
msgid "Text to display"
msgstr ""
@@ -1237,7 +1237,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:886
+#: code:addons/web_editor/static/src/js/rte.summernote.js:883
#, python-format
msgid "To what URL should this link go?"
msgstr ""
@@ -1258,7 +1258,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:937
+#: code:addons/web_editor/static/src/js/rte.summernote.js:934
#: model:ir.ui.view,arch_db:web_editor.colorpicker
#, python-format
msgid "Transparent"
@@ -1273,28 +1273,28 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:857
+#: code:addons/web_editor/static/src/js/rte.summernote.js:854
#, python-format
msgid "Underline"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:951
+#: code:addons/web_editor/static/src/js/rte.summernote.js:948
#, python-format
msgid "Undo"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:883
+#: code:addons/web_editor/static/src/js/rte.summernote.js:880
#, python-format
msgid "Unlink"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:915
+#: code:addons/web_editor/static/src/js/rte.summernote.js:912
#, python-format
msgid "Unordered list"
msgstr ""
@@ -1329,7 +1329,7 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:890
+#: code:addons/web_editor/static/src/js/rte.summernote.js:887
#: code:addons/web_editor/static/src/xml/editor.xml:53
#, python-format
msgid "Video"
@@ -1337,14 +1337,14 @@ msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:891
+#: code:addons/web_editor/static/src/js/rte.summernote.js:888
#, python-format
msgid "Video Link"
msgstr ""
#. module: web_editor
#. openerp-web
-#: code:addons/web_editor/static/src/js/rte.summernote.js:893
+#: code:addons/web_editor/static/src/js/rte.summernote.js:890
#, python-format
msgid "Video URL?"
msgstr ""
diff --git a/addons/web_planner/i18n/web_planner.pot b/addons/web_planner/i18n/web_planner.pot
index c0f6c5554bf..51bd08b2a49 100644
--- a/addons/web_planner/i18n/web_planner.pot
+++ b/addons/web_planner/i18n/web_planner.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-07 08:57+0000\n"
-"PO-Revision-Date: 2016-09-07 08:57+0000\n"
+"POT-Creation-Date: 2016-11-14 15:55+0000\n"
+"PO-Revision-Date: 2016-11-14 15:55+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,6 +21,13 @@ msgstr ""
msgid "Active"
msgstr ""
+#. module: web_planner
+#. openerp-web
+#: code:addons/web_planner/static/src/js/web_planner_common.js:436
+#, python-format
+msgid "Cancel"
+msgstr ""
+
#. module: web_planner
#: model:ir.model.fields,field_description:web_planner.field_web_planner_create_uid
msgid "Created by"
@@ -95,6 +102,13 @@ msgstr ""
msgid "Next step"
msgstr ""
+#. module: web_planner
+#. openerp-web
+#: code:addons/web_planner/static/src/js/web_planner_common.js:446
+#, python-format
+msgid "Odoo Enterprise"
+msgstr ""
+
#. module: web_planner
#: model:ir.model,name:web_planner.model_web_planner
#: model:ir.ui.view,arch_db:web_planner.web_planner_view_search
@@ -128,3 +142,10 @@ msgstr ""
msgid "Template"
msgstr ""
+#. module: web_planner
+#. openerp-web
+#: code:addons/web_planner/static/src/js/web_planner_common.js:430
+#, python-format
+msgid "Upgrade now"
+msgstr ""
+
diff --git a/addons/website/i18n/website.pot b/addons/website/i18n/website.pot
index f2357b340fa..aa6e2c65bd4 100644
--- a/addons/website/i18n/website.pot
+++ b/addons/website/i18n/website.pot
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 10.0c\n"
+"Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-29 13:59+0000\n"
-"PO-Revision-Date: 2016-09-29 13:59+0000\n"
+"POT-Creation-Date: 2016-11-14 15:53+0000\n"
+"PO-Revision-Date: 2016-11-14 15:53+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -105,11 +105,6 @@ msgstr ""
msgid "2s"
msgstr ""
-#. module: website
-#: model:ir.ui.view,arch_db:website.website_planner
-msgid "3. Configure a Google Analytics account"
-msgstr ""
-
#. module: website
#. openerp-web
#: code:addons/website/static/src/xml/website.seo.xml:62
@@ -221,12 +216,6 @@ msgid " |