pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,258 Commits 1 Branch 0 Tags
574a17d8a2a126e34f7a3769e596d8bcc2cab112
Commit Graph
92258 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic van der Essen 574a17d8a2 [FIX] point_of_sale: paymentlines were not properly saved and restored 
Conflicts:
	addons/point_of_sale/static/src/js/models.js
 2014-11-26 11:40:22 +01:00
Frederic van der Essen ba380c807e [IMP] pos_loyalty: add a loyalty resume at the end of the receipt 2014-11-26 11:40:22 +01:00
Frederic van der Essen 44253541e5 [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
 2014-11-26 11:40:17 +01:00
Frederic van der Essen bdca47e381 [FIX] point_of_sale: bugfix 2014-11-26 11:27:05 +01:00
Frederic van der Essen 4af818c2e8 [FIX] point_of_sale: missing variable declaration 2014-11-26 11:27:04 +01:00
Frederic van der Essen 0677913f77 [WIP] point_of_sale: working on model persistence, serializing / deserializing models 
Conflicts:
	addons/point_of_sale/static/src/js/models.js
 2014-11-26 11:27:04 +01:00
Frederic van der Essen 1e0fe5a6ab [IMP] pos_loyalty: allow rules by category 2014-11-26 11:27:03 +01:00
Frederic van der Essen 6283c67e3d [IMP] pos_loyalty: renamed 'override' into a more understandable 'cumulative' 2014-11-26 11:27:03 +01:00
Frederic van der Essen ea47aa48c1 [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
 2014-11-26 11:27:02 +01:00
Frederic van der Essen 8c11594497 [FIX] pos_restaurant: QWEB receipt header / footers are now working for bills. Use receipt.bill in the templates for custom behaviour in bills 2014-11-26 11:27:02 +01:00
Frederic van der Essen a8154a5fe9 [IMP] pos_loyalty: security access rules for the advanced barcode module 2014-11-26 11:27:01 +01:00
Frederic van der Essen 8ca81782c3 [IMP] pos_barcodes: security access rules for the advanced barcode module 2014-11-26 11:27:01 +01:00
Frederic van der Essen e3b1239907 [IMP] pos_restaurant: security access rules for the new models 2014-11-26 11:27:00 +01:00
Frederic van der Essen b55860d1c0 [FIX] point_of_sale: remove debugger instruction 2014-11-26 11:27:00 +01:00
Frederic van der Essen ad50102d46 [FIX] point_of_sale: browser printing was missing access to the processed header & footers 2014-11-26 11:26:59 +01:00
Frederic van der Essen e0e9f59f7f [FIX] pos_restaurant: disable barcodes in the floor map 2014-11-26 11:26:59 +01:00
Frederic van der Essen 1ccd4b1bce [FIX] point_of_sale: previous commit broke web printed receipts ... 2014-11-26 11:26:58 +01:00
Frederic van der Essen f8778e5a4f [IMP] point_of_sale: QWeb receipt extensions. If You put <!DOCTYPE QWEB> as the first line of a receipt header or footer, it will be rendered by qweb 2014-11-26 11:26:58 +01:00
Frederic van der Essen ecb2e08648 [FIX] point_of_sale: the numpad did not show the selected status 2014-11-26 11:26:57 +01:00
Frederic van der Essen 09c1644165 [IMP] pos_restaurant: include the table name in the order selector 2014-11-26 11:26:57 +01:00
Frederic van der Essen db6b4b4f52 [IMP] pos_restaurant: some polish on the floor map's css 2014-11-26 11:26:56 +01:00
Frederic van der Essen ad6110d49d [IMP] point_of_sale: replace the rss by a more appropriate wifi icon to indicate the connection status 2014-11-26 11:26:56 +01:00
Frederic van der Essen 78beceed62 [IMP] point_of_sale: remove 'Unknown Customer' that everybody dislikes from the order tab 2014-11-26 11:26:55 +01:00
Frederic van der Essen a86a3eeb34 [FIX] point_of_sale: fix variable declaration for use strict 2014-11-26 11:26:55 +01:00
Frederic van der Essen 9d8108333a [IMP] point_of_sale: adding two often requested options: 1) precompute and prefill the cash payments, 2) allow to prevent the automatic printing of receipts (web based printing only for now, some work is needed to unify the two printing modes) 
Conflicts:
	addons/point_of_sale/static/src/js/models.js
	addons/point_of_sale/static/src/js/screens.js

Conflicts:
	addons/point_of_sale/point_of_sale.py
 2014-11-26 11:26:48 +01:00
Frederic van der Essen 2398692397 [IMP] pos_restaurant: prevent tables from being shown outside the floor plan 2014-11-25 19:16:30 +01:00
Frederic van der Essen 3d5eeb5da4 [IMP] point_of_sale: new textarea popup 2014-11-25 19:16:30 +01:00
Frederic van der Essen 07c07b2a34 [IMP] pos_restaurant: add table / floor info to kitchen receipts 2014-11-25 19:16:29 +01:00
Frederic van der Essen d44080bd02 [IMP] point_of_sale: use strict 2014-11-25 19:16:29 +01:00
Frederic van der Essen 26438d6adc [FIX] point_of_sale: fix crash when going back from payment screen 2014-11-25 19:16:28 +01:00
Frederic van der Essen 01ccabf58b [FIX] pos_barcodes: do not crash the point of sale when there's no barcode nomenclature 2014-11-25 19:16:28 +01:00
Frederic van der Essen 3f28b34b87 [IMP] pos_restaurant: use /web controller instead of /website to load the background image, so as to not depend on the website module 2014-11-25 19:16:27 +01:00
Frederic van der Essen c90f52391a [IMP] pos_barcodes: better rule form layout 2014-11-25 19:16:27 +01:00
Frederic van der Essen 16e04108a1 [IMP] pos_barcodes: order the rules by priority 2014-11-25 19:16:27 +01:00
Frederic van der Essen acffd62e3d [IMP] pos_barcodes: fix some wrongly named variables, fix missing barcode nomenclature field in pos config, 'unit' type renamed to 'product' to fit with the existing keywords 2014-11-25 19:16:26 +01:00
Frederic van der Essen e92963fb78 [WIP] pos_barcodes: initial commit of the barcode nomenclature addon for the point of sale 2014-11-25 19:16:26 +01:00
Frederic van der Essen a9abfb5356 [IMP] pos_loyalty: always show the reward before assignation, unless there is only one configured reward 2014-11-25 19:16:25 +01:00
Frederic van der Essen f48f4c68dc [FIX] pos_loyalty: missing code from pos_loyalty MERGE 2014-11-25 19:16:25 +01:00
Frederic van der Essen ee28165972 [MERGE] point_of_sale, pos_loyalty: merging the pos_loyalty module 
Conflicts:
	addons/point_of_sale/static/src/js/widgets.js
 2014-11-25 19:16:22 +01:00
Frederic van der Essen f2fdaa017c [FIX] point_of_sale: back on payment screen must always go to product list or you can get stuck 2014-11-25 19:14:42 +01:00
Frederic van der Essen 604630abb5 [IMP] pos_restaurant: responsive restaurant floor plan & hide floor selector when there is only one floor available 2014-11-25 19:14:42 +01:00
Frederic van der Essen 1b77ed2603 [IMP] point_of_sale: allow to change the customer from the payment screen 2014-11-25 19:14:41 +01:00
Frederic van der Essen 96e4fe2b22 [IMP] pos_restaurant: table notifications when there are unsent kitchen orders 2014-11-25 19:14:41 +01:00
Frederic van der Essen e2125f148d [FIX] pos_restaurant: correctly set the floor on new tables 2014-11-25 19:14:40 +01:00
Frederic van der Essen 02471200f6 [IMP] point_of_sale: improve the layout of control buttons with flexboxes 2014-11-25 19:14:40 +01:00
Frederic van der Essen b487e8da61 [FIX] point_of_sale: avoid auto reprinting receipt when switching between orders 
Conflicts:
	addons/point_of_sale/static/src/js/screens.js
 2014-11-25 19:14:39 +01:00
Frederic van der Essen f662d1058b [IMP] pos_restaurant: adapt the splitbill UI to the new payment screen 2014-11-25 19:14:39 +01:00
Frederic van der Essen b2b471f461 [FIX] pos_restaurant: display product name in bill spliting 2014-11-25 19:14:38 +01:00
Frederic van der Essen 44307816fb [BACKPORT] point_of_sale: backporting the payment screen 
Conflicts:
	addons/point_of_sale/static/src/css/pos.css
	addons/point_of_sale/static/src/js/screens.js
	addons/point_of_sale/static/src/js/widget_base.js

Conflicts:
	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
 2014-11-25 19:14:31 +01:00
Frederic van der Essen 6d0a4a9211 [IMP] pos_restaurant: allow deactivation of the floor plan while the module is installed. 2014-11-25 18:21:44 +01:00