[MERGE]Merged with Trunk-dev-addons2

bzr revid: ron@tinyerp.com-20101222054827-4j3swsc75ryk54zt

diff --cc addons/mrp/mrp_view.xml
Simple merge

diff --cc addons/product/product.py
Simple merge

diff --cc addons/purchase/purchase_view.xml
Simple merge

diff --cc addons/stock/stock.py
index bf5347f,8b214d2..6478a5f
--- 1/addons/stock/stock.py
--- 2/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -2265,7 -2282,11 +2282,9 @@@ class stock_move(osv.osv)
          res = []
          for move in self.browse(cr, uid, ids, context=context):
              move_qty = move.product_qty
+             if move_qty <= 0:
+                 raise osv.except_osv(_('Error!'), _('Can not consume a move with negative or zero quantity !'))
              quantity_rest = move.product_qty
 -
              quantity_rest -= quantity
              uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
              if quantity_rest <= 0: