audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from savoirfairelinux/fix_currency_rate_update-wrong_timedelta

Browse Source 
currency_rate_update: fix wrong use of timetuple.
This commit is contained in:
Maxime Chambreuil - http://www.savoirfairelinux.com
2014-07-18 18:55:50 -04:00
parent 509a5006c6 f57d917e5a
commit bb9b958fa1
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
currency_rate_update/currency_rate_update.py
View File

@@ -37,6 +37,8 @@
import logging
import time
from datetime import datetime, timedelta
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT
from openerp.osv import fields, osv, orm
from openerp.tools.translate import _
@@ -119,13 +121,14 @@ class Currency_rate_update(osv.Model):
_name = "currency.rate.update"
_description = "Currency Rate Update"
# Dict that represent a cron object
nextcall_time = datetime.today() + timedelta(days=1)
nextcall = nextcall_time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
cron = {
'active': False,
'priority': 1,
'interval_number': 1,
'interval_type': 'weeks',
'nextcall': time.strftime("%Y-%m-%d %H:%M:%S",
datetime.today() + timedelta(days=1)).timetuple(),
'nextcall': nextcall,
'numbercall': -1,
'doall': True,
'model': 'currency.rate.update',
@@ -219,7 +222,7 @@ class Currency_rate_update(osv.Model):
main_curr,
service.max_delta_days
)
rate_name = time.strftime('%Y-%m-%d')
rate_name = time.strftime(DEFAULT_SERVER_DATE_FORMAT)
for curr in service.currency_to_update:
if curr.name == main_curr:
continue
@@ -244,12 +247,12 @@ class Currency_rate_update(osv.Model):
# Show the most recent note at the top
msg = "%s \n%s currency updated. %s" % \
(log_info or '',
datetime.strftime(datetime.today(), '%Y-%m-%d %H:%M:%S'),
datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
note)
service.write({'note': msg})
except Exception as exc:
error_msg = "\n%s ERROR : %s %s" %\
(datetime.strftime(datetime.today(), '%Y-%m-%d %H:%M:%S'),
(datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT),
repr(exc),
note)
_logger.info(repr(exc))
@@ -397,8 +400,8 @@ class Curreny_getter_interface(object):
)
# We always have a warning when rate_date != today
rate_date_str = datetime.strftime(rate_date, '%Y-%m-%d')
if rate_date_str != datetime.strftime(datetime.today(), '%Y-%m-%d'):
rate_date_str = datetime.strftime(rate_date, DEFAULT_SERVER_DATE_FORMAT)
if rate_date.date() != datetime.today().date():
msg = "The rate timestamp (%s) is not today's date"
self.log_info = ("WARNING : %s %s") % (msg, rate_date_str)
_logger.warning(msg, rate_date_str)
@@ -458,7 +461,7 @@ class Admin_ch_getter(Curreny_getter_interface):
_logger.debug("Admin.ch sent a valid XML file")
adminch_ns = {'def': 'http://www.afd.admin.ch/publicdb/newdb/mwst_kurse'}
rate_date = dom.xpath('/def:wechselkurse/def:datum/text()', namespaces=adminch_ns)[0]
rate_date_datetime = datetime.strptime(rate_date, '%Y-%m-%d')
rate_date_datetime = datetime.strptime(rate_date, DEFAULT_SERVER_DATE_FORMAT)
self.check_rate_date(rate_date_datetime, max_delta_days)
# we dynamically update supported currencies
self.supported_currency_array = dom.xpath("/def:wechselkurse/def:devise/@code", namespaces=adminch_ns)
@@ -528,7 +531,7 @@ class ECB_getter(Curreny_getter_interface):
}
rate_date = dom.xpath('/gesmes:Envelope/def:Cube/def:Cube/@time',
namespaces=ecb_ns)[0]
rate_date_datetime = datetime.strptime(rate_date, '%Y-%m-%d')
rate_date_datetime = datetime.strptime(rate_date, DEFAULT_SERVER_DATE_FORMAT)
self.check_rate_date(rate_date_datetime, max_delta_days)
# We dynamically update supported currencies
self.supported_currency_array = dom.xpath("/gesmes:Envelope/def:Cube/def:Cube/def:Cube/@currency",
@@ -585,7 +588,7 @@ class PL_NBP_getter(Curreny_getter_interface):
ns = {} # Cool, there are no namespaces !
_logger.debug("NBP.pl sent a valid XML file")
rate_date = dom.xpath('/tabela_kursow/data_publikacji/text()', namespaces=ns)[0]
rate_date_datetime = datetime.strptime(rate_date, '%Y-%m-%d')
rate_date_datetime = datetime.strptime(rate_date, DEFAULT_SERVER_DATE_FORMAT)
self.check_rate_date(rate_date_datetime, max_delta_days)
# We dynamically update supported currencies
self.supported_currency_array = dom.xpath('/tabela_kursow/pozycja/kod_waluty/text()', namespaces=ns)