[MERGE] lp:~openerp-dev/openobject-addons/trunk-cashcontrol--cha.
authorTejas Tank <tta@openerp.com>
Thu, 4 Apr 2013 13:10:17 +0000 (18:40 +0530)
committerTejas Tank <tta@openerp.com>
Thu, 4 Apr 2013 13:10:17 +0000 (18:40 +0530)
commit8e0f1cd1b915c2127fb1056f3fc4d76b0310dd07
treed531852dc90fa37741367ddf75b699c1c0fbcea6
parent14e4841c83fd786a3f4b27abbf41274e0322320c
parentcbc2fc05c8ce64eb5e14cbf8f3058af478034073
[MERGE] lp:~openerp-dev/openobject-addons/trunk-cashcontrol--cha.

bzr revid: tta@openerp.com-20130404131017-phib24vytdx5fqmj
addons/point_of_sale/point_of_sale.py