[MERGE] forward port of branch saas-3 up to revid 38abc8a
authorChristophe Simonis <chs@odoo.com>
Tue, 20 May 2014 17:00:50 +0000 (19:00 +0200)
committerChristophe Simonis <chs@odoo.com>
Tue, 20 May 2014 17:00:50 +0000 (19:00 +0200)
commitbb26dea60be37823a9a5b14e96ebdbde268c229e
tree105eee182f7680c1593a0b89fe89c7032f895f5c
parenta70eea3b11290a5eccfd773d9c62eaf417822943
parent38abc8a006ed0848313c140d7ada9298c4b42706
[MERGE] forward port of branch saas-3 up to revid 38abc8a
addons/point_of_sale/point_of_sale.py
openerp/addons/base/ir/ir_ui_view.py
openerp/osv/orm.py
openerp/tools/misc.py