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 |
|
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 |
|
jove@bisquerra.com
|
73f7c8958b
|
Remove unused variables in TakePOS
|
2020-03-07 22:07:20 +01:00 |
|
Laurent Destailleur
|
799e795871
|
Merge pull request #13242 from javierybar/develop
NEW TakePOS numbering
|
2020-03-02 23:27:26 +01:00 |
|
javierybar
|
8776880a12
|
Update terminal.php
|
2020-03-02 22:51:06 +01:00 |
|
javierybar
|
4aced13dbf
|
Update terminal.php
|
2020-03-02 22:47:12 +01:00 |
|
javierybar
|
9d869587cc
|
Update setup.php
|
2020-03-02 22:39:56 +01:00 |
|
andreubisquerra
|
ba543896d4
|
Fix Terminal popup in new head barTakePOS
|
2020-03-01 21:19:48 +01:00 |
|
javierybar
|
a4b01e3025
|
Update invoice.php
|
2020-03-01 19:47:27 +01:00 |
|
javierybar
|
9fabc7de81
|
Update setup.php
|
2020-03-01 19:46:53 +01:00 |
|
javierybar
|
c9b6c89861
|
Update terminal.php
|
2020-03-01 19:46:21 +01:00 |
|
Laurent Destailleur
|
1bc18931f8
|
Fix phpcs
|
2020-02-27 18:13:26 +01:00 |
|
Laurent Destailleur
|
2cfc62d753
|
Update invoice.php
|
2020-02-27 00:11:13 +01:00 |
|
javierybar
|
3fa55a59b7
|
New TAKEPOS_NUMBERING_PREFIX const
|
2020-02-26 22:45:32 +01:00 |
|
Laurent Destailleur
|
0fbde14b33
|
Clean syntax of code
|
2020-02-25 12:58:15 +01:00 |
|
Laurent Destailleur
|
16b3e6f7bb
|
Move external access on dedicated tab
Translate field to sort products
|
2020-02-25 12:44:18 +01:00 |
|
Laurent Destailleur
|
ace5f2844a
|
Make Setup of TakePOS faster with Ajax ON-Off Button.
|
2020-02-25 12:37:44 +01:00 |
|
VESSILLER
|
9cec0a254b
|
Merge branch 'develop' of github.com:OPEN-DSI/dolibarr into new-takepos-add-product-on-key-enter
|
2020-02-25 08:37:28 +01:00 |
|
Laurent Destailleur
|
4fc3158962
|
Clean code
|
2020-02-24 20:20:09 +01:00 |
|
Laurent Destailleur
|
dfe6861241
|
Responsive
|
2020-02-24 19:42:21 +01:00 |
|
Laurent Destailleur
|
2e377112b5
|
Enhanc top bar of TakePOS (more similar than backoffice)
|
2020-02-24 19:24:38 +01:00 |
|
VESSILLER
|
73da62d842
|
NEW Add product on key "Enter" in search bar
|
2020-02-24 13:57:36 +01:00 |
|
Laurent Destailleur
|
f931b92d36
|
Merge branch 'new-takepos-batch-decrement' of
https://github.com/OPEN-DSI/dolibarr into develop
# Conflicts:
# htdocs/langs/en_US/errors.lang
|
2020-02-23 22:49:03 +01:00 |
|
javierybar
|
fddcc844ff
|
Add orders to Receipt Printers module
|
2020-02-22 11:30:48 +01:00 |
|
Laurent Destailleur
|
e4b00c5c20
|
Merge branch 'develop' into master
|
2020-02-21 18:20:10 +01:00 |
|
Scrutinizer Auto-Fixer
|
e44865d8b5
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-02-21 16:53:37 +00:00 |
|
VESSILLER
|
71c9b94b22
|
NEW add const CASHDESK_FORCE_DECREASE_STOCK to force batch decrementation
|
2020-02-21 11:08:34 +01:00 |
|
andreubisquerra
|
7200472427
|
Travis fix
|
2020-02-20 15:45:42 +01:00 |
|
javierybar
|
2942e85e47
|
More elegant and easy to understand printer setup
|
2020-02-20 15:16:17 +01:00 |
|
David Beniamine
|
1cd566f1ae
|
Merge tag 'develop' of https://github.com/Dolibarr/dolibarr into takepos-sort-product
|
2020-02-18 11:09:45 +01:00 |
|
Scrutinizer Auto-Fixer
|
5fda829023
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-01-30 00:48:28 +00:00 |
|
Laurent Destailleur
|
2ce3ea8234
|
Merge pull request #12953 from andreubisquerra/develop
Wait search finished before add product with enter
|
2020-01-29 11:05:26 +01:00 |
|
andreubisquerra
|
13ee716b78
|
Min. sell price updatereduction
|
2020-01-28 22:21:19 +01:00 |
|
andreubisquerra
|
691514be24
|
Min. sell price updateprice
|
2020-01-28 22:18:23 +01:00 |
|
andreubisquerra
|
0beb78a978
|
Min. sell price when updateprice
|
2020-01-28 22:14:13 +01:00 |
|
andreubisquerra
|
63af8594ab
|
Wait search finished before add product with enter
|
2020-01-28 21:22:25 +01:00 |
|
Laurent Destailleur
|
80707d6a5e
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-28 17:24:26 +01:00 |
|
Laurent Destailleur
|
89e9b9391b
|
Fix responsive
|
2020-01-27 02:26:07 +01:00 |
|
Laurent Destailleur
|
0271a43e80
|
Merge branch 'develop' into master
|
2020-01-27 02:17:14 +01:00 |
|
Laurent Destailleur
|
2d77765613
|
css
|
2020-01-27 02:11:37 +01:00 |
|
Laurent Destailleur
|
d4223c3d82
|
TakePOS can use the same CSS properties than app
|
2020-01-27 02:06:34 +01:00 |
|
Laurent Destailleur
|
42db2a33eb
|
Fix phpcs
|
2020-01-27 01:52:35 +01:00 |
|
Laurent Destailleur
|
37f5922bf8
|
Fix conflict
|
2020-01-27 01:38:50 +01:00 |
|
andreubisquerra
|
a8656fe612
|
Travis fix
|
2020-01-27 01:36:31 +01:00 |
|
Laurent Destailleur
|
539348bbbb
|
Responsive TakePOS with Bar.
|
2020-01-27 01:31:39 +01:00 |
|
Laurent Destailleur
|
08841d4475
|
Update receipt.php
|
2020-01-26 22:14:31 +01:00 |
|
Laurent Destailleur
|
eff9fae261
|
Update receipt.php
|
2020-01-26 22:14:27 +01:00 |
|
javierybar
|
cb0986db8b
|
TakePOS price rounding
|
2020-01-26 22:14:11 +01:00 |
|
Laurent Destailleur
|
ce981e558c
|
Merge pull request #12921 from javierybar/develop
TakePOS price rounding in receipt
|
2020-01-26 22:13:42 +01:00 |
|
Laurent Destailleur
|
9a1051116e
|
Update receipt.php
|
2020-01-26 22:12:52 +01:00 |
|
Laurent Destailleur
|
3e8d2407c8
|
Update receipt.php
|
2020-01-26 22:12:26 +01:00 |
|
Laurent Destailleur
|
0f2141269a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-01-25 14:43:57 +01:00 |
|
Laurent Destailleur
|
f2771b3365
|
FIX #12896
|
2020-01-25 14:23:23 +01:00 |
|
javierybar
|
c46f255408
|
TakePOS price rounding
|
2020-01-24 09:22:46 +01:00 |
|
Laurent Destailleur
|
e679e05f57
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-19 19:49:04 +01:00 |
|
andreubisquerra
|
98789c908e
|
Colorful theme for TakePOS
|
2020-01-19 19:16:45 +01:00 |
|
andreubisquerra
|
83d1b673bb
|
Visible receipt printer settings without stock module in TakePOS
|
2020-01-18 20:22:54 +01:00 |
|
andreubisquerra
|
3c1d789482
|
Visible receipt printer settings without stock module in TakePOS
|
2020-01-16 08:25:36 +01:00 |
|
Laurent Destailleur
|
97f62c68f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-01-08 13:38:03 +01:00 |
|
Laurent Destailleur
|
e3c56cea5f
|
Fix missing lang
|
2020-01-07 14:19:41 +01:00 |
|
Laurent Destailleur
|
d5ad0180a0
|
Merge pull request #12786 from andreubisquerra/master
TakePOS press 'ENTER' event
|
2020-01-03 20:41:41 +01:00 |
|
Laurent Destailleur
|
afd32135f2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/invoice.php
|
2020-01-01 22:37:13 +01:00 |
|
Laurent Destailleur
|
2e8fd25299
|
FIX Local taxes was not correctly supported in TakePOS.
|
2020-01-01 21:54:47 +01:00 |
|
andreubisquerra
|
e005416189
|
If press enter add automatically the product. Widely used with barcodes.
|
2020-01-01 21:19:23 +01:00 |
|
Laurent Destailleur
|
fc49825eaa
|
Merge pull request #12659 from andreubisquerra/master
NEW: Takepos supplements
|
2019-12-30 22:07:19 +01:00 |
|
Laurent Destailleur
|
dd9f25b13a
|
CSS
|
2019-12-22 16:33:15 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
David Beniamine
|
305a821b62
|
TakePOS : setting to choose product field for sort
|
2019-12-16 17:33:45 +01:00 |
|
Laurent Destailleur
|
838633d0de
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/api/class/api_setup.class.php
htdocs/compta/facture/card.php
htdocs/compta/stats/index.php
htdocs/core/actions_massactions.inc.php
htdocs/install/upgrade2.php
htdocs/loan/card.php
htdocs/loan/document.php
htdocs/loan/info.php
htdocs/loan/note.php
htdocs/loan/schedule.php
htdocs/product/list.php
htdocs/ticket/card.php
htdocs/user/class/user.class.php
|
2019-12-14 14:53:49 +01:00 |
|
Frédéric FRANCE
|
12f84d8254
|
doxygen
|
2019-12-11 23:04:27 +01:00 |
|
andreubisquerra
|
acbd8efa7d
|
NEW: Takepos supplements
|
2019-12-08 23:16:49 +01:00 |
|
Laurent Dinclaux
|
f51a68ceb1
|
Takepos: Well align the search field width, keep old CSS rule as fallback for old browsers
|
2019-12-07 15:36:23 +11:00 |
|
Laurent Destailleur
|
90bf7d24b9
|
CSS
|
2019-12-04 21:30:31 +01:00 |
|
Laurent Destailleur
|
7b25104e0c
|
Responsive
|
2019-12-04 20:28:04 +01:00 |
|
Laurent Destailleur
|
f16cd38c9c
|
The default theme works greate on smartphone now
|
2019-12-04 20:15:48 +01:00 |
|
Laurent Destailleur
|
e6b4d2f665
|
Debug sumup
|
2019-12-04 18:06:05 +01:00 |
|
Laurent Destailleur
|
e073a2378b
|
Fix responsive
|
2019-12-04 15:12:18 +01:00 |
|
Laurent Destailleur
|
9754158756
|
Fix avoid duplicate product when searching on product with n categories
|
2019-12-01 18:33:57 +01:00 |
|
Laurent Destailleur
|
c2f924f08f
|
CSS For TakePOS
|
2019-11-30 23:03:30 +01:00 |
|
David Beniamine
|
828aa9bd93
|
Sort products by reference
|
2019-11-29 15:59:25 +01:00 |
|
Frédéric FRANCE
|
956ce9ea8f
|
avoid placeid to be string or string[]
Are you sure $placeid > 0 ? $placeid : 0 of type integer|string|string[] can be used in echo?
|
2019-11-28 23:31:28 +01:00 |
|
Laurent Destailleur
|
251723aed9
|
Fix css
|
2019-11-28 14:37:06 +01:00 |
|
Laurent Destailleur
|
99906ce127
|
Fix the root category not used for search from POS
|
2019-11-28 14:29:58 +01:00 |
|
Scrutinizer Auto-Fixer
|
5f99e25c45
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-28 11:36:20 +00:00 |
|
Frédéric FRANCE
|
59e85d5518
|
Create index.html
|
2019-11-26 17:55:33 +01:00 |
|
Frédéric FRANCE
|
250b8d0b67
|
delete file not used
|
2019-11-26 17:54:48 +01:00 |
|
Laurent Destailleur
|
5e5c1ac574
|
Merge pull request #12512 from Mavyre/develop
NEW Added SumUp payment to TakePOS
|
2019-11-26 09:50:37 +01:00 |
|
Laurent Destailleur
|
357af16ce1
|
Update terminal.php
|
2019-11-26 09:47:56 +01:00 |
|
Laurent Destailleur
|
01ca5d8251
|
Update setup.php
|
2019-11-26 09:46:47 +01:00 |
|
stickler-ci
|
9ee0dc75f3
|
Fixing style errors.
|
2019-11-25 22:19:50 +00:00 |
|
Bastien Vidé
|
fb069d248a
|
Added SumUp payment to TakePOS
|
2019-11-25 23:15:39 +01:00 |
|
andreubisquerra
|
b2e995279e
|
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
|
2019-11-25 19:29:07 +01:00 |
|
Laurent Destailleur
|
8db4eff108
|
Merge pull request #12437 from Dolibarr/scrutinizer-patch-8
Scrutinizer Auto-Fixes
|
2019-11-14 12:10:44 +01:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Laurent Destailleur
|
614faa07c1
|
Merge pull request #12427 from Dolibarr/scrutinizer-patch-3
Scrutinizer Auto-Fixes
|
2019-11-14 08:49:53 +01:00 |
|