[MERGE]sync with trunk
authorsgo@tinyerp.com <>
Mon, 11 Mar 2013 04:56:38 +0000 (10:26 +0530)
committersgo@tinyerp.com <>
Mon, 11 Mar 2013 04:56:38 +0000 (10:26 +0530)
commita21b4b9b56c8e3c0b2e6a71417765d9566b2356a
tree1c1eb43d8cca4eb2f0b086895b711b26c55cfb7e
parentcfa23a6afd4ddae13868c01706dc976e65db98c7
parentc867cb5acc731509fbee5b0e081c57d0aa374b5d
[MERGE]sync with trunk

bzr revid: sgo@tinyerp.com-20130311045638-npwv6lb6bc9i3m1y
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/wizard/pos_return.py
addons/sale/sale.py
addons/sale/sale_view.xml
addons/sale_mrp/test/sale_mrp.yml
addons/sale_stock/sale_stock.py
addons/sale_stock/test/picking_order_policy.yml
addons/stock/product.py