Merge lp:~unifield-team/unifield-addons/addons-uf-513 into lp:unifield-addons

[jftempo]

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-10-24 13:46:20 +0000
+++ purchase/purchase.py	2011-11-17 17:19:10 +0000
@@ -708,6 +708,14 @@
                         'uom': uom,
                         'date': date_order,
                         })[pricelist]
+        if price is False:
+            warning = {
+                'title': 'No valid pricelist line found !',
+                'message':
+                    "Couldn't find a pricelist line matching this product and quantity.\n"
+                    "You have to change either the product, the quantity or the pricelist."
+                }
+            res.update({'warning': warning})
         dt = (datetime.now() + relativedelta(days=int(seller_delay) or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
 
 

=== modified file 'purchase/test/procurement_buy.yml'
--- purchase/test/procurement_buy.yml	2011-01-14 00:11:01 +0000
+++ purchase/test/procurement_buy.yml	2011-11-17 17:19:10 +0000
@@ -24,7 +24,7 @@
     seller_delay: '1'
     seller_ids:
       - delay: 1
-        name: base.res_partner_asus
+        name: base.res_partner_10
         min_qty: 2.0
         qty: 5.0
 -

=== modified file 'stock/stock.py'
--- stock/stock.py	2011-11-14 10:45:15 +0000
+++ stock/stock.py	2011-11-17 17:19:10 +0000
@@ -1324,6 +1324,12 @@
         }
         return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form')) 
     
+    def _hook_log_message_picking(self, cr, uid, ids, context=None, pick=False, message=''):
+        '''
+        Allow the modification of the logged message
+        '''
+        return message
+    
     def _hook_log_picking_log_cond(self, cr, uid, ids, context=None, *args, **kwargs):
         '''
         specify if we display a log or not
@@ -1375,8 +1381,12 @@
             res = self._hook_picking_get_view(cr, uid, ids, context=context, pick=pick)
             context.update({'view_id': res and res[1] or False})
             message += state_list[pick.state]
+<<<<<<< TREE
             # modify the message to be displayed
             message = self._hook_log_picking_modify_message(cr, uid, ids, context=context, message=message, pick=pick,)
+=======
+            message = self._hook_log_message_picking(cr, uid, ids, context=context, pick=pick, message=message)
+>>>>>>> MERGE-SOURCE
             # conditional test for message log
             if self._hook_log_picking_log_cond(cr, uid, ids, context=context, pick=pick,):
                 self.log(cr, uid, pick.id, message, context=context)
@@ -1436,6 +1446,8 @@
         @return: Ids of locations
         """
         locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')])
+        if context.get('location_id', False):
+            locations = context['location_id'] and [context['location_id']] or []
         cr.execute('''select
                 prodlot_id,
                 sum(qty)