From 076315c04ae53e715bad18b2bd025d32084b3dea Mon Sep 17 00:00:00 2001 From: nvi-openerp Date: Wed, 27 Oct 2010 10:33:29 +0200 Subject: [PATCH] [FIX] Corrected small problems for validation in swiss accounting bzr revid: nicolas.vanhoren@openerp.com-20101027083329-1hxpny1bthxn8nvi --- addons/l10n_ch/invoice.py | 6 +++--- addons/l10n_ch/wizard/create_dta.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py index 1057fc379fd..2bea9ba35b7 100644 --- a/addons/l10n_ch/invoice.py +++ b/addons/l10n_ch/invoice.py @@ -30,7 +30,7 @@ # ############################################################################## -from mx import DateTime +from datetime import datetime from osv import fields, osv from tools import mod10r @@ -71,8 +71,8 @@ class account_invoice(osv.osv): if invoice.move_id: for line in invoice.move_id.line_id: if not line.date_maturity or \ - DateTime.strptime(line.date_maturity, '%Y-%m-%d') \ - < DateTime.now(): + datetime.strptime(line.date_maturity, '%Y-%m-%d') \ + < datetime.today(): res[invoice.id] += line.amount_to_pay return res diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py index d8cdec8c48a..94c623af13d 100644 --- a/addons/l10n_ch/wizard/create_dta.py +++ b/addons/l10n_ch/wizard/create_dta.py @@ -404,7 +404,7 @@ def _create_dta(obj, cr, uid, data, context=None): v['sequence'] = str(seq).rjust(5).replace(' ', '0') v['amount_to_pay']= str(pline.amount_currency).replace('.', ',') v['number'] = pline.name - v['currency'] = pline.currency.code + v['currency'] = pline.currency.symbol v['partner_bank_name'] = pline.bank_id.bank.name or False v['partner_bank_clearing'] = pline.bank_id.bank.clearing or False