[MERGE] merge with addons
authorAmit Vora (OpenERP Trainee) <voraamitr@gmail.com>
Thu, 22 Aug 2013 12:40:57 +0000 (18:10 +0530)
committerAmit Vora (OpenERP Trainee) <voraamitr@gmail.com>
Thu, 22 Aug 2013 12:40:57 +0000 (18:10 +0530)
commit32143e8935111574a1b54e375d90ad342da783c9
tree08c3e9a644c4cfd31a704876490a87fcf80cd412
parent68711bb1c5c87d47231d0c20bfb1f9e45398420e
parentef879b133f9ff368bedf0778b50cd56961530654
[MERGE] merge with addons

bzr revid: voraamitr@gmail.com-20130822124057-rv6oqd0n22mf53c8
addons/point_of_sale/point_of_sale.py