[MERGE] Merged lp:openobject-addons.
authorParamjit Singh Sahota <psa@tinyerp.com>
Fri, 13 Sep 2013 11:21:55 +0000 (16:51 +0530)
committerParamjit Singh Sahota <psa@tinyerp.com>
Fri, 13 Sep 2013 11:21:55 +0000 (16:51 +0530)
commitdaa7594cbb04d01dfcc971c4c165c772bd27149f
tree801e09dc27008d06142db88293981590bb50028d
parent606431f0eea3281335e3dae8220785b3ef4f6573
parent2f9980881b2533195e8797f678d1038cb95a5ac4
[MERGE] Merged lp:openobject-addons.

bzr revid: psa@tinyerp.com-20130913112155-jll3rlzcgsjrtzv4
addons/account/__openerp__.py
addons/account/account_view.xml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml