Merge lp:~unifield-team/unifield-wm/us-422-453 into lp:unifield-wm

[jftempo]

Unmerged revisions

2573. By Quentin THEURET @Amaris on 2015-08-04

US-422 [FIX] Bad statement

2572. By Quentin THEURET @Amaris on 2015-08-04

Merge US-453 :: lp:~unifield-team/unifield-wm/us-453

2571. By Quentin THEURET @Amaris on 2015-08-04

Merge US-422 :: lp:~unifield-team/unifield-wm/us-422

=== modified file 'product_list/product_list.py'
--- product_list/product_list.py	2015-04-13 07:16:11 +0000
+++ product_list/product_list.py	2015-08-06 07:06:03 +0000
@@ -273,7 +273,38 @@
         ('default_code', "unique(default_code)", 'The "Product Code" must be unique'),
         ('xmlid_code', "unique(xmlid_code)", 'The xmlid_code must be unique'),
     ]
-    
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        """
+        Customize the search() method to include the search of products in a specific list
+        """
+        pl_obj = self.pool.get('product.list')
+        pll_obj = self.pool.get('product.list.line')
+
+        iargs = -1
+        for a in args:
+            iargs += 1
+            if a[0] == 'sublist':
+                prd_domain = set()
+                pl_ids = pl_obj.search(cr, uid, [
+                    ('name', a[1], a[2])
+                ], context=context)
+                pll_ids = pll_obj.search(cr, uid, [
+                    ('list_id', 'in', pl_ids),
+                ], context=context)
+                for line in pll_obj.browse(cr, uid, pll_ids, context=context):
+                    prd_domain.add(line.name.id)
+
+                del args[iargs]
+                args.append(('id', 'in', list(prd_domain)))
+
+                # In case of no list found or no line in lists, empty list
+                if not prd_domain:
+                    return []
+
+        return super(product_product, self).search(cr, uid, args, offset, limit, order, context, count)
+
+
     def write(self, cr, uid, ids, value, context=None):
         single = False
         if isinstance(ids, (long, int)):

=== modified file 'sale_override/sale.py'
--- sale_override/sale.py	2015-06-03 10:24:22 +0000
+++ sale_override/sale.py	2015-08-06 07:06:03 +0000
@@ -2614,7 +2614,20 @@
         '''
         context = context is None and {} or context
 
-        if not context.get('noraise') and not context.get('import_in_progress'):
+        if context.get('button') in ['button_remove_lines', 'check_lines_to_fix', 'add_multiple_lines', 'wizard_import_ir_lines']:
+            return True
+
+        btns = [
+            'button_remove_lines',
+            'check_lines_to_fix',
+            'add_multiple_lines',
+            'wizard_import_ir_lines',
+        ]
+        cond1 = context.get('button') not in btns
+        cond2 = not context.get('noraise')
+        cond3 = not context.get('import_in_progress')
+
+        if cond1 and cond2 and cond3:
             empty_lines = False
             if ids and not 'product_uom_qty' in vals:
                 empty_lines = self.search(cr, uid, [