Laurent Destailleur
|
a6a2c6cfe1
|
Merge pull request #14748 from andreubisquerra/master
Show buttons on products when 'Hide Product Images' is enabled
|
2020-09-20 17:43:35 +02:00 |
|
Laurent Destailleur
|
aba6fbb306
|
Merge pull request #14791 from andreubisquerra/develop
Avoid errors when Weighing Scale from the cloud in TakePOS
|
2020-09-20 17:12:48 +02:00 |
|
Laurent Destailleur
|
e5cca13ea0
|
Fix escaping
|
2020-09-20 03:32:43 +02:00 |
|
andreubisquerra
|
55a0e5f2e7
|
Avoid errors when Weighing Scale from the cloud in TakePOS
|
2020-09-19 17:12:41 +02:00 |
|
Laurent Destailleur
|
d75e1e5771
|
Fix #yogosha4525
|
2020-09-18 16:10:11 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
295c2b1d17
|
FIX #yogosha4435
|
2020-09-16 17:56:26 +02:00 |
|
andreubisquerra
|
ffb1b5c2ca
|
Fix travis
|
2020-09-16 07:59:36 +02:00 |
|
andreubisquerra
|
9bb41e949d
|
Fix travis
|
2020-09-16 07:39:48 +02:00 |
|
jove@bisquerra.com
|
31eecae2a6
|
Show buttons on products when 'Hide Product Images' is enabled
|
2020-09-16 06:54:01 +02:00 |
|
jove@bisquerra.com
|
e55c16c039
|
NEW Weighing Scale compatibility with TakePOS connector
|
2020-09-13 21:12:14 +02:00 |
|
Scrutinizer Auto-Fixer
|
c263c8a76c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-08 19:27:28 +00:00 |
|
Laurent Destailleur
|
c91338198d
|
Add some fields in candidature
Look and feel v13
|
2020-09-08 01:53:37 +02:00 |
|
Scrutinizer Auto-Fixer
|
b78ff67d7e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-09-07 08:18:17 +00:00 |
|
Laurent Destailleur
|
54c1be3717
|
Merge pull request #14560 from ptibogxiv/patch-349
NEW display resiliate status in takepos for member
|
2020-08-31 16:16:39 +02:00 |
|
Laurent Destailleur
|
d11d02a23a
|
Merge pull request #14586 from ptibogxiv/patch-353
NEW change thirdparty with barcode scan in takepos
|
2020-08-31 16:15:59 +02:00 |
|
stickler-ci
|
59542cfbcd
|
Fixing style errors.
|
2020-08-30 07:41:57 +00:00 |
|
jove@bisquerra.com
|
862c55ea07
|
NEW Keep takepos terminal when login/logout
|
2020-08-30 09:19:35 +02:00 |
|
stickler-ci
|
e18b85ea87
|
Fixing style errors.
|
2020-08-29 14:08:42 +00:00 |
|
ptibogxiv
|
d3024fdd1c
|
Update index.php
|
2020-08-29 16:07:01 +02:00 |
|
ptibogxiv
|
a963d6c0fc
|
NEW change thirdparty with barcode scan in takepos
|
2020-08-29 16:05:14 +02:00 |
|
ptibogxiv
|
6eeb1d3a96
|
Update invoice.php
|
2020-08-29 13:36:52 +02:00 |
|
Laurent Destailleur
|
4ecd15b7ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
|
2020-08-27 21:57:42 +02:00 |
|
Laurent Destailleur
|
5c1680e9c5
|
Merge branch 'develop' into master
|
2020-08-27 19:58:29 +02:00 |
|
stickler-ci
|
eecab28203
|
Fixing style errors.
|
2020-08-26 10:22:33 +00:00 |
|
ptibogxiv
|
989130c0ad
|
Update invoice.php
|
2020-08-26 12:20:49 +02:00 |
|
ptibogxiv
|
76e276e8e8
|
Update invoice.php
|
2020-08-26 12:00:45 +02:00 |
|
stickler-ci
|
32ecf4dd9a
|
Fixing style errors.
|
2020-08-26 09:46:49 +00:00 |
|
ptibogxiv
|
66cdb1dad0
|
NEW display resiliate status in takepos for member
|
2020-08-26 11:44:35 +02:00 |
|
ptibogxiv
|
ff621cb146
|
Update pay.php
|
2020-08-24 12:27:19 +02:00 |
|
ptibogxiv
|
9da4946955
|
Fix for better code
|
2020-08-24 12:26:40 +02:00 |
|
andreubisquerra
|
915aa56a95
|
Change variable to pos_change
|
2020-08-23 22:29:55 +02:00 |
|
andreubisquerra
|
8f933c324a
|
Change variable to pos_change
|
2020-08-23 22:28:26 +02:00 |
|
Laurent Destailleur
|
c784c002fd
|
Merge pull request #14517 from aspangaro/13.0_a5
Some fix on complete_head_from_modules
|
2020-08-23 18:09:15 +02:00 |
|
andreubisquerra
|
e8c8cb53cb
|
Fix travis
|
2020-08-22 18:45:54 +02:00 |
|
jove@bisquerra.com
|
d9cbd8f998
|
NEW: Print payment method and change in TakePOS
|
2020-08-22 18:28:15 +02:00 |
|
Alexandre SPANGARO
|
f1f579ad67
|
Some fix on complete_head_from_modules
|
2020-08-20 22:17:34 +02:00 |
|
Laurent Destailleur
|
25dfd32e0b
|
Merge pull request #14456 from andreubisquerra/master
NEW: Delayed payment in TakePOS
|
2020-08-19 14:36:34 +02:00 |
|
Laurent Destailleur
|
ea478721e7
|
Update invoice.php
|
2020-08-19 14:36:03 +02:00 |
|
Laurent Destailleur
|
f57f729d40
|
Update invoice.php
|
2020-08-19 14:35:15 +02:00 |
|
Laurent Destailleur
|
1d18c83439
|
Merge pull request #14463 from andreubisquerra/develop
Avoid empty sales and orders when all lines are removed.
|
2020-08-14 02:48:48 +02:00 |
|
Laurent Destailleur
|
7ce1d36b59
|
FIX Category for suplements not saved
|
2020-08-13 13:51:08 +02:00 |
|
Laurent Destailleur
|
88c07e86ad
|
Organization of setup for Takepos bar features
|
2020-08-13 13:46:53 +02:00 |
|
andreubisquerra
|
8c5a86cb72
|
Avoid empty sales and orders when all lines are removed.
|
2020-08-12 07:07:18 +02:00 |
|
jove@bisquerra.com
|
3be723f3a1
|
NEW: Delayed payment in TakePOS
|
2020-08-11 07:49:54 +02:00 |
|
Laurent Destailleur
|
6fd433167f
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2020-08-07 11:59:55 +02:00 |
|
jove@bisquerra.com
|
022fb23cee
|
FIX: Get some taxes in TakePOS
|
2020-08-07 10:01:11 +02:00 |
|
Laurent Destailleur
|
01babc452c
|
More logs
|
2020-08-06 03:52:49 +02:00 |
|
andreubisquerra
|
0347f2a46b
|
More elegant
|
2020-08-04 08:19:27 +02:00 |
|
jove@bisquerra.com
|
6d957c276c
|
Improving TakePOS search informing the user if there is no record or clearing the box if it exists avoiding manually clear every scan
|
2020-08-04 08:11:44 +02:00 |
|
Laurent Destailleur
|
be34a2c607
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/core/class/html.form.class.php
htdocs/langs/en_US/cashdesk.lang
htdocs/product/stock/list.php
|
2020-08-02 16:06:51 +02:00 |
|
jove@bisquerra.com
|
593c7242c4
|
NEW: TakePOS Gift Receipt
|
2020-08-02 11:13:41 +02:00 |
|
Laurent Destailleur
|
0b46fcb4f8
|
Debug
|
2020-07-31 14:02:08 +02:00 |
|
Laurent Destailleur
|
0d71cd4279
|
Fix td not closed
|
2020-07-31 13:51:49 +02:00 |
|
Laurent Destailleur
|
255dc71823
|
Missing translation
|
2020-07-31 13:20:05 +02:00 |
|
Laurent Destailleur
|
cb5577826d
|
Look and feel v13
|
2020-07-07 03:50:14 +02:00 |
|
Laurent Destailleur
|
83eaddb17b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/evalmath.class.php
htdocs/core/class/extrafields.class.php
htdocs/install/mysql/migration/11.0.0-12.0.0.sql
htdocs/langs/en_US/cashdesk.lang
htdocs/societe/class/societe.class.php
|
2020-07-04 13:13:17 +02:00 |
|
andreubisquerra
|
452cca503a
|
Fixes
|
2020-07-02 00:11:17 +02:00 |
|
andreubisquerra
|
d2a78b8aa4
|
Update appearance.php
|
2020-07-01 22:44:18 +02:00 |
|
jove@bisquerra.com
|
76f3724191
|
NEW: Appearance tab in TakePOS with more visual parameters
|
2020-07-01 22:34:35 +02:00 |
|
stickler-ci
|
92f4744d11
|
Fixing style errors.
|
2020-07-01 13:22:43 +00:00 |
|
ptibogxiv
|
5e259d26ab
|
FIX takepos hook
can add more than 1 button within 1 module
|
2020-07-01 15:20:42 +02:00 |
|
Laurent Destailleur
|
4f1ac84a19
|
Fix can't find link to edit table plan
|
2020-06-30 12:07:24 +02:00 |
|
Laurent Destailleur
|
146c521efd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security.lib.php
htdocs/filefunc.inc.php
|
2020-06-29 18:06:42 +02:00 |
|
Laurent Destailleur
|
bb74804b74
|
NEW Add option TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT
|
2020-06-29 17:58:04 +02:00 |
|
Laurent Destailleur
|
68b4866438
|
Trans
|
2020-06-29 09:43:39 +02:00 |
|
Laurent Destailleur
|
9c23890c26
|
Fix phpcs
|
2020-06-24 20:03:12 +02:00 |
|
Laurent Destailleur
|
4cfb9dc7c5
|
css
|
2020-06-22 04:40:04 +02:00 |
|
Laurent Destailleur
|
0139a840ae
|
Fix setup
|
2020-06-21 20:49:34 +02:00 |
|
Laurent Destailleur
|
501fd2f7a3
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/takepos/admin/receipt.php
|
2020-06-21 20:48:41 +02:00 |
|
Laurent Destailleur
|
ccc55dcb1e
|
Debug Receipt printer module and reduce duplicate translation key
|
2020-06-20 15:19:19 +02:00 |
|
Laurent Destailleur
|
c54294285a
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
|
2020-06-20 12:28:14 +02:00 |
|
andreubisquerra
|
515d18020d
|
Add security check
|
2020-06-20 12:21:14 +02:00 |
|
andreubisquerra
|
532fe82c6e
|
Fix travis
|
2020-06-20 12:21:06 +02:00 |
|
jove@bisquerra.com
|
ad432e1e9b
|
Printable QR
|
2020-06-20 12:20:53 +02:00 |
|
Laurent Destailleur
|
d632f1c6b2
|
Fix url
|
2020-06-19 23:08:29 +02:00 |
|
VESSILLER
|
f010184008
|
FIX replace filter parameter "none" by "restricthtml"
|
2020-06-08 11:48:31 +02:00 |
|
VESSILLER
|
7bba9db2f0
|
FIX replace filter parameter "none" by "restricthtml"
|
2020-06-08 11:28:05 +02:00 |
|
VESSILLER
|
81fbb80823
|
FIX end div for responsive table
|
2020-06-05 14:20:38 +02:00 |
|
VESSILLER
|
ded7b79a6f
|
FIX free text on cash desk
|
2020-06-05 12:10:03 +02:00 |
|
VESSILLER
|
304c44560d
|
NEW add free text on each terminal of cash desk
|
2020-06-05 10:47:45 +02:00 |
|
Laurent Destailleur
|
9a30d4ca44
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-06-02 13:32:02 +02:00 |
|
andreubisquerra
|
b0f904508a
|
Fix travis
|
2020-06-01 17:52:38 +02:00 |
|
andreubisquerra
|
8abe60db0b
|
Add Restaurant QR menu
|
2020-06-01 17:05:22 +02:00 |
|
andreubisquerra
|
3cc249a887
|
Update QR
|
2020-06-01 17:04:23 +02:00 |
|
andreubisquerra
|
5325971517
|
Update settings
|
2020-06-01 17:02:11 +02:00 |
|
Laurent Destailleur
|
2836368017
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/filefunc.inc.php
htdocs/takepos/css/phone.css
htdocs/takepos/invoice.php
|
2020-05-28 20:20:39 +02:00 |
|
andreubisquerra
|
3b884c4051
|
Fix travis
|
2020-05-27 07:03:57 +02:00 |
|
andreubisquerra
|
8891595993
|
Fix travis
|
2020-05-27 06:57:12 +02:00 |
|
andreubisquerra
|
896e3166b7
|
Update phone.css
|
2020-05-27 06:49:37 +02:00 |
|
andreubisquerra
|
7d323f4379
|
Update index.php
|
2020-05-27 06:48:40 +02:00 |
|
andreubisquerra
|
abf7fce108
|
Update auto_order.php
|
2020-05-27 06:44:00 +02:00 |
|
andreubisquerra
|
7e792928e0
|
Update invoice.php for Auto Order
|
2020-05-26 23:03:47 +02:00 |
|
andreubisquerra
|
56708e8c35
|
Update phone.php for Auto Order
|
2020-05-26 22:52:55 +02:00 |
|
stickler-ci
|
5fe4520385
|
Fixing style errors.
|
2020-05-25 20:43:35 +00:00 |
|
Laurent Destailleur
|
40816c02ce
|
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword
|
2020-05-25 22:40:59 +02:00 |
|
Laurent Destailleur
|
4e0d8ba518
|
Merge pull request #13962 from andreubisquerra/develop
TakePOS Auto Order improvements
|
2020-05-25 22:34:22 +02:00 |
|
Laurent Destailleur
|
0b9e1e6ec6
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-05-25 13:01:49 +02:00 |
|
Laurent Destailleur
|
6158e41822
|
CSS
|
2020-05-24 23:44:04 +02:00 |
|
andreubisquerra
|
d60bcb871f
|
Fix travis
|
2020-05-24 18:24:41 +02:00 |
|