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

author	Aaron Bohy <aab@odoo.com>
	Thu, 30 Oct 2014 14:50:11 +0000 (15:50 +0100)
committer	Frédéric van der Essen <fvdessen@gmail.com>
	Wed, 26 Nov 2014 10:46:03 +0000 (11:46 +0100)
commit	7464b3eab30c05b940b68145248e932e3736f525
tree	871254cb14898c96c8ccef0cda52f2d96f240e39	tree \| snapshot
parent	6c2fcc26a8b49419112ea0fe159f55d37fd5269a	commit \| diff

[IMP] pos_barcodes: pos_barcodes set as dependency of point_of_sale and stock (+ already used in PoS)

Conflicts:
addons/stock/stock_view.xml

21 files changed:

addons/point_of_sale/__openerp__.py		diff \| blob \| history
addons/point_of_sale/point_of_sale.py		diff \| blob \| history
addons/point_of_sale/point_of_sale_data.xml		diff \| blob \| history
addons/point_of_sale/point_of_sale_view.xml		diff \| blob \| history
addons/point_of_sale/security/ir.model.access.csv		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/pos_barcodes/__openerp__.py		diff \| blob \| history
addons/pos_barcodes/barcodes.py		diff \| blob \| history
addons/pos_barcodes/barcodes_view.xml		diff \| blob \| history
addons/pos_barcodes/data/barcodes_data.xml	[new file with mode: 0644]	blob
addons/pos_barcodes/security/barcodes_security.xml	[new file with mode: 0644]	blob
addons/pos_barcodes/security/ir.model.access.csv		diff \| blob \| history
addons/pos_barcodes/static/src/js/barcodes.js	[deleted file]	blob \| history
addons/pos_barcodes/views/templates.xml		diff \| blob \| history
addons/stock/__openerp__.py		diff \| blob \| history
addons/stock/res_config.py		diff \| blob \| history
addons/stock/res_config_view.xml		diff \| blob \| history
addons/stock/security/ir.model.access.csv		diff \| blob \| history
addons/stock/stock.py		diff \| blob \| history
addons/stock/stock_view.xml		diff \| blob \| history

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