[MERGE]
authorCristian Salamea <ovnicraft@gmail.com>
Mon, 27 Dec 2010 05:26:33 +0000 (00:26 -0500)
committerCristian Salamea <ovnicraft@gmail.com>
Mon, 27 Dec 2010 05:26:33 +0000 (00:26 -0500)
commit974a8cacf05be871ef71a8096e6dd2f0ef746ad5
treeda3bae98ab87c998cd539d1dfaa9093866bba9ab
parent612c454cc8c8f46c26996990fd333a56c4d6a1c5
parentc362e4b48ead41e7a0add3449c3fff7bfedc9fb8
[MERGE]

bzr revid: ovnicraft@gmail.com-20101227052633-hi3op794dkd3pn5m
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/wizard/pos_scan_product.py