[MERGE] point_of_sale, pos_loyalty: merging the pos_loyalty module
authorFrederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com>
Wed, 1 Oct 2014 10:14:29 +0000 (12:14 +0200)
committerFrédéric van der Essen <fvdessen@gmail.com>
Tue, 25 Nov 2014 18:16:22 +0000 (19:16 +0100)
commitee281659728ae8adb149e91cf6dd26011db6a71d
treedefa2f362e0b1b70ce31cbc2683432de5970a481
parentf2fdaa017c66bfcc6fceece37ba0931169dc89b8
[MERGE] point_of_sale, pos_loyalty: merging the pos_loyalty module

Conflicts:
addons/point_of_sale/static/src/js/widgets.js
13 files changed:
addons/point_of_sale/static/src/css/pos.css
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/screens.js
addons/point_of_sale/static/src/js/widgets.js
addons/point_of_sale/static/src/xml/pos.xml
addons/pos_loyalty/__init__.py [new file with mode: 0644]
addons/pos_loyalty/__openerp__.py [new file with mode: 0644]
addons/pos_loyalty/loyalty.py [new file with mode: 0644]
addons/pos_loyalty/static/src/css/loyalty.css [new file with mode: 0644]
addons/pos_loyalty/static/src/js/loyalty.js [new file with mode: 0644]
addons/pos_loyalty/static/src/xml/loyalty.xml [new file with mode: 0644]
addons/pos_loyalty/views/templates.xml [new file with mode: 0644]
addons/pos_loyalty/views/views.xml [new file with mode: 0644]