diff --git a/cash_daily_report/data/cron_jobs.xml b/cash_daily_report/data/cron_jobs.xml index 0d0142323..bb556d2f2 100644 --- a/cash_daily_report/data/cron_jobs.xml +++ b/cash_daily_report/data/cron_jobs.xml @@ -13,7 +13,7 @@ code - + model.automatic_period_lock_date() diff --git a/cash_daily_report/wizard/cash_daily_report.py b/cash_daily_report/wizard/cash_daily_report.py index 7097ef742..8df3dcf5a 100644 --- a/cash_daily_report/wizard/cash_daily_report.py +++ b/cash_daily_report/wizard/cash_daily_report.py @@ -20,11 +20,10 @@ ############################################################################## from io import BytesIO import datetime -from datetime import datetime, date, time import xlsxwriter import base64 from odoo import api, fields, models, _ -from openerp.exceptions import except_orm, UserError, ValidationError +from openerp.exceptions import UserError from openerp.tools import DEFAULT_SERVER_DATE_FORMAT @@ -37,12 +36,15 @@ class CashDailyReportWizard(models.TransientModel): # The secong month day close the mont previous days = 2 closeday = datetime.today().replace(day=days) - if datetime.date.today() == closeday: - company = self.env['res.company'].search([]) - lastday = datetime.date.today() - datetime.timedelta(days) - company.write({ - 'period_lock_date': lastday - }) + if datetime.date.today() >= closeday: + companies = self.env['res.company'].search([]) + for record in companies: + lastday = datetime.date.today().replace(day=1) + \ + datetime.timedelta(days=-1) + if record.period_lock_date != lastday: + record.write({ + 'period_lock_date': lastday + }) @api.model @api.model