Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 16471)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 16472)
@@ -5,5 +5,5 @@
 =======================
 
-* No changes yet.
+* Adjust `ApplicantOnlinePaymentProcessor.getMapping` (2nd bugfix).
 
 1.7.1 (2021-04-20)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py	(revision 16471)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/batching.py	(revision 16472)
@@ -21,4 +21,5 @@
 import grok
 from time import time
+import unicodecsv
 from zope.schema import getFields
 from zope.interface import Interface
@@ -363,5 +364,5 @@
     factory_name = 'waeup.ApplicantOnlinePayment'
 
-    location_fields = ['applicant_id', 'p_id']
+    location_fields = ['applicant_id',]
 
     @property
@@ -379,4 +380,19 @@
                 "Need p_id for import in update and remove modes!")
         return True
+
+    def getMapping(self, path, headerfields, mode):
+        """Get a mapping from CSV file headerfields to actually used fieldnames.
+
+        """
+        result = dict()
+        reader = unicodecsv.reader(open(path, 'rb'))
+        raw_header = reader.next()
+        for num, field in enumerate(headerfields):
+            if field not in  ['applicant_id', 'p_id'] and mode == 'remove':
+                continue
+            if field == u'--IGNORE--':
+                continue
+            result[raw_header[num]] = field
+        return result
 
     def parentsExist(self, row, site):
