Merge branch 'refs/heads/schnacke' into linuxero

lib/DB/AddressModel.py

@@ -60,9 +60,12 @@ class AddressModel(QAbstractListModel):
         """
         row = index.row()
         if role == Qt.DisplayRole:
-            data = self.__address_data[row][2]
+            data = self.__address_data[row][5]
             return data
         elif role == PyqcrmDataRoles.CITY_ROLE:
+            data = self.__address_data[row][4]
+            return data
+        elif role == PyqcrmDataRoles.COUNTRY_ROLE:
             data = self.__address_data[row][3]
             return data
         return None
@@ -74,6 +77,7 @@ class AddressModel(QAbstractListModel):
         return {
             Qt.DisplayRole: b"display",
             PyqcrmDataRoles.CITY_ROLE: b"city",
+            PyqcrmDataRoles.COUNTRY_ROLE: b"country"
         }
 
     def setData(self):