[MERGE] branch merged with lp:~openerp-dev/openobject-addons/sbh-dev-addons1
authormso <mso@mso>
Thu, 13 May 2010 12:54:29 +0000 (18:24 +0530)
committermso <mso@mso>
Thu, 13 May 2010 12:54:29 +0000 (18:24 +0530)
bzr revid: mso@mso-20100513125429-88dzhy05nvjv17tk

1  2 
addons/point_of_sale/pos.py

Simple merge