From eba662336c8f6fe56348b641a31c6c2ac9af1a10 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 22 Jun 2017 13:14:11 +0200 Subject: [PATCH 1/3] [FIX] sale: Changing product qty to 0 in SO line When changing the qty of a SO line to 0, the product_uos_qty, th_weight were not updated and then it lead to some errors. opw:748288 --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 10b38d38a31..2492ca2a4a6 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1226,7 +1226,7 @@ class sale_order_line(osv.osv): if context.get('uom_qty_change', False): values = {'price_unit': price} for field in ['product_uos_qty', 'th_weight']: - if result.get(field): + if not result.get(field, False) is False: values[field] = result[field] return {'value': values, 'domain': {}, 'warning': False} if warning_msgs: From b5a8e5c86424a1d2a3a8eb1e2662e922683a7f27 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 14 Jun 2017 10:26:06 +0200 Subject: [PATCH 2/3] [FIX] account: verify the partners are the same Re-enable the constraint when reconciling entries belonging to different partners. The constrain was not triggerd because of the triggers on line_id. In old API it was triggered only when explicitely writing on that field. Convert to new API instead. Fixes #17292 Closes #17600 --- addons/account/account.py | 20 -------------------- addons/account/account_move_line.py | 23 ++++++++++++++++++++++- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 655db7065d5..c08be3323b5 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1655,26 +1655,6 @@ class account_move_reconcile(osv.osv): opening/closing fiscal year process.')) return super(account_move_reconcile, self).unlink(cr, uid, ids, context=context) - # Look in the line_id and line_partial_ids to ensure the partner is the same or empty - # on all lines. We allow that only for opening/closing period - def _check_same_partner(self, cr, uid, ids, context=None): - for reconcile in self.browse(cr, uid, ids, context=context): - move_lines = [] - if not reconcile.opening_reconciliation: - if reconcile.line_id: - first_partner = reconcile.line_id[0].partner_id.id - move_lines = reconcile.line_id - elif reconcile.line_partial_ids: - first_partner = reconcile.line_partial_ids[0].partner_id.id - move_lines = reconcile.line_partial_ids - if any([(line.account_id.type in ('receivable', 'payable') and line.partner_id.id != first_partner) for line in move_lines]): - return False - return True - - _constraints = [ - (_check_same_partner, 'You can only reconcile journal items with the same partner.', ['line_id', 'line_partial_ids']), - ] - def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None): total = 0.0 for rec in self.browse(cr, uid, ids, context=context): diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 982b1d8c23b..d38b604cb15 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -22,7 +22,7 @@ import time from datetime import datetime -from openerp import workflow +from openerp import api, workflow from openerp.osv import fields, osv from openerp.tools.translate import _ import openerp.addons.decimal_precision as dp @@ -607,6 +607,27 @@ class account_move_line(osv.osv): cr.execute('CREATE INDEX account_move_line_date_id_index ON account_move_line (date DESC, id desc)') return res + @api.constrains('reconcile_id', 'reconcile_partial_id') + def _check_reconcile_same_partner(self): + """ Ensure the partner is the same or empty on all lines and a reconcile mark. + We allow that only for opening/closing period""" + for line in self: + rec = False + move_lines = [] + if line.reconcile_id: + rec = line.reconcile_id + move_lines = rec.line_id + elif line.reconcile_partial_id: + rec = line.reconcile_partial_id + move_lines = rec.line_partial_ids + if rec and not rec.opening_reconciliation: + first_partner = line.partner_id + for rline in move_lines: + if (rline.partner_id != first_partner and + rline.account_id.type in ('receivable', 'payable')): + raise osv.except_osv( + _('Error!'), _("You can only reconcile journal items with the same partner.")) + def _check_no_view(self, cr, uid, ids, context=None): lines = self.browse(cr, uid, ids, context=context) for l in lines: From 6b5f3c2364f1ff72d37a51222c97fde49ce870e6 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Thu, 22 Jun 2017 15:24:17 +0200 Subject: [PATCH 3/3] [I18N] account: export source terms Following changes at b5a8e5c864 --- addons/account/i18n/account.pot | 396 +++++++++++++++++++++++++++----- 1 file changed, 343 insertions(+), 53 deletions(-) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 661c1ba2587..57dabd173e0 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-15 06:40+0000\n" -"PO-Revision-Date: 2015-10-15 06:40+0000\n" +"POT-Creation-Date: 2017-06-22 13:18+0000\n" +"PO-Revision-Date: 2017-06-22 13:18+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -1743,6 +1743,7 @@ msgstr "" #: view:website:account.report_centraljournal #: view:website:account.report_financial #: view:website:account.report_generaljournal +#: view:website:account.report_generalledger #: view:website:account.report_invertedanalyticbalance #: view:website:account.report_partnerbalance #: view:website:account.report_partnerledger @@ -2891,7 +2892,7 @@ msgid "Continue" msgstr "" #. module: account -#: view:res.partner:account.partner_view_buttons +#: view:res.partner:account.partner_view_button_contracts_count #: field:res.partner,contract_ids:0 #: field:res.partner,contracts_count:0 msgid "Contracts" @@ -3717,6 +3718,130 @@ msgstr "" msgid "Display Ledger Report with One partner per page" msgstr "" +#. module: account +#: field:account.account,display_name:0 +#: field:account.account.template,display_name:0 +#: field:account.account.type,display_name:0 +#: field:account.addtmpl.wizard,display_name:0 +#: field:account.aged.trial.balance,display_name:0 +#: field:account.analytic.balance,display_name:0 +#: field:account.analytic.chart,display_name:0 +#: field:account.analytic.cost.ledger,display_name:0 +#: field:account.analytic.cost.ledger.journal.report,display_name:0 +#: field:account.analytic.inverted.balance,display_name:0 +#: field:account.analytic.journal,display_name:0 +#: field:account.analytic.journal.report,display_name:0 +#: field:account.automatic.reconcile,display_name:0 +#: field:account.balance.report,display_name:0 +#: field:account.bank.accounts.wizard,display_name:0 +#: field:account.bank.statement,display_name:0 +#: field:account.bank.statement.line,display_name:0 +#: field:account.cashbox.line,display_name:0 +#: field:account.central.journal,display_name:0 +#: field:account.change.currency,display_name:0 +#: field:account.chart,display_name:0 +#: field:account.chart.template,display_name:0 +#: field:account.common.account.report,display_name:0 +#: field:account.common.journal.report,display_name:0 +#: field:account.common.partner.report,display_name:0 +#: field:account.common.report,display_name:0 +#: field:account.config.settings,display_name:0 +#: field:account.entries.report,display_name:0 +#: field:account.financial.report,display_name:0 +#: field:account.fiscal.position,display_name:0 +#: field:account.fiscal.position.account,display_name:0 +#: field:account.fiscal.position.account.template,display_name:0 +#: field:account.fiscal.position.tax,display_name:0 +#: field:account.fiscal.position.tax.template,display_name:0 +#: field:account.fiscal.position.template,display_name:0 +#: field:account.fiscalyear,display_name:0 +#: field:account.fiscalyear.close,display_name:0 +#: field:account.fiscalyear.close.state,display_name:0 +#: field:account.general.journal,display_name:0 +#: field:account.installer,display_name:0 +#: field:account.invoice,display_name:0 +#: field:account.invoice.cancel,display_name:0 +#: field:account.invoice.confirm,display_name:0 +#: field:account.invoice.line,display_name:0 +#: field:account.invoice.refund,display_name:0 +#: field:account.invoice.report,display_name:0 +#: field:account.invoice.tax,display_name:0 +#: field:account.journal,display_name:0 +#: field:account.journal.cashbox.line,display_name:0 +#: field:account.journal.period,display_name:0 +#: field:account.journal.select,display_name:0 +#: field:account.model,display_name:0 +#: field:account.model.line,display_name:0 +#: field:account.move,display_name:0 +#: field:account.move.bank.reconcile,display_name:0 +#: field:account.move.line,display_name:0 +#: field:account.move.line.reconcile,display_name:0 +#: field:account.move.line.reconcile.select,display_name:0 +#: field:account.move.line.reconcile.writeoff,display_name:0 +#: field:account.move.line.unreconcile.select,display_name:0 +#: field:account.move.reconcile,display_name:0 +#: field:account.open.closed.fiscalyear,display_name:0 +#: field:account.partner.balance,display_name:0 +#: field:account.partner.ledger,display_name:0 +#: field:account.partner.reconcile.process,display_name:0 +#: field:account.payment.term,display_name:0 +#: field:account.payment.term.line,display_name:0 +#: field:account.period,display_name:0 +#: field:account.period.close,display_name:0 +#: field:account.print.journal,display_name:0 +#: field:account.report.general.ledger,display_name:0 +#: field:account.sequence.fiscalyear,display_name:0 +#: field:account.state.open,display_name:0 +#: field:account.statement.from.invoice.lines,display_name:0 +#: field:account.statement.operation.template,display_name:0 +#: field:account.subscription,display_name:0 +#: field:account.subscription.generate,display_name:0 +#: field:account.subscription.line,display_name:0 +#: field:account.tax,display_name:0 +#: field:account.tax.chart,display_name:0 +#: field:account.tax.code,display_name:0 +#: field:account.tax.code.template,display_name:0 +#: field:account.tax.template,display_name:0 +#: field:account.treasury.report,display_name:0 +#: field:account.unreconcile,display_name:0 +#: field:account.unreconcile.reconcile,display_name:0 +#: field:account.use.model,display_name:0 +#: field:account.vat.declaration,display_name:0 +#: field:accounting.report,display_name:0 +#: field:analytic.entries.report,display_name:0 +#: field:cash.box.in,display_name:0 +#: field:cash.box.out,display_name:0 +#: field:project.account.analytic.line,display_name:0 +#: field:report.account.receivable,display_name:0 +#: field:report.account.report_agedpartnerbalance,display_name:0 +#: field:report.account.report_analyticbalance,display_name:0 +#: field:report.account.report_analyticcostledger,display_name:0 +#: field:report.account.report_analyticcostledgerquantity,display_name:0 +#: field:report.account.report_analyticjournal,display_name:0 +#: field:report.account.report_centraljournal,display_name:0 +#: field:report.account.report_financial,display_name:0 +#: field:report.account.report_generaljournal,display_name:0 +#: field:report.account.report_generalledger,display_name:0 +#: field:report.account.report_invertedanalyticbalance,display_name:0 +#: field:report.account.report_journal,display_name:0 +#: field:report.account.report_overdue,display_name:0 +#: field:report.account.report_partnerbalance,display_name:0 +#: field:report.account.report_partnerledger,display_name:0 +#: field:report.account.report_partnerledgerother,display_name:0 +#: field:report.account.report_salepurchasejournal,display_name:0 +#: field:report.account.report_trialbalance,display_name:0 +#: field:report.account.report_vat,display_name:0 +#: field:report.account.sales,display_name:0 +#: field:report.account_type.sales,display_name:0 +#: field:report.aged.receivable,display_name:0 +#: field:report.invoice.created,display_name:0 +#: field:temp.range,display_name:0 +#: field:validate.account.move,display_name:0 +#: field:validate.account.move.lines,display_name:0 +#: field:wizard.multi.charts.accounts,display_name:0 +msgid "Display Name" +msgstr "" + #. module: account #: field:account.partner.balance,display_partner:0 msgid "Display Partners" @@ -4079,6 +4204,7 @@ msgid "Entry Label" msgstr "" #. module: account +#: field:account.invoice,move_lines:0 #: field:account.move.reconcile,line_id:0 msgid "Entry Lines" msgstr "" @@ -4112,68 +4238,72 @@ msgid "Equity" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:964 -#: code:addons/account/account_move_line.py:969 +#: code:addons/account/account_move_line.py:1017 +#: code:addons/account/account_move_line.py:1022 #, python-format msgid "Error" msgstr "" #. module: account -#: code:addons/account/account.py:422 -#: code:addons/account/account.py:427 -#: code:addons/account/account.py:444 -#: code:addons/account/account.py:657 -#: code:addons/account/account.py:659 -#: code:addons/account/account.py:1080 -#: code:addons/account/account.py:1082 -#: code:addons/account/account.py:1124 -#: code:addons/account/account.py:1307 -#: code:addons/account/account.py:1321 -#: code:addons/account/account.py:1345 -#: code:addons/account/account.py:1352 -#: code:addons/account/account.py:1550 -#: code:addons/account/account.py:1554 -#: code:addons/account/account.py:1641 -#: code:addons/account/account.py:2328 -#: code:addons/account/account.py:2642 -#: code:addons/account/account.py:3455 +#: code:addons/account/account.py:430 +#: code:addons/account/account.py:435 +#: code:addons/account/account.py:452 +#: code:addons/account/account.py:667 +#: code:addons/account/account.py:669 +#: code:addons/account/account.py:1090 +#: code:addons/account/account.py:1092 +#: code:addons/account/account.py:1134 +#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 +#: code:addons/account/account.py:1357 +#: code:addons/account/account.py:1364 +#: code:addons/account/account.py:1563 +#: code:addons/account/account.py:1567 +#: code:addons/account/account.py:1654 +#: code:addons/account/account.py:2327 +#: code:addons/account/account.py:2641 +#: code:addons/account/account.py:3454 #: code:addons/account/account_analytic_line.py:95 #: code:addons/account/account_analytic_line.py:104 -#: code:addons/account/account_bank_statement.py:308 -#: code:addons/account/account_bank_statement.py:333 -#: code:addons/account/account_bank_statement.py:348 -#: code:addons/account/account_bank_statement.py:428 -#: code:addons/account/account_bank_statement.py:728 -#: code:addons/account/account_bank_statement.py:736 +#: code:addons/account/account_bank_statement.py:311 +#: code:addons/account/account_bank_statement.py:336 +#: code:addons/account/account_bank_statement.py:351 +#: code:addons/account/account_bank_statement.py:435 +#: code:addons/account/account_bank_statement.py:805 +#: code:addons/account/account_bank_statement.py:813 #: code:addons/account/account_cash_statement.py:271 #: code:addons/account/account_cash_statement.py:315 #: code:addons/account/account_cash_statement.py:320 -#: code:addons/account/account_invoice.py:797 -#: code:addons/account/account_invoice.py:830 -#: code:addons/account/account_invoice.py:996 -#: code:addons/account/account_move_line.py:599 -#: code:addons/account/account_move_line.py:941 -#: code:addons/account/account_move_line.py:966 -#: code:addons/account/account_move_line.py:971 -#: code:addons/account/account_move_line.py:1220 -#: code:addons/account/account_move_line.py:1234 -#: code:addons/account/account_move_line.py:1236 -#: code:addons/account/account_move_line.py:1270 +#: code:addons/account/account_invoice.py:805 +#: code:addons/account/account_invoice.py:847 +#: code:addons/account/account_invoice.py:1019 +#: code:addons/account/account_move_line.py:629 +#: code:addons/account/account_move_line.py:642 +#: code:addons/account/account_move_line.py:994 +#: code:addons/account/account_move_line.py:1019 +#: code:addons/account/account_move_line.py:1024 +#: code:addons/account/account_move_line.py:1096 +#: code:addons/account/account_move_line.py:1299 +#: code:addons/account/account_move_line.py:1313 +#: code:addons/account/account_move_line.py:1315 +#: code:addons/account/account_move_line.py:1349 #: 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 #: code:addons/account/wizard/account_change_currency.py:64 #: code:addons/account/wizard/account_change_currency.py:70 #: code:addons/account/wizard/account_financial_report.py:72 -#: code:addons/account/wizard/account_invoice_refund.py:116 -#: code:addons/account/wizard/account_invoice_refund.py:118 +#: code:addons/account/wizard/account_invoice_refund.py:117 +#: code:addons/account/wizard/account_invoice_refund.py:119 #: 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_open_closed_fiscalyear.py:42 #: code:addons/account/wizard/account_report_common.py:163 #: code:addons/account/wizard/account_report_common.py:169 #: code:addons/account/wizard/account_use_model.py:44 #: code:addons/account/wizard/pos_box.py:31 #: code:addons/account/wizard/pos_box.py:35 +#: code:addons/account/wizard/pos_box.py:44 #, python-format msgid "Error!" msgstr "" @@ -5458,6 +5588,7 @@ msgstr "" #: view:account.tax:account.view_tax_form #: view:account.tax.template:account.view_account_tax_template_form #: selection:account.vat.declaration,based_on:0 +#: model:ir.actions.act_window,name:account.action_invoice_refund_out_tree #: model:ir.actions.act_window,name:account.action_invoice_tree #: model:ir.actions.report.xml,name:account.account_invoices #: view:report.invoice.created:account.board_view_created_invoice @@ -5713,7 +5844,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_tax_code_line_open #: model:ir.model,name:account.model_account_move_line #: model:ir.ui.menu,name:account.menu_action_account_moves_all -#: view:res.partner:account.partner_view_buttons +#: view:res.partner:account.partner_view_button_journal_item_count #: field:res.partner,journal_item_count:0 #, python-format msgid "Journal Items" @@ -5896,6 +6027,130 @@ msgstr "" msgid "Last Message Date" msgstr "" +#. module: account +#: field:account.account,__last_update:0 +#: field:account.account.template,__last_update:0 +#: field:account.account.type,__last_update:0 +#: field:account.addtmpl.wizard,__last_update:0 +#: field:account.aged.trial.balance,__last_update:0 +#: field:account.analytic.balance,__last_update:0 +#: field:account.analytic.chart,__last_update:0 +#: field:account.analytic.cost.ledger,__last_update:0 +#: field:account.analytic.cost.ledger.journal.report,__last_update:0 +#: field:account.analytic.inverted.balance,__last_update:0 +#: field:account.analytic.journal,__last_update:0 +#: field:account.analytic.journal.report,__last_update:0 +#: field:account.automatic.reconcile,__last_update:0 +#: field:account.balance.report,__last_update:0 +#: field:account.bank.accounts.wizard,__last_update:0 +#: field:account.bank.statement,__last_update:0 +#: field:account.bank.statement.line,__last_update:0 +#: field:account.cashbox.line,__last_update:0 +#: field:account.central.journal,__last_update:0 +#: field:account.change.currency,__last_update:0 +#: field:account.chart,__last_update:0 +#: field:account.chart.template,__last_update:0 +#: field:account.common.account.report,__last_update:0 +#: field:account.common.journal.report,__last_update:0 +#: field:account.common.partner.report,__last_update:0 +#: field:account.common.report,__last_update:0 +#: field:account.config.settings,__last_update:0 +#: field:account.entries.report,__last_update:0 +#: field:account.financial.report,__last_update:0 +#: field:account.fiscal.position,__last_update:0 +#: field:account.fiscal.position.account,__last_update:0 +#: field:account.fiscal.position.account.template,__last_update:0 +#: field:account.fiscal.position.tax,__last_update:0 +#: field:account.fiscal.position.tax.template,__last_update:0 +#: field:account.fiscal.position.template,__last_update:0 +#: field:account.fiscalyear,__last_update:0 +#: field:account.fiscalyear.close,__last_update:0 +#: field:account.fiscalyear.close.state,__last_update:0 +#: field:account.general.journal,__last_update:0 +#: field:account.installer,__last_update:0 +#: field:account.invoice,__last_update:0 +#: field:account.invoice.cancel,__last_update:0 +#: field:account.invoice.confirm,__last_update:0 +#: field:account.invoice.line,__last_update:0 +#: field:account.invoice.refund,__last_update:0 +#: field:account.invoice.report,__last_update:0 +#: field:account.invoice.tax,__last_update:0 +#: field:account.journal,__last_update:0 +#: field:account.journal.cashbox.line,__last_update:0 +#: field:account.journal.period,__last_update:0 +#: field:account.journal.select,__last_update:0 +#: field:account.model,__last_update:0 +#: field:account.model.line,__last_update:0 +#: field:account.move,__last_update:0 +#: field:account.move.bank.reconcile,__last_update:0 +#: field:account.move.line,__last_update:0 +#: field:account.move.line.reconcile,__last_update:0 +#: field:account.move.line.reconcile.select,__last_update:0 +#: field:account.move.line.reconcile.writeoff,__last_update:0 +#: field:account.move.line.unreconcile.select,__last_update:0 +#: field:account.move.reconcile,__last_update:0 +#: field:account.open.closed.fiscalyear,__last_update:0 +#: field:account.partner.balance,__last_update:0 +#: field:account.partner.ledger,__last_update:0 +#: field:account.partner.reconcile.process,__last_update:0 +#: field:account.payment.term,__last_update:0 +#: field:account.payment.term.line,__last_update:0 +#: field:account.period,__last_update:0 +#: field:account.period.close,__last_update:0 +#: field:account.print.journal,__last_update:0 +#: field:account.report.general.ledger,__last_update:0 +#: field:account.sequence.fiscalyear,__last_update:0 +#: field:account.state.open,__last_update:0 +#: field:account.statement.from.invoice.lines,__last_update:0 +#: field:account.statement.operation.template,__last_update:0 +#: field:account.subscription,__last_update:0 +#: field:account.subscription.generate,__last_update:0 +#: field:account.subscription.line,__last_update:0 +#: field:account.tax,__last_update:0 +#: field:account.tax.chart,__last_update:0 +#: field:account.tax.code,__last_update:0 +#: field:account.tax.code.template,__last_update:0 +#: field:account.tax.template,__last_update:0 +#: field:account.treasury.report,__last_update:0 +#: field:account.unreconcile,__last_update:0 +#: field:account.unreconcile.reconcile,__last_update:0 +#: field:account.use.model,__last_update:0 +#: field:account.vat.declaration,__last_update:0 +#: field:accounting.report,__last_update:0 +#: field:analytic.entries.report,__last_update:0 +#: field:cash.box.in,__last_update:0 +#: field:cash.box.out,__last_update:0 +#: field:project.account.analytic.line,__last_update:0 +#: field:report.account.receivable,__last_update:0 +#: field:report.account.report_agedpartnerbalance,__last_update:0 +#: field:report.account.report_analyticbalance,__last_update:0 +#: field:report.account.report_analyticcostledger,__last_update:0 +#: field:report.account.report_analyticcostledgerquantity,__last_update:0 +#: field:report.account.report_analyticjournal,__last_update:0 +#: field:report.account.report_centraljournal,__last_update:0 +#: field:report.account.report_financial,__last_update:0 +#: field:report.account.report_generaljournal,__last_update:0 +#: field:report.account.report_generalledger,__last_update:0 +#: field:report.account.report_invertedanalyticbalance,__last_update:0 +#: field:report.account.report_journal,__last_update:0 +#: field:report.account.report_overdue,__last_update:0 +#: field:report.account.report_partnerbalance,__last_update:0 +#: field:report.account.report_partnerledger,__last_update:0 +#: field:report.account.report_partnerledgerother,__last_update:0 +#: field:report.account.report_salepurchasejournal,__last_update:0 +#: field:report.account.report_trialbalance,__last_update:0 +#: field:report.account.report_vat,__last_update:0 +#: field:report.account.sales,__last_update:0 +#: field:report.account_type.sales,__last_update:0 +#: field:report.aged.receivable,__last_update:0 +#: field:report.invoice.created,__last_update:0 +#: field:temp.range,__last_update:0 +#: field:validate.account.move,__last_update:0 +#: field:validate.account.move.lines,__last_update:0 +#: field:wizard.multi.charts.accounts,__last_update:0 +msgid "Last Modified on" +msgstr "" + #. module: account #: field:account.account,write_uid:0 #: field:account.account.template,write_uid:0 @@ -6413,6 +6668,16 @@ msgstr "" msgid "Multi-Currencies" msgstr "" +#. module: account +#: field:account.invoice.tax,factor_tax:0 +msgid "Multipication factor Tax code" +msgstr "" + +#. module: account +#: field:account.invoice.tax,factor_base:0 +msgid "Multipication factor for Base code" +msgstr "" + #. module: account #: view:account.analytic.line:account.view_account_analytic_line_filter #: view:analytic.entries.report:account.view_analytic_entries_report_search @@ -6574,13 +6839,20 @@ msgid "No detail" msgstr "" #. module: account -#: code:addons/account/wizard/account_invoice_refund.py:154 +#: code:addons/account/account_invoice.py:819 +#, python-format +msgid "No invoice date!\n" +"The invoice currency is not the same than the company currency. An invoice date is required to determine the exchange rate to apply. Do not forget to update the taxes!" +msgstr "" + +#. module: account +#: code:addons/account/wizard/account_invoice_refund.py:155 #, python-format msgid "No period found on the invoice." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1270 +#: code:addons/account/account_move_line.py:1349 #, python-format msgid "No period found or more than one period found for the given date." msgstr "" @@ -6656,7 +6928,10 @@ msgid "Not reconciled transactions" msgstr "" #. module: account +#. openerp-web #: field:account.account.template,note:0 +#: code:addons/account/static/src/xml/account_bank_statement_reconciliation.xml:140 +#, python-format msgid "Note" msgstr "" @@ -7249,6 +7524,7 @@ msgstr "" #. module: account #: view:account.invoice:account.invoice_form #: view:account.invoice:account.invoice_supplier_form +#: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,based_on:0 msgid "Payments" msgstr "" @@ -8248,6 +8524,7 @@ msgstr "" #. module: account #: view:account.bank.statement:account.view_bank_statement_form2 +#: field:account.bank.statement,user_id:0 #: view:account.invoice:account.invoice_supplier_form #: view:account.invoice:account.invoice_tree msgid "Responsible" @@ -10916,7 +11193,8 @@ msgid "You can only change currency for Draft Invoice." msgstr "" #. module: account -#: constraint:account.move.reconcile:0 +#: code:addons/account/account_move_line.py:629 +#, python-format msgid "You can only reconcile journal items with the same partner." msgstr "" @@ -11072,38 +11350,50 @@ msgid "You cannot provide a secondary currency if it is the same than the compan msgstr "" #. module: account -#: code:addons/account/account.py:659 +#: code:addons/account/wizard/pos_box.py:45 +#, python-format +msgid "You cannot put/take money in/out for a bank statement which is closed." +msgstr "" + +#. module: account +#: code:addons/account/account.py:669 #, python-format msgid "You cannot remove an account that contains journal items." msgstr "" #. module: account -#: code:addons/account/account.py:664 +#: code:addons/account/account.py:674 #, python-format msgid "You cannot remove/deactivate an account which is set on a customer or supplier." msgstr "" #. module: account -#: code:addons/account/account.py:1641 +#: code:addons/account/account.py:1654 #, python-format msgid "You cannot unreconcile journal items if they has been generated by the opening/closing fiscal year process." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1173 -#: code:addons/account/account_move_line.py:1257 +#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1336 #, python-format msgid "You cannot use an inactive account." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1324 +#: code:addons/account/account_move_line.py:1403 #, python-format msgid "You cannot use this general account in this journal, check the tab 'Entry Controls' on the related journal." msgstr "" #. module: account -#: code:addons/account/account.py:1307 +#: code:addons/account/account_move_line.py:1096 +#, python-format +msgid "You cannot validate a non-balanced entry." +msgstr "" + +#. module: account +#: code:addons/account/account.py:1319 #, python-format msgid "You cannot validate a non-balanced entry.\n" "Make sure you have configured payment terms properly.\n"