[MERGE] base : Merged my branch to fix the Customer Events annoying issue (Case:5435)
[MERGE] base : Merged my branch to fix the Customer Events annoying issue (Case:5435)
splbio/openobject-server,MarkusTeufelberger/openobject-server,vnc-biz/openerp-server,vnc-biz/openerp-server,MarkusTeufelberger/openobject-server,MarkusTeufelberger/openobject-server,gisce/openobject-server,ovnicraft/openerp-server,splbio/openobject-server,ovnicraft/openerp-server,gisce/openobject-server,splbio/openobject-server,gisce/openobject-server