diff --git a/CHANGES b/CHANGES index 57668b6ee..56fd0f6d6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,11 @@ -3.53 +3.53.1 ------ +* fixed MR PV * fixed travel action point +* fixed intervention-activity + +3.53 +------ * fixed celery accept content type 3.52 diff --git a/src/etools_datamart/__init__.py b/src/etools_datamart/__init__.py index 0792fec5d..34ee31d80 100644 --- a/src/etools_datamart/__init__.py +++ b/src/etools_datamart/__init__.py @@ -1,3 +1,3 @@ NAME = 'etools-datamart' -VERSION = __version__ = '3.53' +VERSION = __version__ = '3.53.1' __author__ = '' diff --git a/src/etools_datamart/apps/mart/data/models/intervention_activity.py b/src/etools_datamart/apps/mart/data/models/intervention_activity.py index b7a32fc9f..7082a7fde 100644 --- a/src/etools_datamart/apps/mart/data/models/intervention_activity.py +++ b/src/etools_datamart/apps/mart/data/models/intervention_activity.py @@ -38,7 +38,15 @@ class Meta: class Options: source = ReportsInterventionactivityitem depends = (Intervention,) - mapping = dict() + mapping = dict( + activity='activity.name', + activity_details='activity.context_details', + activity_unicef_cash='activity.unicef_cash', + activity_cso_cash='activity.cso_cash', + activity_code='activity.code', + ll_name='activity.result.name', + ll_code='activity.result.code' + ) queryset = lambda: ReportsInterventionactivityitem.objects.select_related( 'activity__result__result_link__intervention__agreement__partner' ) diff --git a/src/etools_datamart/apps/sources/etools/enrichment/partners_partnerorganization.py b/src/etools_datamart/apps/sources/etools/enrichment/partners_partnerorganization.py index 902b46fb9..e91331bd9 100644 --- a/src/etools_datamart/apps/sources/etools/enrichment/partners_partnerorganization.py +++ b/src/etools_datamart/apps/sources/etools/enrichment/partners_partnerorganization.py @@ -1,7 +1,7 @@ from etools_datamart.apps.sources.etools.models import ( AuditSpotcheck, PartnersPartnerorganization, - PartnersPartnerplannedvisits, + PartnersPlannedengagement, ) from .consts import PartnerOrganizationConst, PartnerType @@ -65,8 +65,8 @@ def min_req_spot_checks(self): return 0 try: - self.PartnersPartnerplannedvisits_partner - except PartnersPartnerplannedvisits.DoesNotExist: + self.PartnersPlannedengagement_partner + except PartnersPlannedengagement.DoesNotExist: pass else: if self.planned_engagement.scheduled_audit: