Commit Graph

734 Commits

Author SHA1 Message Date
Laurent Destailleur
d042562996 Disable browser notification on public pages 2020-10-25 13:48:08 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
30d39f890c
Merge pull request #15054 from ptibogxiv/patch-387
NEW display date range if exist in takepos
2020-10-22 17:16:46 +02:00
ptibogxiv
7e8891bef9
NEW display date range if exist in takepos
usefull for membership via POS (ie use in adherentsplus before pushing in core)
2020-10-18 12:40:10 +02:00
jove@bisquerra.com
1283c6e095 TakePOS connector compatibility with templates 2020-10-18 09:29:33 +02:00
Laurent Destailleur
7a7e1ad7cf CSS 2020-10-16 00:29:35 +02:00
Laurent Destailleur
69432284d0
Merge pull request #14999 from andreubisquerra/master
NEW: Add third order printer to TakePOS
2020-10-13 11:03:41 +02:00
Laurent Destailleur
64e20959f6 Fix bad link 2020-10-13 11:00:56 +02:00
andreubisquerra
d80931429e
Fix travis 2020-10-12 22:34:05 +02:00
jove@bisquerra.com
54f9ed6346 NEW: Add third order printer to TakePOS 2020-10-12 22:07:05 +02:00
Laurent Destailleur
1b92e03f47
Merge pull request #14921 from ptibogxiv/patch-383
NEW set entity when creating invoice on takepos
2020-10-08 19:30:37 +02:00
Scrutinizer Auto-Fixer
1512521d91 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-07 13:01:28 +00:00
Laurent Destailleur
351f80c540
Update index.php 2020-10-06 09:57:04 +02:00
ptibogxiv
bb0b9dc128
FIX php error in takepos 2020-10-05 18:16:32 +02:00
Laurent Destailleur
9309048bda
Merge pull request #14923 from ptibogxiv/patch-385
New display currency in takepos payment
2020-10-05 16:45:17 +02:00
Laurent Destailleur
bb39d7b205
Merge pull request #14916 from ptibogxiv/patch-382
Fix  and save change of currency in invoice (takepos)
2020-10-05 16:44:28 +02:00
Laurent Destailleur
44ecc15a07
Merge pull request #14915 from ptibogxiv/patch-380
Fix reload display when invoice deleting in takepos
2020-10-05 16:43:55 +02:00
Laurent Destailleur
0fdad1b63d
Merge pull request #14914 from ptibogxiv/patch-379
Fix better display print/send button on takepos
2020-10-05 16:43:11 +02:00
Laurent Destailleur
10d21eee03
Merge pull request #14911 from ptibogxiv/patch-376
Fix display stock rights in takepos
2020-10-05 16:42:31 +02:00
Laurent Destailleur
ffc0f51827
Merge pull request #14909 from ptibogxiv/patch-374
Fix multicurrency modal in takepos
2020-10-05 16:41:56 +02:00
Laurent Destailleur
099c19cefb
Merge pull request #14912 from ptibogxiv/patch-378
NEW multicurrency total in takepos
2020-10-05 16:40:59 +02:00
Laurent Destailleur
243d576f83
Update invoice.php
Log for debug
2020-10-05 16:38:40 +02:00
ptibogxiv
078459fc44
New display currency in takepos payment
to do in next PR (payment with multicurrency in other currency that principal)
2020-10-04 23:35:19 +02:00
andreubisquerra
1c34a7acda
NEW: TakePOS connector compatibility with RECEIPT PRINTERS module 2020-10-04 22:50:27 +02:00
ptibogxiv
1a407e4c22
NEW set entity when creating invoice on takepos
usefull for marketplace, coworking, multibranding shop
2020-10-04 22:09:40 +02:00
ptibogxiv
55764779c4
Update invoice.php 2020-10-04 17:12:01 +02:00
ptibogxiv
e280fc3ad1
Fix and save change of currency in invoice (takepos) 2020-10-04 16:53:31 +02:00
stickler-ci
32a882e83c Fixing style errors. 2020-10-04 13:56:36 +00:00
ptibogxiv
fac60bdf24
Fix reload display when invoice deleting 2020-10-04 15:54:23 +02:00
ptibogxiv
eaedcff2a8
Fix better display print/send button on takepos 2020-10-04 15:01:22 +02:00
ptibogxiv
1e6ad59856
Update invoice.php 2020-10-04 14:42:16 +02:00
stickler-ci
d25c5bf36a Fixing style errors. 2020-10-04 12:40:52 +00:00
ptibogxiv
31dd9885e6
NEW multicurrency total in takepos 2020-10-04 14:39:02 +02:00
ptibogxiv
415deb1500
Fix display stock rights in takepos
only display if user have read right
2020-10-04 14:27:03 +02:00
ptibogxiv
36fc987f1e
Fix multicurrency modal
+ avoid loud page if not used
2020-10-04 14:04:44 +02:00
Laurent Destailleur
f09258713e
Merge pull request #14907 from andreubisquerra/master
NEW: TakePOS Multicurrency compatibility
2020-10-04 11:26:58 +02:00
andreubisquerra
4c64b99235
Lang fix 2020-10-03 23:16:13 +02:00
andreubisquerra
d43d1e8519
Clean 2020-10-03 23:03:08 +02:00
andreubisquerra
18cd870307
Fix travis 2020-10-03 22:31:55 +02:00
jove@bisquerra.com
017d4946fe NEW: TakePOS Multicurrency compatibility 2020-10-03 22:13:32 +02:00
Laurent Destailleur
50ca9f4145 Clean code 2020-10-02 19:10:30 +02:00
Laurent Destailleur
500ef243e2
Merge pull request #14815 from ptibogxiv/patch-365
NEW restrict thirdparty to customer in takepos
2020-10-02 14:41:11 +02:00
Laurent Destailleur
ce1c5c6873 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/stripe/class/stripe.class.php
	htdocs/takepos/invoice.php
2020-10-01 19:43:23 +02:00
Laurent Destailleur
0fa139f4e3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/takepos/invoice.php
2020-10-01 19:37:56 +02:00
Laurent Destailleur
4d134ade72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/takepos/invoice.php
2020-10-01 19:35:49 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
lvessiller
259737f082 FIX set paid on total discount of a product in cash desk 2020-09-30 15:09:45 +02:00
ptibogxiv
09f7220470
Update index.php 2020-09-29 17:10:08 +02:00
Laurent Destailleur
ac897b5b4d Fix css 2020-09-29 17:06:08 +02:00
andreubisquerra
12b2c33895
Footer removed 2020-09-27 22:22:56 +02:00
andreubisquerra
80641e54c9
Footer removed 2020-09-27 22:19:49 +02:00
andreubisquerra
494348356a
Fix travis 2020-09-27 11:35:07 +02:00
jove@bisquerra.com
ec54e33d81 NEW: Introducing new modal boxes in TakePOS 2020-09-27 11:11:31 +02:00
Laurent Destailleur
0e820d4c2b FIX link to home in takepos 2020-09-24 13:00:56 +02:00
Laurent Destailleur
1d6a4f528a Fix css 2020-09-24 00:07:55 +02:00
Laurent Destailleur
a16788f753 Fix syntax error 2020-09-24 00:06:02 +02:00
ptibogxiv
5f8f9c6a4a
NEW restrict thirdparty to customer in takepos
only display customer (better when long list and avoid supplier)
2020-09-23 22:38:06 +02:00
Laurent Destailleur
32a93eb067
Update invoice.php 2020-09-23 19:50:39 +02:00
jove@bisquerra.com
c596f80fd5 NEW Show available stock in TakePOS 2020-09-20 23:29:59 +02:00
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