rattail/rattail-harvest
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix start/end date defaults for importers, per upstream changes

Browse source
This commit is contained in:
Lance Edgar 2023-09-24 09:23:31 -05:00
parent 2fa7ef5e71
commit 2f21e574ae
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
rattail_harvest/importing/model.py
View file

@ -2,7 +2,7 @@
################################################################################
#
# Rattail -- Retail Software Framework
# Copyright © 2010-2022 Lance Edgar
# Copyright © 2010-2023 Lance Edgar
#
# This file is part of Rattail.
#
@ -67,9 +67,14 @@ class HarvestTimeEntryImporter(ToRattail):
self.session, model.HarvestProject, key='id')
def cache_query(self):
query = super(HarvestTimeEntryImporter, self).cache_query()
return query.filter(self.model_class.spent_date >= self.start_date)\
.filter(self.model_class.spent_date <= self.end_date)
query = super().cache_query()
if self.start_date:
query = query.filter(self.model_class.spent_date >= self.start_date)
if self.end_date:
query = query.filter(self.model_class.spent_date <= self.end_date)
return query
def get_harvest_project(self, project_id):
if hasattr(self, 'harvest_projects_by_id'):