[MERGE] merge with latest trunk
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Thu, 20 Jun 2013 06:06:37 +0000 (11:36 +0530)
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>
Thu, 20 Jun 2013 06:06:37 +0000 (11:36 +0530)
commit9598f4c0bea8d8a8780a3bd837edcdcf6d98b957
tree60ca2d08df614669fb3a6bfb0a4cbe287a51eae4
parentc3fd3ce311e25a4329d97af241c523126941492f
parent9ebfb79b6b4bd8cd2367c4467a935752e4f92e02
[MERGE] merge with latest trunk

bzr revid: rma@tinyerp.com-20130620060637-s4x59zxv02sna643
addons/hr_attendance/i18n/th.po
addons/hr_recruitment/i18n/th.po
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml