odoo/odoo.git
9 years ago[IMP] point_of_sale: put the POS js files include function into the openerp namespace
Frédéric van der Essen [Tue, 9 Dec 2014 21:43:48 +0000 (22:43 +0100)]
[IMP] point_of_sale: put the POS js files include function into the openerp namespace

9 years ago[IMP] point_of_sale: removed the barcode field; already defined on res.partner
Frédéric van der Essen [Tue, 9 Dec 2014 20:45:06 +0000 (21:45 +0100)]
[IMP] point_of_sale: removed the barcode field; already defined on res.partner

9 years ago[IMP] barcodes: use builtin python sets when it makes sense
Frédéric van der Essen [Tue, 9 Dec 2014 20:38:52 +0000 (21:38 +0100)]
[IMP] barcodes: use builtin python sets when it makes sense

9 years ago[IMP] point_of_sale: transform method into lambda, use uuid4 instead of uuid1
Frédéric van der Essen [Tue, 9 Dec 2014 20:12:22 +0000 (21:12 +0100)]
[IMP] point_of_sale: transform method into lambda, use uuid4 instead of uuid1

9 years ago[IMP] barcodes: better default patterns
Frédéric van der Essen [Tue, 9 Dec 2014 20:05:13 +0000 (21:05 +0100)]
[IMP] barcodes: better default patterns

9 years ago[IMP] barcodes: add a little explanation text on the barcode nomenclatures
Frédéric van der Essen [Tue, 9 Dec 2014 17:09:39 +0000 (18:09 +0100)]
[IMP] barcodes: add a little explanation text on the barcode nomenclatures

9 years ago[IMP] barcodes: remove AGPL headers (code still under AGPL)
Frédéric van der Essen [Tue, 9 Dec 2014 10:44:01 +0000 (11:44 +0100)]
[IMP] barcodes: remove AGPL headers (code still under AGPL)

9 years ago[FIX] point_of_sale: fix date formating regression due to moment.js refactor
Frédéric van der Essen [Mon, 1 Dec 2014 18:13:46 +0000 (19:13 +0100)]
[FIX] point_of_sale: fix date formating regression due to moment.js refactor

9 years ago[IMP] point_of_sale: add tax total to the tax included receipt - required by law...
Frédéric van der Essen [Mon, 1 Dec 2014 17:53:33 +0000 (18:53 +0100)]
[IMP] point_of_sale: add tax total to the tax included receipt - required by law in Belgium.

9 years ago[FIX] pos_loyalty: incorrect xpath
Frédéric van der Essen [Wed, 26 Nov 2014 14:04:11 +0000 (15:04 +0100)]
[FIX] pos_loyalty: incorrect xpath

9 years ago[IMP] point_of_sale: enable product re-ordering in the point of sale.
Frédéric van der Essen [Mon, 24 Nov 2014 13:37:28 +0000 (14:37 +0100)]
[IMP] point_of_sale: enable product re-ordering in the point of sale.

9 years ago[IMP] point_of_sale: better names for the pos config fields
Frederic van der Essen [Wed, 19 Nov 2014 12:10:04 +0000 (13:10 +0100)]
[IMP] point_of_sale: better names for the pos config fields

9 years ago[IMP] point_of_sale: removing obsolete field
Frederic van der Essen [Wed, 19 Nov 2014 10:09:15 +0000 (11:09 +0100)]
[IMP] point_of_sale: removing obsolete field

9 years ago[IMP] point_of_sale: pos config view improvement
Frederic van der Essen [Tue, 18 Nov 2014 22:24:53 +0000 (23:24 +0100)]
[IMP] point_of_sale: pos config view improvement

9 years ago[IMP] point_of_sale: moved the barcode field to the view header, and gave it a simple...
Frederic van der Essen [Tue, 18 Nov 2014 22:14:10 +0000 (23:14 +0100)]
[IMP] point_of_sale: moved the barcode field to the view header, and gave it a simpler name

9 years ago[IMP] pos_restaurant: automatically display floors if they have been setup (removed...
Frederic van der Essen [Tue, 18 Nov 2014 22:07:45 +0000 (23:07 +0100)]
[IMP] pos_restaurant: automatically display floors if they have been setup (removed config option)

Conflicts:
addons/pos_restaurant/restaurant.py
addons/pos_restaurant/restaurant_view.xml

9 years ago[IMP] pos_restaurant: allow re-ordering of the restaurant floors
Frederic van der Essen [Tue, 18 Nov 2014 22:03:46 +0000 (23:03 +0100)]
[IMP] pos_restaurant: allow re-ordering of the restaurant floors

9 years ago[IMP] point_of_sale: order payment methods by journal order + a bit of code cleanup
Frederic van der Essen [Tue, 18 Nov 2014 16:39:34 +0000 (17:39 +0100)]
[IMP] point_of_sale: order payment methods by journal order + a bit of code cleanup

9 years ago[IMP] account: add a sequence to account journals to allow reordering. This is used...
Frederic van der Essen [Tue, 18 Nov 2014 16:34:01 +0000 (17:34 +0100)]
[IMP] account: add a sequence to account journals to allow reordering. This is used to re-order the point of sale's payment methods

Conflicts:
addons/account/account.py

9 years ago[FIX] barcodes: some small fixes in the default barcode patterns
Frederic van der Essen [Tue, 18 Nov 2014 15:11:18 +0000 (16:11 +0100)]
[FIX] barcodes: some small fixes in the default barcode patterns

9 years ago[FIX] account_anglo_saxon (test): invoice_state defined in the stock_move and in...
Aaron Bohy [Tue, 18 Nov 2014 13:36:09 +0000 (14:36 +0100)]
[FIX] account_anglo_saxon (test): invoice_state defined in the stock_move and in the stock.picking in tests

9 years ago[FIX] stock: barcode_nomenclature_id field on stock.picking.type instead of stock...
Aaron Bohy [Tue, 18 Nov 2014 13:13:08 +0000 (14:13 +0100)]
[FIX] stock: barcode_nomenclature_id field on stock.picking.type instead of stock.picking

9 years ago[FIX] account_anglo_saxon (test): invoice_state defined in the stock_move and not...
Aaron Bohy [Tue, 18 Nov 2014 12:43:24 +0000 (13:43 +0100)]
[FIX] account_anglo_saxon (test): invoice_state defined in the stock_move and not in the stock.picking in tests

9 years ago[FIX] pos_restaurant: remove console.log
Frederic van der Essen [Tue, 18 Nov 2014 12:38:39 +0000 (13:38 +0100)]
[FIX] pos_restaurant: remove console.log

9 years ago[FIX] stock, point_of_sale: required='True' replaced by required=True in barcode_nome...
Aaron Bohy [Tue, 18 Nov 2014 09:45:21 +0000 (10:45 +0100)]
[FIX] stock, point_of_sale: required='True' replaced by required=True in barcode_nomenclature_id field definition and _get_default_nomenclature function refactored

Conflicts:
addons/point_of_sale/point_of_sale.py

9 years ago[DOC]: barcodes: documentation
Aaron Bohy [Tue, 18 Nov 2014 08:58:47 +0000 (09:58 +0100)]
[DOC]: barcodes: documentation

9 years ago[FIX] point_of_sale: only load cashier belonging to the pos's company, cashier withou...
Frederic van der Essen [Mon, 17 Nov 2014 15:16:07 +0000 (16:16 +0100)]
[FIX] point_of_sale: only load cashier belonging to the pos's company, cashier without PINs could not be set

Conflicts:
addons/point_of_sale/static/src/js/models.js

9 years ago[FIX] point_of_sale: fix crash when scanning a cashier badge
Frederic van der Essen [Mon, 17 Nov 2014 15:01:04 +0000 (16:01 +0100)]
[FIX] point_of_sale: fix crash when scanning a cashier badge

Conflicts:
addons/point_of_sale/static/src/js/screens.js

9 years ago[IMP] pos_restaurant: add table information to the bill and the payment receipt
Frederic van der Essen [Mon, 17 Nov 2014 14:37:21 +0000 (15:37 +0100)]
[IMP] pos_restaurant: add table information to the bill and the payment receipt

9 years ago[IMP] pos_restaurant: improve the kitchen receipts based on customer feedback : Put...
Frederic van der Essen [Mon, 17 Nov 2014 13:53:21 +0000 (14:53 +0100)]
[IMP] pos_restaurant: improve the kitchen receipts based on customer feedback : Put the quantities ont the left, Add the the time, and make the table name more legible

9 years ago[FIX] point_of_sale: fix crash on customer barcode scan
Frederic van der Essen [Mon, 17 Nov 2014 11:54:38 +0000 (12:54 +0100)]
[FIX] point_of_sale: fix crash on customer barcode scan

9 years ago[FIX] barcodes: added the web dependency to prevent web.assets.backend not found...
Aaron Bohy [Mon, 17 Nov 2014 09:37:05 +0000 (10:37 +0100)]
[FIX] barcodes: added the web dependency to prevent web.assets.backend not found error

9 years ago[FIX] barcodes: parse_barcode functions in PY and JS commented
Aaron Bohy [Fri, 14 Nov 2014 16:51:33 +0000 (17:51 +0100)]
[FIX] barcodes: parse_barcode functions in PY and JS commented

9 years ago[IMP] barcodes: more specific ValidationError messages in pattern constraint
Aaron Bohy [Fri, 14 Nov 2014 16:31:21 +0000 (17:31 +0100)]
[IMP] barcodes: more specific ValidationError messages in pattern constraint

9 years ago[IMP] point_of_sale: Weighted Barcode rule removed from PoS data since already loaded...
Aaron Bohy [Fri, 14 Nov 2014 16:11:53 +0000 (17:11 +0100)]
[IMP] point_of_sale: Weighted Barcode rule removed from PoS data since already loaded in WMS

9 years ago[FIX] pos_restaurant: the floormap was not displaying in firefox
Frederic van der Essen [Fri, 14 Nov 2014 14:39:05 +0000 (15:39 +0100)]
[FIX] pos_restaurant: the floormap was not displaying in firefox

9 years ago[IMP] barcodes: documentation
Aaron Bohy [Fri, 14 Nov 2014 13:54:03 +0000 (14:54 +0100)]
[IMP] barcodes: documentation

9 years ago[IMP] barcodes: documentation
Aaron Bohy [Fri, 14 Nov 2014 13:27:53 +0000 (14:27 +0100)]
[IMP] barcodes: documentation

9 years ago[FIX] barcodes: manifest updated
Aaron Bohy [Fri, 14 Nov 2014 12:33:38 +0000 (13:33 +0100)]
[FIX] barcodes: manifest updated

9 years ago[FIX] barcodes, stock, point_of_sale: parse_barcode function uses regex, pattern...
Aaron Bohy [Fri, 14 Nov 2014 11:39:31 +0000 (12:39 +0100)]
[FIX] barcodes, stock, point_of_sale: parse_barcode function uses regex, pattern and barcodes may now contain special characters \ { and ., special character * replaced by .

9 years ago[IMP] point_of_sale: set a pointy cursor on the username now that clicking on it...
Frederic van der Essen [Thu, 13 Nov 2014 17:11:07 +0000 (18:11 +0100)]
[IMP] point_of_sale: set a pointy cursor on the username now that clicking on it actually does something

9 years ago[IMP] point_of_sale: only load users belonging to a point of sale group
Frederic van der Essen [Thu, 13 Nov 2014 17:08:37 +0000 (18:08 +0100)]
[IMP] point_of_sale: only load users belonging to a point of sale group

Conflicts:
addons/point_of_sale/static/src/js/models.js

9 years ago[FIX] point_of_sale: missing comma in previous commit
Frederic van der Essen [Thu, 13 Nov 2014 16:54:51 +0000 (17:54 +0100)]
[FIX] point_of_sale: missing comma in previous commit

9 years ago[IMP] point_of_sale: ui constructs that allow access right management in the point...
Frederic van der Essen [Tue, 11 Nov 2014 13:57:12 +0000 (14:57 +0100)]
[IMP] point_of_sale: ui constructs that allow access right management in the point of sale

9 years ago[IMP] point_of_sale: load pos user roles
Frederic van der Essen [Mon, 10 Nov 2014 17:45:20 +0000 (18:45 +0100)]
[IMP] point_of_sale: load pos user roles

Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/static/src/js/models.js

9 years ago[IMP] point_of_sale: adding a security pin field on users, and checking it when chang...
Frederic van der Essen [Wed, 8 Oct 2014 03:42:53 +0000 (05:42 +0200)]
[IMP] point_of_sale: adding a security pin field on users, and checking it when changing the cashier with very basic GUI

Conflicts:
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/res_users.py
addons/point_of_sale/res_users_view.xml
addons/point_of_sale/static/src/js/models.js

9 years ago[IMP] point_of_sale: styling improvements for the password popup
Frederic van der Essen [Wed, 8 Oct 2014 00:09:52 +0000 (02:09 +0200)]
[IMP] point_of_sale: styling improvements for the password popup

9 years ago[IMP] point_of_sale: numpad & password popups
Frederic van der Essen [Tue, 7 Oct 2014 23:54:51 +0000 (01:54 +0200)]
[IMP] point_of_sale: numpad & password popups

Conflicts:
addons/point_of_sale/static/src/js/widgets.js

9 years ago[IMP] point_of_sale: style the popup input similarily to popup textarea
Frederic van der Essen [Tue, 7 Oct 2014 22:22:28 +0000 (00:22 +0200)]
[IMP] point_of_sale: style the popup input similarily to popup textarea

9 years ago[IMP] point_of_sale: ability to change the current cashier with the GUI
Frederic van der Essen [Tue, 7 Oct 2014 22:18:19 +0000 (00:18 +0200)]
[IMP] point_of_sale: ability to change the current cashier with the GUI

9 years ago[FIX] barcodes, stock, point_of_sale: no more doublons in type selection field in...
Aaron Bohy [Thu, 13 Nov 2014 16:59:05 +0000 (17:59 +0100)]
[FIX] barcodes, stock, point_of_sale: no more doublons in type selection field in barcode.rule

9 years ago[FIX] barcodes: prepend a zero to ean13 barcodes scanned before looking for a match
Aaron Bohy [Thu, 13 Nov 2014 16:22:56 +0000 (17:22 +0100)]
[FIX] barcodes: prepend a zero to ean13 barcodes scanned before looking for a match

9 years ago[FIX] barcodes: constraint on field pattern: checks if pattern is syntaxically correct
Aaron Bohy [Thu, 13 Nov 2014 13:13:59 +0000 (14:13 +0100)]
[FIX] barcodes: constraint on field pattern: checks if pattern is syntaxically correct

9 years ago[FIX] stock: _search_and_increment method of stock.picking refactored
Aaron Bohy [Thu, 13 Nov 2014 09:38:06 +0000 (10:38 +0100)]
[FIX] stock: _search_and_increment method of stock.picking refactored

9 years ago[FIX] stock: retrieval of the current stock.picking improved
Aaron Bohy [Thu, 13 Nov 2014 09:23:08 +0000 (10:23 +0100)]
[FIX] stock: retrieval of the current stock.picking improved

9 years ago[FIX] stock: move to scrap option removed
Aaron Bohy [Thu, 13 Nov 2014 09:09:40 +0000 (10:09 +0100)]
[FIX] stock: move to scrap option removed

9 years ago[FIX] barcodes,point_of_sale,stock,base: minor changes from code review
Aaron Bohy [Thu, 13 Nov 2014 08:50:25 +0000 (09:50 +0100)]
[FIX] barcodes,point_of_sale,stock,base: minor changes from code review

9 years ago[FIX] barcodes, point_of_sale: JS functions for parsing barcode moved to module barco...
Aaron Bohy [Wed, 12 Nov 2014 09:25:59 +0000 (10:25 +0100)]
[FIX] barcodes, point_of_sale: JS functions for parsing barcode moved to module barcodes, BarcodeParser

9 years ago[IMP] point_of_sale: add helper function to compute tax-specific subtotals, useful...
Frederic van der Essen [Mon, 10 Nov 2014 18:28:59 +0000 (19:28 +0100)]
[IMP] point_of_sale: add helper function to compute tax-specific subtotals, useful for receipt customization

9 years ago[FIX]: stock: weighted type of patterns added in stock
Aaron Bohy [Mon, 10 Nov 2014 11:30:17 +0000 (12:30 +0100)]
[FIX]: stock: weighted type of patterns added in stock

9 years ago[IMP] barcodes,point_of_sale : parse_code js function moved to barcodes module
Aaron Bohy [Mon, 10 Nov 2014 11:28:16 +0000 (12:28 +0100)]
[IMP] barcodes,point_of_sale : parse_code js function moved to barcodes module

9 years ago[IMP] point_of_sale: add a method for getting totals by product categories, used...
Frederic van der Essen [Fri, 7 Nov 2014 16:25:42 +0000 (17:25 +0100)]
[IMP] point_of_sale: add a method for getting totals by product categories, used for custom receipts

9 years ago[FIX] base(res_partner),point_of_sale,product,sale_stock,stock: uniformization of...
Aaron Bohy [Fri, 7 Nov 2014 14:57:24 +0000 (15:57 +0100)]
[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

9 years ago[IMP] pos_loyalty: a new type of reward: 'resale' allow the customer to sell back...
Frederic van der Essen [Fri, 7 Nov 2014 14:05:02 +0000 (15:05 +0100)]
[IMP] pos_loyalty: a new type of reward: 'resale' allow the customer to sell back their points to the shop

9 years ago[FIX] stock: loc_barcode field in locations replaced by barcode
Aaron Bohy [Fri, 7 Nov 2014 12:46:32 +0000 (13:46 +0100)]
[FIX] stock: loc_barcode field in locations replaced by barcode

Conflicts:
addons/stock/stock_view.xml

9 years ago[IMP] barcodes: alias only visible in rule form when alias type selected
Aaron Bohy [Fri, 7 Nov 2014 11:27:12 +0000 (12:27 +0100)]
[IMP] barcodes: alias only visible in rule form when alias type selected

9 years ago[IMP] barcodes, stock, point_of_sale: Barcode rule type alias added
Aaron Bohy [Fri, 7 Nov 2014 10:20:06 +0000 (11:20 +0100)]
[IMP] barcodes, stock, point_of_sale: Barcode rule type alias added

9 years ago[FIX] stock, point_of_sale: default patterns loaded
Aaron Bohy [Thu, 6 Nov 2014 13:57:33 +0000 (14:57 +0100)]
[FIX] stock, point_of_sale: default patterns loaded

9 years ago[FIX] pos_loyalty: using the tax included price to compute the points on the reward...
Frederic van der Essen [Thu, 6 Nov 2014 11:45:03 +0000 (12:45 +0100)]
[FIX] pos_loyalty: using the tax included price to compute the points on the reward products was confusing when it had taxes

9 years ago[FIX] stock, point_of_sale, barcodes: specific values in selection field Type of...
Aaron Bohy [Thu, 6 Nov 2014 11:21:25 +0000 (12:21 +0100)]
[FIX] stock, point_of_sale, barcodes: specific values in selection field Type of barcode.rule added when corresponding module installed

9 years ago[FIX] pos_barcodes module renamed in barcodes
Aaron Bohy [Thu, 6 Nov 2014 08:36:36 +0000 (09:36 +0100)]
[FIX] pos_barcodes module renamed in barcodes

9 years ago[REM] point_of_sale: variable onlynumbers removed in devices.js, BarcodeReader, funct...
Aaron Bohy [Wed, 5 Nov 2014 13:39:23 +0000 (14:39 +0100)]
[REM] point_of_sale: variable onlynumbers removed in devices.js, BarcodeReader, function connet

9 years ago[FIX] ean13 field in product.packaging replaced by Barcode (only in views) and check_...
Aaron Bohy [Wed, 5 Nov 2014 11:04:26 +0000 (12:04 +0100)]
[FIX] ean13 field in product.packaging replaced by Barcode (only in views) and check_ean_key constraint removed

9 years ago[IMP] barcode nomenclature used in WMS, also for lots, packages and locations
Aaron Bohy [Wed, 5 Nov 2014 10:42:13 +0000 (11:42 +0100)]
[IMP] barcode nomenclature used in WMS, also for lots, packages and locations

9 years ago[FIX] ean13 field in res.partner and res.users renamed in Barcode (only in views...
Aaron Bohy [Wed, 5 Nov 2014 09:03:26 +0000 (10:03 +0100)]
[FIX] ean13 field in res.partner and res.users renamed in Barcode (only in views) + no more check_ean done on these fields

9 years ago[FIX] Barcode nomenclature generalized to Code128 in PoS
Aaron Bohy [Wed, 5 Nov 2014 08:26:37 +0000 (09:26 +0100)]
[FIX] Barcode nomenclature generalized to Code128 in PoS

9 years ago[FIX] product field ean13 renamed in Barcode (only in views) + no more ean_check...
Aaron Bohy [Wed, 5 Nov 2014 08:24:32 +0000 (09:24 +0100)]
[FIX] product field ean13 renamed in Barcode (only in views) + no more ean_check on this field

9 years ago[IMP] stock picking front-end: when Todo is in ]0,1[, automatically set scanned to...
Aaron Bohy [Mon, 3 Nov 2014 11:35:23 +0000 (12:35 +0100)]
[IMP] stock picking front-end: when Todo is in ]0,1[, automatically set scanned to Todo when clicking on +

9 years ago[FIX] Deletion of lines in picking front-end when a product qty is already 0, and...
Aaron Bohy [Mon, 3 Nov 2014 09:15:29 +0000 (10:15 +0100)]
[FIX] Deletion of lines in picking front-end when a product qty is already 0, and minus is clicked

9 years agoAccess rights of Barcode Nomenclatures in PoS and WMS
Aaron Bohy [Fri, 31 Oct 2014 14:16:49 +0000 (15:16 +0100)]
Access rights of Barcode Nomenclatures in PoS and WMS

9 years ago[IMP] stock: use of barcodes nomenclatures to scan weighted products
Aaron Bohy [Fri, 31 Oct 2014 14:09:11 +0000 (15:09 +0100)]
[IMP] stock: use of barcodes nomenclatures to scan weighted products

9 years ago[IMP] pos_barcodes: pos_barcodes set as dependency of point_of_sale and stock (+...
Aaron Bohy [Thu, 30 Oct 2014 14:50:11 +0000 (15:50 +0100)]
[IMP] pos_barcodes: pos_barcodes set as dependency of point_of_sale and stock (+ already used in PoS)

Conflicts:
addons/stock/stock_view.xml

9 years ago[IMP] point_of_sale: do not need to warn for lost order since they are locally saved...
Frederic van der Essen [Wed, 5 Nov 2014 16:20:55 +0000 (17:20 +0100)]
[IMP] point_of_sale: do not need to warn for lost order since they are locally saved. + better feedback when closing

Conflicts:
addons/point_of_sale/static/src/js/widgets.js

9 years ago[IMP] point_of_sale: allow to force the display of prices tax included, even if the...
Frederic van der Essen [Wed, 5 Nov 2014 16:08:53 +0000 (17:08 +0100)]
[IMP] point_of_sale: allow to force the display of prices tax included, even if the taxes are not included.\nThis is useful when you want to work without taxes for sales.orders and still sell with TVA Included. There is one limitation tough: the prices in the product list show the price without taxes.

Conflicts:
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/xml/pos.xml

9 years ago[FIX] point_of_sale: the posbox status was in the wrong place
Frederic van der Essen [Tue, 4 Nov 2014 16:29:01 +0000 (17:29 +0100)]
[FIX] point_of_sale: the posbox status was in the wrong place

9 years ago[FIX] point_of_sale: paymentlines were not properly saved and restored
Frederic van der Essen [Tue, 4 Nov 2014 16:23:26 +0000 (17:23 +0100)]
[FIX] point_of_sale: paymentlines were not properly saved and restored

Conflicts:
addons/point_of_sale/static/src/js/models.js

9 years ago[IMP] pos_loyalty: add a loyalty resume at the end of the receipt
Frederic van der Essen [Tue, 4 Nov 2014 14:56:12 +0000 (15:56 +0100)]
[IMP] pos_loyalty: add a loyalty resume at the end of the receipt

9 years ago[IMP] point_of_sale, pos_*: unpaid orders are saved in localstorage and persist betwe...
Frederic van der Essen [Mon, 3 Nov 2014 17:27:51 +0000 (18:27 +0100)]
[IMP] point_of_sale, pos_*: unpaid orders are saved in localstorage and persist between reloads

Conflicts:
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/screens.js
addons/pos_restaurant/static/src/js/multiprint.js
addons/pos_restaurant/static/src/js/notes.js

Conflicts:
addons/point_of_sale/static/src/js/models.js
addons/point_of_sale/static/src/js/screens.js
addons/point_of_sale/static/src/xml/pos.xml

9 years ago[FIX] point_of_sale: bugfix
Frederic van der Essen [Wed, 29 Oct 2014 17:41:30 +0000 (18:41 +0100)]
[FIX] point_of_sale: bugfix

9 years ago[FIX] point_of_sale: missing variable declaration
Frederic van der Essen [Wed, 29 Oct 2014 17:32:50 +0000 (18:32 +0100)]
[FIX] point_of_sale: missing variable declaration

9 years ago[WIP] point_of_sale: working on model persistence, serializing / deserializing models
Frederic van der Essen [Wed, 29 Oct 2014 10:57:37 +0000 (11:57 +0100)]
[WIP] point_of_sale: working on model persistence, serializing / deserializing models

Conflicts:
addons/point_of_sale/static/src/js/models.js

9 years ago[IMP] pos_loyalty: allow rules by category
Frederic van der Essen [Mon, 20 Oct 2014 14:09:14 +0000 (16:09 +0200)]
[IMP] pos_loyalty: allow rules by category

9 years ago[IMP] pos_loyalty: renamed 'override' into a more understandable 'cumulative'
Frederic van der Essen [Fri, 17 Oct 2014 16:07:57 +0000 (18:07 +0200)]
[IMP] pos_loyalty: renamed 'override' into a more understandable 'cumulative'

9 years ago[FIX] pos_restaurant: the kitchen orders were not printing due to a missing value...
Frederic van der Essen [Fri, 17 Oct 2014 14:09:05 +0000 (16:09 +0200)]
[FIX] pos_restaurant: the kitchen orders were not printing due to a missing value + improved layout of notes in kitchen orders

Conflicts:
addons/pos_restaurant/static/src/xml/multiprint.xml

9 years ago[FIX] pos_restaurant: QWEB receipt header / footers are now working for bills. Use...
Frederic van der Essen [Fri, 17 Oct 2014 13:36:40 +0000 (15:36 +0200)]
[FIX] pos_restaurant: QWEB receipt header / footers are now working for bills. Use receipt.bill in the templates for custom behaviour in bills

9 years ago[IMP] pos_loyalty: security access rules for the advanced barcode module
Frederic van der Essen [Tue, 14 Oct 2014 16:22:26 +0000 (18:22 +0200)]
[IMP] pos_loyalty: security access rules for the advanced barcode module

9 years ago[IMP] pos_barcodes: security access rules for the advanced barcode module
Frederic van der Essen [Tue, 14 Oct 2014 16:21:54 +0000 (18:21 +0200)]
[IMP] pos_barcodes: security access rules for the advanced barcode module

9 years ago[IMP] pos_restaurant: security access rules for the new models
Frederic van der Essen [Tue, 14 Oct 2014 16:20:15 +0000 (18:20 +0200)]
[IMP] pos_restaurant: security access rules for the new models

9 years ago[FIX] point_of_sale: remove debugger instruction
Frederic van der Essen [Tue, 14 Oct 2014 13:48:16 +0000 (15:48 +0200)]
[FIX] point_of_sale: remove debugger instruction

9 years ago[FIX] point_of_sale: browser printing was missing access to the processed header...
Frederic van der Essen [Mon, 13 Oct 2014 13:41:06 +0000 (15:41 +0200)]
[FIX] point_of_sale: browser printing was missing access to the processed header & footers