← Back to branch summary

~openerp-dev/openobject-addons/6.1-opw-572620-skh

~openerp-dev/openobject-addons/6.1-opw-572620-skh

Viewing all changes in revision 6726.

Committer: Antony Lesuisse
Date: 2012-04-03 13:05:28 UTC
Revision ID: al@openerp.com-20120403130528-8awtj91yoa64gi61

[MERGE] point_of_sale barcode scanning (manual merge)

files modified:
account/res_currency.py

point_of_sale/point_of_sale_demo.xml

point_of_sale/static/src/js/pos.js

point_of_sale/static/src/xml/pos.xml

product/product.py

Show diffs side-by-side

added added

removed removed

account/res_currency.py

point_of_sale/point_of_sale_demo.xml

point_of_sale/static/src/js/pos.js

point_of_sale/static/src/xml/pos.xml

product/product.py

Older »