[MERGE] with trunk
authorForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 17 Jun 2013 06:56:36 +0000 (12:26 +0530)
committerForam Katharotiya (OpenERP) <fka@tinyerp.com>
Mon, 17 Jun 2013 06:56:36 +0000 (12:26 +0530)
commit5a761f9752c06ad945b2fd346459ee316303b51a
treedbe497f07847e7056098e68f69050bde342776c7
parent5ee65de02545bc9ddd50028cdd39736179c2456a
parent50106b25e8163d6032b9ccabe514622c073b2fb1
[MERGE] with trunk

bzr revid: fka@tinyerp.com-20130617065636-t6kjnfe6vyz6m8av
addons/account/account_view.xml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml