[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_...
authorAtul Patel (OpenERP) <atp@tinyerp.com>
Sun, 29 Apr 2012 18:07:29 +0000 (23:37 +0530)
committerAtul Patel (OpenERP) <atp@tinyerp.com>
Sun, 29 Apr 2012 18:07:29 +0000 (23:37 +0530)
commit49ca301bd6b4da6bd69561cbbbe08bf508075781
tree31b026a9021894165a1d7093376b8ca1d7035b10
parentedd102bc770c84f546dd45147bbc07feca762145
parent66814b5501edfc5aab0dd54eb161e488b8d23462
[MERGE]: Merged lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_pageview-nco with some changes

bzr revid: atp@tinyerp.com-20120429180729-nscqe9nix9am0367
addons/event/event.py
addons/event/event_view.xml
addons/event/static/src/css/event.css
addons/event_sale/event_sale.py
addons/event_sale/event_sale_view.xml
addons/sale/sale_view.xml