Merge pull request #1701 from unicef/feature/management_api_for_month…

…ly_report

Fix bad conflict resolution

src/etools/applications/partners/tasks.py

@@ -249,9 +249,12 @@ def _notify_interventions_ending_soon(country_name):
 
 
 @app.task
-def pmp_indicator_report():
+def pmp_indicator_report(writer, **kwargs):
     base_url = 'https://etools.unicef.org'
-    countries = Country.objects.exclude(schema_name__in=['public', 'uat', 'frg'])
+    countries = kwargs.get('countries', None)
+    qs = Country.objects.exclude(schema_name__in=['public', 'uat', 'frg'])
+    if countries:
+        qs = qs.filter(schema_name__in=countries.pop().split(','))
     fieldnames = [
         'Country',
         'Partner Name',