Merge lp:~mallorymarcot/unifield-server/us-3684 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/supplier_catalogue/supplier_catalogue.py'
--- bin/addons/supplier_catalogue/supplier_catalogue.py	2017-08-23 21:01:21 +0000
+++ bin/addons/supplier_catalogue/supplier_catalogue.py	2018-02-01 10:38:24 +0000
@@ -204,6 +204,30 @@
 
         return res
 
+
+    def unlink(self, cr, uid, ids, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if context is None:
+            context = {}
+
+        entity_identifier = self.pool.get('sync.client.entity').get_entity(cr, uid, context).identifier
+
+        # forbid supplier catalogue coming from higher instance level to be manually deleted:
+        to_unlink = set()
+        for catalogue in self.browse(cr, uid, ids, context=context):
+            catalogue_sd_ref = self.get_sd_ref(cr, uid, catalogue.id)
+            if catalogue_sd_ref and catalogue_sd_ref.startswith(entity_identifier) or context.get('sync_update_execution', False):
+                to_unlink.add(catalogue.id)
+            else:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Warning! You cannot delete a synched supplier catalogue created in a higher instance level.')
+                    )
+
+        return super(supplier_catalogue, self).unlink(cr, uid, list(to_unlink), context=context)
+
+
     def write(self, cr, uid, ids, vals, context=None):
         '''
         Update the supplierinfo and pricelist line according to the
@@ -1027,16 +1051,30 @@
 
         return res
 
-    def unlink(self, cr, uid, line_id, context=None):
+    def unlink(self, cr, uid, ids, context=None):
         '''
         Remove the pricelist line on product supplier information tab
         If the product supplier information has no line, remove it
         '''
-        if isinstance(line_id, (int, long)):
-            line_id = [line_id]
-
-        for l in line_id:
-            line = self.browse(cr, uid, l, context=context)
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        entity_identifier = self.pool.get('sync.client.entity').get_entity(cr, uid, context).identifier
+
+        # forbid supplier catalogue line coming from higher instance level to be manually deleted:
+        to_unlink = set()
+        for cat_line in self.browse(cr, uid, ids, context=context):
+            cat_line_sd_ref = self.get_sd_ref(cr, uid, cat_line.id)
+            if cat_line_sd_ref and cat_line_sd_ref.startswith(entity_identifier) or context.get('sync_update_execution', False):
+                to_unlink.add(cat_line.id)
+            else:
+                raise osv.except_osv(
+                    _('Error'),
+                    _('Warning! You cannot delete a synched supplier catalogue line created in a higher instance level.')
+                )
+        to_unlink = list(to_unlink)
+
+        for line in self.browse(cr, uid, to_unlink, context=context):
             c = context is not None and context.copy() or {}
             c.update({'product_change': True})
             # Remove the pricelist line in product tab
@@ -1048,7 +1086,7 @@
                 # Remove the supplier info
                 self.pool.get('product.supplierinfo').unlink(cr, uid, line.supplier_info_id.id, context=c)
 
-        return super(supplier_catalogue_line, self).unlink(cr, uid, line_id, context=context)
+        return super(supplier_catalogue_line, self).unlink(cr, uid, to_unlink, context=context)
 
     def _check_min_quantity(self, cr, uid, ids, context=None):
         '''