andreubisquerra
|
b89b6d7679
|
Name fix
|
2020-05-08 18:51:49 +02:00 |
|
andreubisquerra
|
f8ad954854
|
Fix URLs
|
2020-05-08 18:04:38 +02:00 |
|
andreubisquerra
|
1674048c81
|
Fix travis
|
2020-05-08 17:56:42 +02:00 |
|
jove@bisquerra.com
|
b93a3ceb29
|
TakePOS Auto Order improvements
|
2020-05-08 17:25:48 +02:00 |
|
Laurent Destailleur
|
a649dcecf7
|
Look and field
|
2020-05-08 03:01:51 +02:00 |
|
Laurent Destailleur
|
830a117aa7
|
Suggest fix for #13824
|
2020-05-07 23:39:03 +02:00 |
|
Laurent Destailleur
|
f4a9490e7f
|
Fix a page with NOLOGIN const set to 1 must be into "public" dir.
|
2020-05-04 16:55:53 +02:00 |
|
andreubisquerra
|
8530db6dab
|
Fix travis
|
2020-05-03 00:09:17 +02:00 |
|
andreubisquerra
|
32923daa9d
|
Fix travis
|
2020-05-03 00:07:52 +02:00 |
|
andreubisquerra
|
ac75cf318e
|
Fix travis
|
2020-05-03 00:07:04 +02:00 |
|
andreubisquerra
|
35713ef004
|
Fix travis
|
2020-05-03 00:05:59 +02:00 |
|
jove@bisquerra.com
|
81c808692e
|
NEW Bar Restaurant tab and Auto order
|
2020-05-02 22:00:04 +02:00 |
|
andreubisquerra
|
281a97404a
|
Fix travis
|
2020-04-30 01:27:55 +02:00 |
|
jove@bisquerra.com
|
4dbd16077e
|
Finish send receipt by email from TakePOS
|
2020-04-30 01:10:12 +02:00 |
|
Laurent Destailleur
|
b20d85b198
|
Fix phpcs
|
2020-04-26 23:06:52 +02:00 |
|
Laurent Destailleur
|
c7fab6a83e
|
Fix no tooltip of not predefined products
|
2020-04-20 13:26:06 +02:00 |
|
Laurent Destailleur
|
b92c03cdf6
|
Fix Look and feel v12
|
2020-04-20 13:20:09 +02:00 |
|
Scrutinizer Auto-Fixer
|
387ea73bf3
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-13 11:24:42 +00:00 |
|
Laurent Destailleur
|
d47c566c4d
|
Fix class not found
|
2020-04-12 18:15:38 +02:00 |
|
Laurent Destailleur
|
27782a244c
|
Merge pull request #13565 from andreubisquerra/develop
4 rows of actions buttons in TakePOS
|
2020-04-12 17:02:28 +02:00 |
|
Laurent Destailleur
|
78b455e42a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-04-12 17:01:53 +02:00 |
|
Laurent Destailleur
|
422e33a68b
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/ihm.php
htdocs/comm/action/class/actioncomm.class.php
htdocs/compta/stats/cabyprodserv.php
htdocs/filefunc.inc.php
htdocs/takepos/invoice.php
|
2020-04-12 17:01:44 +02:00 |
|
andreubisquerra
|
323a62f1e7
|
travis fix
|
2020-04-11 22:38:59 +02:00 |
|
andreubisquerra
|
5dc3b8dfd5
|
Travis fix
|
2020-04-11 22:36:46 +02:00 |
|
jove@bisquerra.com
|
78b43ddb1f
|
TakePOS connector update
|
2020-04-11 22:19:36 +02:00 |
|
andreubisquerra
|
9270e2c614
|
4 rows of actions buttons in TakePOS
|
2020-04-11 16:31:08 +02:00 |
|
jove@bisquerra.com
|
66659f0693
|
Two diferents order printers
|
2020-04-10 19:18:42 +02:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
andreubisquerra
|
4ac978303b
|
FIX TakePOS buying price
|
2020-04-10 08:36:16 +02:00 |
|
Laurent Destailleur
|
09f1536c27
|
Merge pull request #13537 from andreubisquerra/master
Add langs and print only no printed order lines
|
2020-04-09 19:38:30 +02:00 |
|
andreubisquerra
|
e43e9a0daa
|
FIX TakePOS buying price
|
2020-04-09 14:56:50 +02:00 |
|
andreubisquerra
|
7d11a36beb
|
FIX TakePOS buying price
|
2020-04-09 14:42:42 +02:00 |
|
jove@bisquerra.com
|
ea79c91482
|
Add langs and print only no printed order lines
|
2020-04-08 20:02:54 +02:00 |
|
Laurent Destailleur
|
b8a657ec0f
|
Merge pull request #13509 from andreubisquerra/develop
Order printer with 'Receipt printers' module
|
2020-04-08 14:51:23 +02:00 |
|
Frédéric FRANCE
|
fc34b5a4cb
|
compress png with zopflipng
|
2020-04-06 19:03:48 +02:00 |
|
andreubisquerra
|
aec1c177e3
|
Order printer with 'Receipt printers' module
|
2020-04-06 16:07:05 +02:00 |
|
andreubisquerra
|
27eec2e5db
|
Travis fix
|
2020-04-02 23:28:25 +02:00 |
|
andreubisquerra
|
3255c18567
|
Receipt compatibility with receipt printer module
|
2020-04-02 22:11:16 +02:00 |
|
jove@bisquerra.com
|
d9614ac6fc
|
Integrate Cash Control in TakePOS
|
2020-03-30 20:05:45 +02:00 |
|
andreubisquerra
|
0db7c2bf21
|
TakePOS CSS fix in action buttons
|
2020-03-27 23:19:56 +01:00 |
|
andreubisquerra
|
58a10c9c16
|
Unnecessary line
|
2020-03-23 23:10:55 +01:00 |
|
andreubisquerra
|
585c46b181
|
Avoid print customer name when is default
|
2020-03-23 22:58:04 +01:00 |
|
andreubisquerra
|
53850caa87
|
No reload page to load other sale in TakePOS
|
2020-03-23 22:44:26 +01:00 |
|
Laurent Destailleur
|
b9088c1ce3
|
css
|
2020-03-23 17:39:35 +01:00 |
|
Laurent Destailleur
|
0905b3a6b2
|
Fix function not found
|
2020-03-23 15:46:16 +01:00 |
|
Laurent Destailleur
|
aab3ca4fa1
|
Merge pull request #13402 from andreubisquerra/develop
Fix TakePOS DirectPayment when place is higher 0
|
2020-03-23 15:12:38 +01:00 |
|
Laurent Destailleur
|
d662bb97dc
|
Debug parallel sale feature
|
2020-03-23 15:02:15 +01:00 |
|
Laurent Destailleur
|
d965aad6e6
|
Some fix to support correctly parallel sales
|
2020-03-23 14:31:59 +01:00 |
|
Laurent Destailleur
|
2177afecd9
|
Sort order
|
2020-03-23 14:12:48 +01:00 |
|
andreubisquerra
|
fbe6711353
|
Fix TakePOS DirectPayment when place is higher 0
|
2020-03-22 22:46:40 +01:00 |
|
andreubisquerra
|
618da0a808
|
Fix TakePOS DirectPayment when place is higher 0
|
2020-03-22 22:39:41 +01:00 |
|
Laurent Destailleur
|
4b3d2bfb64
|
Merge pull request #13398 from andreubisquerra/master
NEW: Multiple sales in TakePOS
|
2020-03-22 20:19:40 +01:00 |
|
Laurent Destailleur
|
1cb598290a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-22 20:17:10 +01:00 |
|
Laurent Destailleur
|
1fdef022f0
|
css
|
2020-03-22 20:16:14 +01:00 |
|
andreubisquerra
|
40e5e7a46b
|
Travis fixes
|
2020-03-22 15:24:32 +01:00 |
|
jove@bisquerra.com
|
a2b973f9f7
|
NEW: Multiple sales in TakePOS
|
2020-03-22 14:50:09 +01:00 |
|
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 |
|