git.inspyration.org Git - odoo/odoo.git/commit

[MERGE] forward port of branch 7.0 up to revid 4067 chs@openerp.com-20131114142639-ng7wzfjwvvel2nhv

bzr revid: dle@openerp.com-20131112134311-h1vsux0ge17bsqkc
bzr revid: chs@openerp.com-20131114134731-n324awyon0spq624
bzr revid: chs@openerp.com-20130823145204-xwpnlwg0gg2259f6
bzr revid: chs@openerp.com-20130906170157-e7m4pjskyi47q82o
bzr revid: dle@openerp.com-20130909170408-wxgoduzggap6o4ng
bzr revid: dle@openerp.com-20130919141212-ridtrvvfwvu6calr
bzr revid: dle@openerp.com-20131018120136-fvoq337kgx74njsy
bzr revid: dle@openerp.com-20131023103308-18pj2gqq3imrcir7
bzr revid: chs@openerp.com-20131030180528-hqsztaujjjqev8ky
bzr revid: dle@openerp.com-20131106100128-mx8mnguvp321wick
bzr revid: chs@openerp.com-20131115104909-3u3mu40g9xnler88

author	Christophe Simonis <chs@openerp.com>
	Fri, 15 Nov 2013 10:49:09 +0000 (11:49 +0100)
committer	Christophe Simonis <chs@openerp.com>
	Fri, 15 Nov 2013 10:49:09 +0000 (11:49 +0100)
commit	993bff902e22ab77b7a36d3f48ed12511e93e2b1
tree	771ff0d5073d77d0e050e2d3eafd288d6836b8e6	tree \| snapshot
parent	079bf3170605bd25cd122e872e4c91d34eacb83f	commit \| diff
parent	1e4b2695d59b9d51cc1e0b76f925aa4f638436f4	commit \| diff

addons/web/static/src/css/base.css	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/css/base.sass	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/search.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/js/view_form.js	diff1 \|	diff2 \|	blob \| history
addons/web/static/src/xml/base.xml	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.css	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/css/kanban.sass	diff1 \|	diff2 \|	blob \| history
addons/web_kanban/static/src/js/kanban.js	diff1 \|	diff2 \|	blob \| history
openerp/osv/orm.py	diff1 \|	diff2 \|	blob \| history