diff --git a/.mailmap b/.mailmap index 9e806a9ffa2..cb0c265368b 100644 --- a/.mailmap +++ b/.mailmap @@ -685,8 +685,7 @@ Paulius Sladkevičius Paulius Sladkevičius Paulius Sladkevičius Paulius Sladkevičius Paulius Sladkevičius Paulius Sladkevičius paulius <> -Pedro Manuel Baeza -Pedro Manuel Baeza +Pedro Manuel Baeza Peter Langenberg Peter Langenberg Peter Langenberg <> Philu philubert@gmail.com <> diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index ad11d5140da..07a6c70d1bb 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -840,7 +840,7 @@ class account_invoice(models.Model): # create one move line for the total and possibly adjust the other lines amount total, total_currency, iml = inv.with_context(ctx).compute_invoice_totals(company_currency, ref, iml) - name = inv.name or inv.supplier_invoice_number or '/' + name = inv.supplier_invoice_number or inv.name or '/' totlines = [] if inv.payment_term: totlines = inv.with_context(ctx).payment_term.compute(total, date_invoice)[0] diff --git a/addons/account/partner.py b/addons/account/partner.py index ee3aec145e5..99357348295 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -251,13 +251,14 @@ class res_partner(osv.osv): def _journal_item_count(self, cr, uid, ids, field_name, arg, context=None): MoveLine = self.pool('account.move.line') AnalyticAccount = self.pool('account.analytic.account') - return { - partner_id: { - 'journal_item_count': MoveLine.search_count(cr, uid, [('partner_id', '=', partner_id)], context=context), - 'contracts_count': AnalyticAccount.search_count(cr, uid, [('partner_id', 'child_of', partner_id)], context=context) - } - for partner_id in ids - } + results = {} + for partner_id in ids: + results[partner_id] = {} + if 'contracts_count' in field_name: + results[partner_id]['contracts_count'] = AnalyticAccount.search_count(cr, uid, [('partner_id', '=', partner_id)], context=context) + if 'journal_item_count' in field_name: + results[partner_id]['journal_item_count'] = MoveLine.search_count(cr, uid, [('partner_id', 'child_of', partner_id)], context=context) + return results def has_something_to_reconcile(self, cr, uid, partner_id, context=None): ''' diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index a008d1b6af7..f3ca33cbeb5 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -28,21 +28,6 @@ - - product.template.search - product.template - primary - - - - - - - - - - - product.category.property.form.inherit product.category diff --git a/addons/account/static/src/js/account_widgets.js b/addons/account/static/src/js/account_widgets.js index 4b826808457..a60b550e7cc 100644 --- a/addons/account/static/src/js/account_widgets.js +++ b/addons/account/static/src/js/account_widgets.js @@ -1317,13 +1317,13 @@ openerp.account = function (instance) { if (balance_type === "equal") { displayValidState(true); } else if (balance_type === "greater") { - createOpenBalance("Create Write-off"); + createOpenBalance(_t("Create Write-off")); } else if (balance_type === "lower") { if (self.st_line.has_no_partner) { - createOpenBalance("Choose counterpart"); + createOpenBalance(_t("Choose counterpart")); } else { displayValidState(false, "Keep open"); - createOpenBalance("Open balance"); + createOpenBalance(_t("Open balance")); } } diff --git a/addons/account/views/report_generalledger.xml b/addons/account/views/report_generalledger.xml index d873571dee3..c7a90634ac7 100644 --- a/addons/account/views/report_generalledger.xml +++ b/addons/account/views/report_generalledger.xml @@ -96,7 +96,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 9483af205ed..68cf5b8b25d 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -63,6 +63,8 @@ class account_fiscalyear_close(osv.osv_memory): raise UserError(_('The entries to reconcile should belong to the same company.')) r_id = self.pool.get('account.move.reconcile').create(cr, uid, {'type': 'auto', 'opening_reconciliation': True}) cr.execute('update account_move_line set reconcile_id = %s where id in %s',(r_id, tuple(ids),)) + # reconcile_ref deptends from reconcile_id but was not recomputed + obj_acc_move_line._store_set_values(cr, uid, ids, ['reconcile_ref'], context=context) obj_acc_move_line.invalidate_cache(cr, uid, ['reconcile_id'], ids, context=context) return r_id diff --git a/addons/account/wizard/account_statement_from_invoice.py b/addons/account/wizard/account_statement_from_invoice.py index c7316958f79..627d0286c6a 100644 --- a/addons/account/wizard/account_statement_from_invoice.py +++ b/addons/account/wizard/account_statement_from_invoice.py @@ -79,5 +79,7 @@ class account_statement_from_invoice_lines(osv.osv_memory): 'statement_id': statement_id, 'ref': line.ref, 'date': statement.date, + 'amount_currency': line.amount_currency, + 'currency_id': line.currency_id.id, }, context=context) return {'type': 'ir.actions.act_window_close'} diff --git a/addons/account/wizard/account_statement_from_invoice_view.xml b/addons/account/wizard/account_statement_from_invoice_view.xml index f842f9ab4e4..1a16c67c29f 100644 --- a/addons/account/wizard/account_statement_from_invoice_view.xml +++ b/addons/account/wizard/account_statement_from_invoice_view.xml @@ -7,7 +7,10 @@
- +