From 6734159ee50cc2e1b46ba895269a4b782703fbaf Mon Sep 17 00:00:00 2001 From: Stefan Rijnhart Date: Wed, 8 Apr 2015 17:39:55 +0200 Subject: [PATCH] [FIX] Use psycopg variable substitution [IMP] Cleanup vouchers --- account_reset_chart/models/res_company.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/account_reset_chart/models/res_company.py b/account_reset_chart/models/res_company.py index 3979fcdbc..7e013396f 100644 --- a/account_reset_chart/models/res_company.py +++ b/account_reset_chart/models/res_company.py @@ -53,6 +53,17 @@ class Company(models.Model): statements.button_cancel() statements.unlink() + try: + voucher_obj = self.env['account.voucher'] + logger.info('Deleting vouchers.') + vouchers = voucher_obj.search( + [('company_id', '=', self.id), + ('state', 'in', ('proforma', 'posted'))]) + vouchers.cancel_voucher() + vouchers.unlink() + except KeyError: + pass + try: self.env['payment.order'] logger.info('Deleting payment orders.') @@ -88,7 +99,7 @@ class Company(models.Model): UPDATE wkf_instance SET state = 'active' WHERE res_type = 'account_invoice' - AND res_id IN %s""" % (tuple(paid_invoices.ids),)) + AND res_id IN %s""", (tuple(paid_invoices.ids),)) self._cr.execute( """ UPDATE wkf_workitem @@ -100,7 +111,7 @@ class Company(models.Model): SELECT id FROM wkf_instance WHERE res_type = 'account_invoice' AND res_id IN %s) - """ % (tuple(paid_invoices.ids),)) + """, (tuple(paid_invoices.ids),)) paid_invoices.signal_workflow('invoice_cancel') logger.info('Dismantling invoices')