[MERGE] Sync with trunk
authorThibault Delavallée <tde@openerp.com>
Fri, 27 Dec 2013 15:35:17 +0000 (16:35 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 27 Dec 2013 15:35:17 +0000 (16:35 +0100)
commit0bcd78116f29c369e702527d2a1187f3cb256db4
treed0e7646d4a56349b1c6480fad92957cf740ec244
parente8beafdce3dbabb9e066d6c2422509c3b7a9162d
parent67e479e96e97be4d9aaba21a19ebf43511407ac8
[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20131227153517-j278y3hrjj2nzw79
addons/base_vat/i18n/zh_TW.po
addons/hr/i18n/zh_TW.po
addons/hr_expense/i18n/zh_TW.po
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/sale/i18n/zh_TW.po