[MERGE]:Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1
authorsbh (Open ERP) <sbh@tinyerp.com>
Wed, 9 Jun 2010 04:58:48 +0000 (10:28 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Wed, 9 Jun 2010 04:58:48 +0000 (10:28 +0530)
commit64d9c8b104c96111fd2323769aa9260eac6627b4
tree5ee1fc104eadaae181a2fe932696b0021a34ae5d
parent6dd09914ffd0b906e4ea2cb305ad1eeeb9e65b49
parent5eab03db0d0f282e3efe89826c6338f1a42a1313
[MERGE]:Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons1

bzr revid: sbh@tinyerp.com-20100609045848-ysb4bhc8l8zd2fjm
addons/point_of_sale/pos_view.xml