[Merge] Merge with main branch.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 15 Jun 2012 05:10:58 +0000 (10:40 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Fri, 15 Jun 2012 05:10:58 +0000 (10:40 +0530)
commit3840d3d2433d3d21d68dd99e8a47704e11dcfce5
tree283a4a53a57474190e555da2a1a7acb2e07ae39c
parentb3d5abbbe37ccec467f3c31380d1894e60a9023a
parent1fce603c66603d976072e48e685ba856e39d7c5a
[Merge] Merge with main branch.

bzr revid: mdi@tinyerp.com-20120615051058-706qm6qbz3a538zk
addons/account_voucher/voucher_sales_purchase_view.xml