[MERGE] merge with latest trunk
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Thu, 29 Aug 2013 05:11:25 +0000 (10:41 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Thu, 29 Aug 2013 05:11:25 +0000 (10:41 +0530)
commitad7732a4c29378851d9108ba915c2b307bdad3a1
tree8a56fae03a00255e6194a5be39adb0ae21f40c4d
parente87c0b59bf5e72dc3a377ac899648235994bca68
parent00d3d9a4b6ee444e68b2db28f0726192a686a411
[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20130829051125-jmxg4bi8ban5buij
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml