Merge 9ad3aee into a26f7ef

OCA · Jun 29, 2017 · 57d677b · 57d677b
2 parents a26f7ef + 9ad3aee
commit 57d677b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/connector_prestashop/backend.py b/connector_prestashop/backend.py
@@ -12,3 +12,4 @@
 # version >= 1.6.0.11
 prestashop16011 = backend.Backend(parent=prestashop, version='1.6.0.11')
 prestashop1612 = backend.Backend(parent=prestashop, version='1.6.1.2')
+prestashop16111 = backend.Backend(parent=prestashop, version='1.6.1.11')
diff --git a/connector_prestashop/models/prestashop_backend/common.py b/connector_prestashop/models/prestashop_backend/common.py
@@ -41,7 +41,8 @@ def _select_versions(self):
             ('1.5', '< 1.6.0.9'),
             ('1.6.0.9', '1.6.0.9 - 1.6.0.10'),
             ('1.6.0.11', '>= 1.6.0.11'),
-            ('1.6.1.2', '>= 1.6.1.2'),
+            ('1.6.1.2', '>= 1.6.1.2 - < 1.6.1.11'),
+            ('1.6.1.11', '>= 1.6.1.11')
         ]
     version = fields.Selection(
         selection='_select_versions',
@@ -264,6 +265,20 @@ def import_suppliers(self):
             'tag': 'tag',
             'messages': 'customer_messages',
         },
+        '1.6.1.11': {
+            'product_option_value': 'product_option_value',
+            'category': 'category',
+            'image': 'image',
+            'order_slip': 'order_slip',
+            'order_slip_detail': 'order_slip_detail',
+            'group': 'group',
+            'order_row': 'order_row',
+            'tax': 'tax',
+            'combinations': 'combination',
+            'product_features': 'product_feature',
+            'tag': 'tag',
+            'messages': 'customer_messages',
+        }
     }
 
     @api.multi
@@ -274,7 +289,7 @@ def get_environment(self, model_name, session=None):
         return ConnectorEnvironment(self, session, model_name)
 
     def get_version_ps_key(self, key):
-        if self.version in ['1.6.0.9', '1.6.1.2']:
+        if self.version in ['1.6.0.9', '1.6.1.2', '1.6.1.11']:
             return self.keys_conversion[self.version][key]
         return key