Laurent Destailleur
c89e8efec3
responsive
2020-05-12 14:08:28 +02:00
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
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
Scrutinizer Auto-Fixer
b40ecc3933
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
f4aaa8d9bb
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:34:37 +00:00
Laurent Destailleur
c02cd80b75
Clean code
2019-11-12 10:11:30 +01:00
Scrutinizer Auto-Fixer
df664e790b
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-11 23:15:34 +00:00
Scrutinizer Auto-Fixer
812d0af1d9
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Laurent Destailleur
8793fdfe63
Fix not working feature
2019-11-07 15:25:57 +01:00
Laurent Destailleur
e671a119ce
Merge branch 'develop' into patch-243
2019-11-07 15:12:37 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent
2019-11-05 21:24:41 +01:00
Frédéric FRANCE
b048a2b408
can print from takepos
2019-11-03 15:06:20 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module
2019-11-03 00:50:58 +01:00
Laurent Destailleur
dc18e3efb5
Merge pull request #12278 from andreubisquerra/master
...
Default customer relative discount in TakePOS
2019-11-02 13:03:43 +01:00
Laurent Destailleur
45c77b4560
Renaming some libelle into label
2019-11-02 12:59:38 +01:00
Laurent Destailleur
135e65c4aa
Look and feel v11
...
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Laurent Destailleur
1821fa6317
Fix translation of "Terminal"
2019-11-01 12:48:09 +01:00
andreubisquerra
dbb5729f04
Default customer relative discount in TakePOS
2019-10-30 22:34:54 +01:00
Laurent Destailleur
26a58682b0
Merge pull request #12217 from andreubisquerra/develop
...
REF to customer readable place in TakePOS BAR
2019-10-30 03:01:49 +01:00
Frédéric FRANCE
16f58f1eee
clean indent
2019-10-27 10:38:52 +01:00
andreubisquerra
709f2c08b0
travis errors
2019-10-24 21:39:47 +02:00
andreubisquerra
5904b0bea4
Travis errors
2019-10-24 20:00:17 +02:00
andreubisquerra
6c8c41aaba
REF to customer readable place in TakePOS BAR
...
Convert the invoice reference to a readable format for customers and waiters in non validated printed vouchers.
(PROV-POS1-5)
to:
Terminal 1 Place 5
2019-10-24 19:14:12 +02:00
stickler-ci
0e7f3c307e
Fixing style errors.
2019-10-23 20:05:37 +00:00
ptibogxiv
6ff13ab7e1
Update invoice.php
2019-10-23 22:03:43 +02:00
Laurent Destailleur
a4eab82894
Merge pull request #12191 from andreubisquerra/master
...
NEW Multiple payments in a TakePOS sale
2019-10-22 12:45:19 +02:00
Laurent Destailleur
6638b361d4
Update invoice.php
2019-10-22 12:44:19 +02:00
Laurent Destailleur
be3f0471ff
Fix phpcs
2019-10-21 11:27:48 +02:00
andreubisquerra
df181d1f35
Multiple payments in a TakePOS sale
2019-10-20 22:01:54 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces
2019-10-20 17:17:22 +02:00
Laurent Destailleur
05352a62e5
css
2019-10-20 15:37:20 +02:00
Laurent Destailleur
5a4960f7ae
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
2019-10-20 15:30:28 +02:00
Laurent Destailleur
45d64e468f
Fix regression
2019-10-20 15:29:15 +02:00
Laurent Destailleur
e224170dc2
FIX Clean the + of categories on the product view only in POS module
...
Conflicts:
htdocs/takepos/takepos.php
2019-10-20 15:27:09 +02:00
Laurent Destailleur
f999430fd3
FIX Clean the + of categories on the product view only in POS module
2019-10-20 15:24:52 +02:00
Laurent Destailleur
d79114c1f8
Clean code
2019-10-20 15:16:40 +02:00
Laurent Destailleur
955e25d7c6
Merge pull request #12150 from andreubisquerra/master
...
Redesign of the TakePOS mobile layout and more functions
2019-10-17 17:56:12 +02:00
Laurent Destailleur
e709c005a0
FIX Payment was not saved on TakePOS module.
2019-10-17 12:28:48 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
2019-10-16 20:00:01 +02:00
Laurent Destailleur
7960c91955
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/theme/md/style.css.php
2019-10-16 17:27:41 +02:00
andreubisquerra
8f03813aa9
Phone layout and functional improvements
2019-10-16 16:26:00 +02:00
Laurent Destailleur
568faef7f4
Fix encoding of message
2019-10-15 04:08:34 +02:00
Laurent Destailleur
060452ecf2
Fix link
2019-10-10 15:29:27 +02:00
Laurent Destailleur
ec1acf710c
Fix missing br
2019-10-09 18:15:59 +02:00
Laurent Destailleur
1ca5a33e53
Merge branch 'develop' into patch-243
2019-10-08 15:04:03 +02:00
Laurent Destailleur
b3e2163903
Merge pull request #12014 from andreubisquerra/develop
...
Price with tax when manual modify price in TakePOS
2019-10-03 17:49:05 +02:00
Laurent Destailleur
09f7a68d6d
Show ref of product on mouse hover thumbs
2019-10-03 17:40:59 +02:00
Laurent Destailleur
331148499a
Fix check on terminal setup
2019-10-03 17:11:41 +02:00
andreubisquerra
64ca8acc54
Price with tax when manual modify price in TakePOS
2019-10-01 20:36:24 +02:00
Alexandre SPANGARO
16c6c9ae75
Merge remote-tracking branch 'upstream/develop' into 11.0_https
2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd
Merge branch 'develop' into 11.0_https
2019-10-01 06:11:43 +02:00
andreubisquerra
741447d990
Fix Travis errors
2019-09-29 21:30:06 +02:00
andreubisquerra
34be514326
Custom receipt tab in TakePOS
2019-09-29 20:56:24 +02:00
Laurent Destailleur
f3bc319a78
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
435edf999b
Fix: label of product not always visible after a search
2019-09-27 11:05:44 +02:00
Laurent Destailleur
8c3c7fd857
Fix remove + of categ on product thumb
2019-09-27 10:21:14 +02:00
Laurent Destailleur
64a7bbe0fd
Move ajax file
2019-09-27 10:19:27 +02:00
Laurent Destailleur
5d0d3b3908
Description on 2 lines max
2019-09-27 09:57:48 +02:00
Laurent Destailleur
2e1decc57e
Use css instead of hard coded style
2019-09-26 17:41:37 +02:00
Juanjo Menent
b838ab0c31
Fix search by ref
2019-09-25 12:13:27 +02:00
Laurent Destailleur
961f2b5165
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Juanjo Menent
c97bd14278
FIX TakePOS no invoice validation control and good payment translate
2019-09-24 10:08:48 +02:00
Alexandre SPANGARO
02dbc11f98
Move Gnu.org to https
2019-09-23 21:55:30 +02:00
ptibogxiv
21c51eb3d2
Update invoice.php
2019-09-15 21:01:29 +02:00
Laurent Destailleur
9f6fe0bf5a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/orders.lang
2019-09-14 18:27:58 +02:00
ptibogxiv
ca5a3da04c
Update printsend.php
2019-09-11 15:04:13 +02:00
ptibogxiv
48419da769
FIX new invoice with generic thirdparty in takepos
...
by default, new invoice should always create with default thirdparty and avoid errors : creating new invoice with last customer and forget to change it...
2019-09-10 14:58:55 +02:00
Laurent Destailleur
f893854986
Fix remove warnings
2019-09-05 14:24:13 +02:00
Laurent Destailleur
da3d230182
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
.stickler.yml
htdocs/takepos/invoice.php
2019-09-03 17:34:49 +02:00
Laurent Destailleur
9c6cbfeb7f
Merge pull request #11774 from ptibogxiv/patch-250
...
FIX logout redirect to takepos.php
2019-09-03 15:10:28 +02:00
ptibogxiv
80624c67f4
Fix lang in invoice / takepos
2019-09-03 14:48:46 +02:00
ptibogxiv
6996e83390
Update takepos.php
2019-09-03 11:40:19 +02:00
ptibogxiv
0c5859d2bf
Update takepos.php
2019-09-03 11:37:25 +02:00
ptibogxiv
f9df175efc
FIX takepos layout clear or focus search
...
fix focus for compatibility with barcode scanner
2019-09-02 21:26:44 +02:00
ptibogxiv
1c28086d4b
FIX logout redirect to takepos.php
...
usefull for terminal locked with POS and use standard dolibarr login with addon as U2F
2019-08-28 13:22:54 +02:00
andreubisquerra
d096d8abba
Set free-text item default vat in TakePOS
2019-08-27 21:57:21 +02:00
Laurent Destailleur
bbda4269b2
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 17:55:21 +02:00
Laurent Destailleur
851d76460a
FIX #11720
2019-08-27 17:42:25 +02:00
Laurent Destailleur
12a09b8b2a
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/takepos/invoice.php
2019-08-27 15:56:56 +02:00
Laurent Destailleur
d4d3e28437
It is diffcult to understand how stock decrease is done so we show the
...
ref of stock.
2019-08-27 15:53:03 +02:00
Laurent Destailleur
d5328d1cec
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-08-27 15:43:19 +02:00
Laurent Destailleur
a2b1d96d42
Fix protection in cleaning invoice with transaction. Delete also
...
extrafield lines.
2019-08-27 15:42:35 +02:00
Laurent Destailleur
7165389f6c
Add log
...
Add protection to avoid change on a non draft invoice.
2019-08-27 15:39:35 +02:00
ptibogxiv
1b64c89c2a
Fix tab and lang
2019-08-27 13:32:55 +02:00
Laurent Destailleur
7009f036a0
Merge pull request #11744 from andreubisquerra/master
...
Control errors before validate invoice in TakePOS
2019-08-26 17:24:03 +02:00
Laurent Destailleur
2ee864c905
Merge pull request #11738 from ptibogxiv/patch-238
...
NEW email template for Takepos (sending invoice)
2019-08-26 17:21:03 +02:00
Laurent Destailleur
999db7ed41
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/salaries/card.php
htdocs/compta/sociales/class/chargesociales.class.php
htdocs/takepos/invoice.php
2019-08-26 16:49:25 +02:00
Laurent Destailleur
7c5fc9f3f8
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
2019-08-26 16:43:33 +02:00
Laurent Destailleur
c93e6550ce
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/compta/paiement.php
htdocs/compta/sociales/class/chargesociales.class.php
2019-08-26 16:43:24 +02:00
Laurent Destailleur
6771a2e1f9
Update invoice.php
2019-08-26 16:27:00 +02:00
andreubisquerra
07244f002b
else if to elseif
2019-08-24 18:11:47 +02:00
ptibogxiv
add28f10db
Update invoice.php
2019-08-24 17:37:50 +02:00
ptibogxiv
3a4ba0c401
Update printsend.php
2019-08-24 17:29:48 +02:00
ptibogxiv
bc93a8b4b1
Create printsend.php
2019-08-24 17:18:43 +02:00
ptibogxiv
f1987b0f0e
Update invoice.php
2019-08-24 16:58:39 +02:00
ptibogxiv
cf1a029b43
Update invoice.php
2019-08-24 16:46:04 +02:00
andreubisquerra
5d0dbea920
Control errors before validate invoice in TakePOS
2019-08-24 16:44:06 +02:00
ptibogxiv
4678373480
NEW print / send email form in takepos
2019-08-24 16:41:51 +02:00
ptibogxiv
c4b18890d9
Update invoice.php
2019-08-24 15:12:56 +02:00
ptibogxiv
d2ff37ae72
NEW email template for Takepos (sending invoice)
2019-08-24 15:00:49 +02:00
ptibogxiv
361bb72448
Update invoice.php
2019-08-24 14:17:58 +02:00
ptibogxiv
bb763ecb59
Fix lang in takepos
2019-08-24 14:02:25 +02:00
ptibogxiv
cc1de15438
Update invoice.php
2019-08-24 13:52:40 +02:00
ptibogxiv
686d43a122
NEW display membership in takepos if member link to thirdparty
...
For some business or cases (ie: fundation), we need to know if customer is a member and membership is up to date.
2019-08-24 13:44:21 +02:00
ptibogxiv
73a6b45e23
Fix load langs in takepos
2019-08-24 13:26:01 +02:00
andreubisquerra
f1b80fc19a
Add 'Direct Cash Payment' button in TakePOS
2019-08-20 23:44:30 +02:00
andreubisquerra
4cea0433b7
If user has not used change control, add total invoice payment
2019-08-16 23:33:48 +02:00
Laurent Destailleur
d7a41c6b72
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061
FIX #11584
2019-08-01 12:23:02 +02:00
Laurent Destailleur
12b530c418
FIX Setup of TakePos was not possible after a clean install
2019-08-01 11:27:35 +02:00
Laurent Destailleur
9f7d118f6f
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-07-27 02:40:56 +02:00
jcp
f82e1f1155
Fix: Use special_code=4 for Takepos
2019-07-19 10:44:12 +02:00
Laurent Destailleur
68bc096ef3
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-25 23:41:56 +02:00
Laurent Destailleur
f2ea78f2ec
Removed useless files
2019-06-25 23:26:55 +02:00
Laurent Destailleur
9b9070dbf8
Removed useless files
2019-06-25 23:26:34 +02:00
andreubisquerra
45fabede28
Basic phone layout for Restaurants in TakePOS
2019-05-26 16:44:17 +02:00
andreubisquerra
99a96bffe2
Fix TakePOS terminal bug
2019-05-24 08:36:43 +02:00
Laurent Destailleur
22e897b1a1
Clean and prepare code to fix a SQL injection
2019-05-21 17:22:38 +02:00
Norbert Penel / OSCSS
cf207aa545
FIX new takepos error messages
...
the terminal number implementation must be used on global conf key
2019-05-18 00:29:32 +02:00
javierybar
114ddea54f
Simplify terminal variables
2019-05-14 19:58:08 +02:00
Laurent Destailleur
18071fb238
Works with 9 terminals
2019-05-09 13:40:03 +02:00
Laurent Destailleur
84714f39e2
Fix setup of terminal
2019-05-09 13:37:20 +02:00
andreubisquerra
84cfa00bf1
Terminals
2019-05-08 18:29:00 +02:00
Philippe GRAND
8e936fda4f
FIX : typo error
2019-05-02 14:19:50 +02:00
andreubisquerra
00db274956
Add history to view and print previous sales.
2019-04-28 18:12:33 +02:00
andreubisquerra
d73b69df61
Add form class and fix autoprint with Takepos connector
2019-04-08 19:54:46 +02:00
Laurent Destailleur
da6c5b552f
Merge pull request #10950 from OPEN-DSI/new-extrafield-sellist-chkbxlst-options
...
New categories options in sellist and chbxlist extrafields
2019-04-08 13:28:51 +02:00
Laurent Destailleur
37b8796f3c
NEW Add line total on list of payments
2019-04-02 17:54:34 +02:00
Lionel VESSILLER
8a220b9da1
New categories options in sellist and chbxlist extrafields
2019-04-02 11:01:46 +02:00
Laurent Destailleur
80b2605537
Merge pull request #10917 from Tetras-Libre/NegativeBills
...
Negative bills
2019-04-01 18:31:04 +02:00
Laurent Destailleur
9f0d712957
Fix style
2019-03-31 11:27:12 +02:00
Laurent Destailleur
ec9fdc1321
Fix regression with class="right". Style of amount lost.
2019-03-31 11:25:29 +02:00
Laurent Destailleur
76c5e96555
css
2019-03-29 12:38:32 +01:00
Laurent Destailleur
b3515e9994
css
2019-03-29 12:35:33 +01:00
Laurent Destailleur
b0b69033b7
Use a background color to identify line selected
2019-03-29 12:27:54 +01:00
Laurent Destailleur
6027e018e9
New: When adding a product in POS, the line added is automatically
...
selected so we can change immediatly qty or price
2019-03-29 12:19:23 +01:00
Laurent Destailleur
822552defb
Use font awesome icon instead of image for navigation
...
Better responsive on small screen
2019-03-29 11:45:40 +01:00
Laurent Destailleur
458ef4df34
Fix alignement on TakePOS receipt
2019-03-28 20:33:41 +01:00
Laurent Destailleur
2996965c50
Fix: autofocus is done only on dekstop.
2019-03-28 19:33:22 +01:00
Laurent Destailleur
8d9a07de09
Fix rounding
2019-03-28 19:02:47 +01:00
Laurent Destailleur
50395b7dd7
New: Input field to search product always visible with focus so you can
...
use a barcode flasher at any time
2019-03-28 18:51:04 +01:00
Laurent Destailleur
c888c071e5
Removed duplicate file
2019-03-28 13:10:44 +01:00
Laurent Destailleur
396e79199c
Add contextpage to open popup to change customers
2019-03-28 12:32:32 +01:00
Laurent Destailleur
3de82ad345
Prepare removal of duplicate page
2019-03-28 12:27:31 +01:00
Laurent Destailleur
1818e22be9
Add some font awesome icons on buttons
2019-03-28 09:56:01 +01:00
David Beniamine
42bd9f4c74
Fix CI again
2019-03-28 08:58:19 +01:00
David Beniamine
2834262010
Merge develop branch
2019-03-28 08:21:49 +01:00
David Beniamine
a8286eb100
Fix CI
2019-03-28 08:13:02 +01:00
Laurent Destailleur
c654361485
Show link to invoice at the TOP
2019-03-27 20:46:07 +01:00
Laurent Destailleur
eb1d57226f
Fix status paid after entering a payment
2019-03-27 20:28:02 +01:00
Laurent Destailleur
9105e205ff
No more need to set scroolTop, lines are sorted with last added first
2019-03-27 20:20:39 +01:00
Laurent Destailleur
ff10a2ab5a
New: show the name of place and floor on main takepos page
2019-03-27 20:13:12 +01:00
