projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 75c0706 41a69ec)
[Merge]with: lp:openobject-addons
authorDBR (OpenERP) <dbr@tinyerp.com>
Mon, 30 Apr 2012 05:10:38 +0000 (10:40 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Mon, 30 Apr 2012 05:10:38 +0000 (10:40 +0530)
bzr revid: dbr@tinyerp.com-20120430051038-3j08y526ud5rj5y0

1  2 
addons/sale/__openerp__.py patch | diff1 | diff2 | blob | history
addons/sale/sale_view.xml patch | diff1 | diff2 | blob | history

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