[MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authormtr <mtr@mtr>
Mon, 28 Jun 2010 13:16:19 +0000 (18:46 +0530)
committermtr <mtr@mtr>
Mon, 28 Jun 2010 13:16:19 +0000 (18:46 +0530)
bzr revid: mtr@mtr-20100628131619-qd9wal2coffonm4b

1  2 
addons/sale_journal/sale_journal.py

Simple merge