git.inspyration.org Git - odoo/odoo.git/commit

projects / odoo / odoo.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 53d807f) | patch

author	Dimitri del Marmol <dimitri@ddm.be.openerp.com>
	Fri, 13 Jun 2014 14:19:05 +0000 (16:19 +0200)
committer	Dimitri del Marmol <dimitri@ddm.be.openerp.com>
	Fri, 13 Jun 2014 14:19:05 +0000 (16:19 +0200)
commit	b021330f0eec2f71fda165d8f87473b2b47be190
tree	4877f8334e3cd01d3172605d8451199b052ff936	tree \| snapshot
parent	53d807f8a7c33f018e5be16fea52297e7606ab52	commit \| diff

[MERGE] Bzr branch lp:~openerp-usertesting/openobject-addons/trunk-restaurant-wip-fva

17 files changed:

addons/hw_escpos/escpos/escpos.py		diff \| blob \| history
addons/point_of_sale/__openerp__.py		diff \| blob \| history
addons/point_of_sale/controllers/main.py		diff \| blob \| history
addons/point_of_sale/point_of_sale.py		diff \| blob \| history
addons/point_of_sale/point_of_sale_view.xml		diff \| blob \| history
addons/point_of_sale/res_partner.py		diff \| blob \| history
addons/point_of_sale/res_partner_view.xml		diff \| blob \| history
addons/point_of_sale/static/src/css/pos.css		diff \| blob \| history
addons/point_of_sale/static/src/img/logo.png		diff \| blob \| history
addons/point_of_sale/static/src/js/db.js		diff \| blob \| history
addons/point_of_sale/static/src/js/devices.js		diff \| blob \| history
addons/point_of_sale/static/src/js/models.js		diff \| blob \| history
addons/point_of_sale/static/src/js/screens.js		diff \| blob \| history
addons/point_of_sale/static/src/js/widgets.js		diff \| blob \| history
addons/point_of_sale/static/src/xml/pos.xml		diff \| blob \| history
addons/point_of_sale/views/templates.xml	[new file with mode: 0644]	blob
addons/point_of_sale/wizard/pos_payment.py		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.