From: rpa (Open ERP) <rpa@tinyerp.com>
Date: Wed, 22 Dec 2010 12:38:57 +0000 (+0530)
Subject: [MERGE]: Merged with lp:~openerp-dev/openobject-addons/rpa-dev-addons2
X-Git-Tag: 6.0.0-rc2-addons~12^2~13
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=d49df35eb43d0b18b2a9ddd562b75642a840b1aa;p=odoo%2Fodoo.git

[MERGE]: Merged with lp:~openerp-dev/openobject-addons/rpa-dev-addons2

bzr revid: rpa@tinyerp.com-20101222123857-m2s1iencohdnqmtv
---

d49df35eb43d0b18b2a9ddd562b75642a840b1aa
diff --cc addons/stock/stock.py
index 6478a5f,f2f4285..ec281ca
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@@ -2298,10 -2321,9 +2319,9 @@@ class stock_move(osv.osv)
                  default_val = {
                      'product_qty': quantity,
                      'product_uos_qty': uos_qty,
-                     'state': move.state,
                      'location_id': location_id or move.location_id.id,
                  }
 -                if move.product_id.track_production and location_id:
 +                if (not move.prodlot_id.id) and (move.product_id.track_production and location_id):
                      # IF product has checked track for production lot, move lines will be split by 1
                      res += self.action_split(cr, uid, [move.id], quantity, split_by_qty=1, context=context)
                  else: