projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c12c88e
48f64d6
)
[MERGE]: Merged with lp:~openerp-dev/openobject-addons/rpa-dev-addons2
author
rpa (Open ERP)
<rpa@tinyerp.com>
Wed, 22 Dec 2010 12:38:57 +0000
(18:08 +0530)
committer
rpa (Open ERP)
<rpa@tinyerp.com>
Wed, 22 Dec 2010 12:38:57 +0000
(18:08 +0530)
bzr revid: rpa@tinyerp.com-
20101222123857
-m2s1iencohdnqmtv
1
2
addons/stock/stock.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
addons/stock/stock.py
index
6478a5f
,
f2f4285
..
ec281ca
---
1
/
addons/stock/stock.py
---
2
/
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: