[MERGE] pos: merged several fixes: canceling a cash register does not crash anymore...
authorThibault Delavallée <tde@openerp.com>
Fri, 10 Feb 2012 14:07:31 +0000 (15:07 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 10 Feb 2012 14:07:31 +0000 (15:07 +0100)
bzr revid: tde@openerp.com-20120210140731-lp38unlb126l9l57


Trivial merge