Commit Graph

444 Commits

Author SHA1 Message Date
andreubisquerra
4b7de1e5f5 Remove vars to avoid conficts in TakePOS setup 2020-03-21 15:48:25 +01:00
Laurent Destailleur
5f0f376817 Merge pull request #13334 from OPEN-DSI/new-takepos-group-same-product
NEW add a parameter to group same product
2020-03-20 10:45:06 +01:00
Laurent Destailleur
9f65c4a7db Merge pull request #13369 from OPEN-DSI/new-takepos-freezone-vat-rate
NEW add VAT rates on free zone in cash desk
2020-03-18 19:37:04 +01:00
Laurent Destailleur
a141f46e91 Merge pull request #13354 from OPEN-DSI/new-takepos-reduction-global-labels
NEW labels on reduction buttons in cash desk
2020-03-18 19:28:08 +01:00
VESSILLER
0e171e81e6 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-freezone-vat-rate 2020-03-17 09:57:21 +01:00
VESSILLER
a74dca4a20 FIX resolve conflicts 2020-03-17 09:52:26 +01:00
VESSILLER
f7cf5f8784 NEW add VAT rates in free zone for product/service in cash desk 2020-03-17 09:44:59 +01:00
Laurent Destailleur
73f2e9e5de WIP migrate num_paiement into num_payment
Fix label for free product in takepos
2020-03-16 19:23:18 +01:00
Laurent Destailleur
01724894ad Fix useless BR 2020-03-16 18:33:06 +01:00
Laurent Destailleur
ffc861d4e2 FIX Autoadd product when barcode match
Show barcode value in tooltips
2020-03-16 18:04:22 +01:00
Laurent Destailleur
1212a63365 css 2020-03-16 15:53:00 +01:00
Laurent Destailleur
4b1dd27c5f Move takepos.php file into index.php to match other dir structure 2020-03-16 15:41:21 +01:00
Laurent Destailleur
41ae8f6f68 TakePOS: Move all information of customer in the header 2020-03-16 13:27:10 +01:00
VESSILLER
5a4bd28417 NEW labels on reduction buttons in cash desk 2020-03-16 11:56:47 +01:00
VESSILLER
350408d2ac Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-16 11:10:41 +01:00
VESSILLER
1268bab958 Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-group-same-product 2020-03-13 17:27:04 +01:00
VESSILLER
04c0332bee FIX travis errors 2020-03-12 18:31:43 +01:00
VESSILLER
70ebc61c1f Module TakePos - NEW add numbering module for cash desk 2020-03-12 17:43:59 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-12 11:45:44 +00:00
VESSILLER
e7056a9ade NEW add a parameter to group same product 2020-03-12 11:00:17 +01:00
Laurent Destailleur
fb8e565b53 Better position on screen 2020-03-12 00:13:42 +01:00
Laurent Destailleur
af227ae164 Add picto on selection of terminal button 2020-03-11 23:57:36 +01:00
Laurent Destailleur
54da1e73ff Option to show the n first line of desc into the basket 2020-03-11 23:56:48 +01:00
Laurent Destailleur
efeda2e747 Fix add global check on perm 2020-03-11 20:14:33 +01:00
Laurent Destailleur
7b93b39bb8 Merge pull request #13310 from OPEN-DSI/new-takepos-ticket-paid
NEW no confirm discard ticket if paid
2020-03-11 20:08:40 +01:00
Laurent Destailleur
c3b51b177e Merge pull request #13327 from OPEN-DSI/new-takepos-auto-print-ticket-paid
NEW only auto print paid ticket in cash desk
2020-03-11 20:07:50 +01:00
VESSILLER
5d740d16fb NEW set payment method on paid ticket in cash desk 2020-03-11 17:42:30 +01:00
VESSILLER
e4c97f0b15 FIX user permission on ajax request getInvoice 2020-03-11 17:16:44 +01:00
Laurent Destailleur
4088553d61 Merge pull request #13321 from OPEN-DSI/new-takepos-product-sorted-by-label
NEW add a parameter to sort product by label in cash desk
2020-03-11 17:07:30 +01:00
Laurent Destailleur
40973cfca9 Merge pull request #13320 from OPEN-DSI/new-takepos-search-on-keycode
New takepos search on keycode
2020-03-11 17:07:03 +01:00
Laurent Destailleur
8609bf9c9c Merge pull request #13318 from OPEN-DSI/new-takepos-payment-buttons
NEW add icon on payment buttons in cash desk
2020-03-11 17:06:04 +01:00
Laurent Destailleur
57440cc0dd Merge pull request #13311 from OPEN-DSI/new-takepos-categories-sorted
NEW categories and subcategories sorted by label in TakePOS
2020-03-11 17:05:40 +01:00
VESSILLER
e95e182419 NEW only auto print paid ticket in cash desk 2020-03-11 16:53:27 +01:00
Laurent Destailleur
a25cf8448d Merge pull request #13306 from andreubisquerra/develop
Black head bar with Colorfull TakePOS theme
2020-03-11 16:48:05 +01:00
Laurent Destailleur
27e32fc353 Merge pull request #13305 from andreubisquerra/master
Move customer name to TakePOS headbar
2020-03-11 16:42:32 +01:00
VESSILLER
fc4a98b29c NEW add const TAKEPOS_NUMPAD_USE_PAYMENT_ICON to use icons on payment buttons 2020-03-11 15:36:36 +01:00
VESSILLER
898007f0b4 NEW add global reduction in cash desk 2020-03-11 12:30:07 +01:00
VESSILLER
e4608a1ee5 FIX add only one product if no key code defined 2020-03-11 09:15:52 +01:00
VESSILLER
8f768c6eca NEW add a parameter to sort product by label in cash desk 2020-03-10 14:33:58 +01:00
VESSILLER
31e59bbe87 NEW add product if only one found 2020-03-10 14:18:39 +01:00
VESSILLER
cef2685368 NEW search on key code "enter" if defined in cash desk 2020-03-10 14:08:28 +01:00
VESSILLER
e2a918b9d2 FIX blank failure 2020-03-10 11:33:39 +01:00
VESSILLER
c707cef022 NEW add icon on payment buttons in cash desk 2020-03-10 11:20:15 +01:00
VESSILLER
07eda6a2c3 NEW categories and subcategories sorted by label (takepos) 2020-03-09 17:56:09 +01:00
VESSILLER
99d5b175c6 NEW no confirm discard ticket if paid 2020-03-09 17:40:32 +01:00
andreubisquerra
4d3e91fbc3 Black head bar with Colorfull TakePOS theme 2020-03-08 23:10:49 +01:00
andreubisquerra
5b7183efdd Empty by default 2020-03-08 22:40:22 +01:00
jove@bisquerra.com
e71d312acd Customer name on TakePOS headbar 2020-03-08 22:33:56 +01:00
Laurent Destailleur
068f435146 Merge pull request #13302 from andreubisquerra/develop
Avoid higher payments than remain in TakePOS
2020-03-08 18:19:53 +01:00
andreubisquerra
2af9904c04 Avoid higher payments than remain in TakePOS 2020-03-07 22:56:43 +01:00