projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f76ca87 3c084ff)
[MERGE] merge lp:~openerp-dev/openobject-addons/trunk-stock_cancel_button_fix-cha
authorAjay Chauhan (OpenERP) <cha@tinyerp.com>
Fri, 21 Sep 2012 06:30:25 +0000 (12:00 +0530)
committerAjay Chauhan (OpenERP) <cha@tinyerp.com>
Fri, 21 Sep 2012 06:30:25 +0000 (12:00 +0530)
bzr revid: cha@tinyerp.com-20120921063025-q1z0lj1ida0ew975

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.