From 40ef119999cdb001290e957647b7ffc38f505fd9 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 14 Sep 2016 18:25:01 +0200 Subject: [PATCH] Handle the case where name of account_move_line has the name field of the invoice --- account_usability/account.py | 6 ++++-- account_usability/migrations/8.0.0.2/pre-migration.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/account_usability/account.py b/account_usability/account.py index b7cf6fe..556e33e 100644 --- a/account_usability/account.py +++ b/account_usability/account.py @@ -101,8 +101,10 @@ class AccountInvoice(models.Model): for inv in self: if inv.type in ('out_invoice', 'out_refund'): self._cr.execute( - "UPDATE account_move_line SET name=%s WHERE " - "move_id=%s AND name='/'", (inv.number, inv.move_id.id)) + "UPDATE account_move_line SET name= " + "CASE WHEN name='/' THEN %s " + "ELSE %s||' - '||name END " + "WHERE move_id=%s", (inv.number, inv.number, inv.move_id.id)) self.invalidate_cache() return res diff --git a/account_usability/migrations/8.0.0.2/pre-migration.py b/account_usability/migrations/8.0.0.2/pre-migration.py index 1b21694..b725b9b 100644 --- a/account_usability/migrations/8.0.0.2/pre-migration.py +++ b/account_usability/migrations/8.0.0.2/pre-migration.py @@ -9,6 +9,7 @@ def migrate(cr, version): # cf the inherit of action_number() of account.invoice # in account_usability/account.py cr.execute( - "UPDATE account_move_line SET name=ref WHERE name='/' " - "AND ref is not null AND journal_id in " + "UPDATE account_move_line SET name= " + "CASE WHEN name='/' THEN ref ELSE ref||' - '||name END " + "WHERE ref is not null AND journal_id in " "(SELECT id FROM account_journal WHERE type in ('sale', 'sale_refund'))")