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

author	Aaron Bohy <aab@odoo.com>
	Fri, 7 Nov 2014 14:57:24 +0000 (15:57 +0100)
committer	Frédéric van der Essen <fvdessen@gmail.com>
	Wed, 26 Nov 2014 11:06:14 +0000 (12:06 +0100)
commit	32fcfa657c7da678d3fe15ea53a8c142f53cc614
tree	48a9d34b933c4b44b1b758c3b5175128008b4a31	tree \| snapshot
parent	1526af8cb5fbaafae9c6f4c2b466f7f53eb44589	commit \| diff

[FIX] base(res_partner),point_of_sale,product,sale_stock,stock: uniformization of field barcode in res.partner, res.user, product.product, product.packaging and product.template

Conflicts:
addons/point_of_sale/res_partner_view.xml

22 files changed:

addons/point_of_sale/point_of_sale.py		diff \| blob \| history
addons/point_of_sale/point_of_sale_demo.xml		diff \| blob \| history
addons/point_of_sale/point_of_sale_view.xml		diff \| blob \| history
addons/point_of_sale/report/user_label.xml		diff \| blob \| history
addons/point_of_sale/report/user_label.xsl		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/res_users.py		diff \| blob \| history
addons/point_of_sale/res_users_view.xml		diff \| blob \| history
addons/point_of_sale/static/src/js/db.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/xml/pos.xml		diff \| blob \| history
addons/product/product.py		diff \| blob \| history
addons/product/product_view.xml		diff \| blob \| history
addons/product/report/product_label.xml		diff \| blob \| history
addons/product/report/product_label.xsl		diff \| blob \| history
addons/product_expiry/product_expiry_demo.xml		diff \| blob \| history
addons/sale_stock/sale_stock.py		diff \| blob \| history
addons/stock/stock.py		diff \| blob \| history
addons/stock/views/report_stockpicking.xml		diff \| blob \| history
openerp/addons/base/res/res_partner.py		diff \| blob \| history

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

RSS Atom