projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9d7c18 d6ba50f)
[MERGE] Merged:trunk-dev-addons2
authorron@tinyerp.com <>
Thu, 28 Oct 2010 07:06:47 +0000 (12:36 +0530)
committerron@tinyerp.com <>
Thu, 28 Oct 2010 07:06:47 +0000 (12:36 +0530)
bzr revid: ron@tinyerp.com-20101028070647-sv5z2byw6nr79ch4

1  2 
addons/stock/stock.py patch | diff1 | diff2 | blob | history

diff --cc addons/stock/stock.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.