Commit Graph

113788 Commits

Author SHA1 Message Date
Laurent Destailleur
c74ca9dc03 Fix trans 2022-07-12 18:28:37 +02:00
Laurent Destailleur
aa3f77e7cc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-12 17:54:03 +02:00
Laurent Destailleur
c2712242be Fix css 2022-07-12 17:42:20 +02:00
atm-lena
cc5a5e40d9 FIX 2022-07-12 14:56:25 +02:00
Christian Foellmann
535f5e56e8 fix establishment object UI display 2022-07-12 13:27:40 +02:00
atm-lena
b5d2e0f4bc Clean travis return 2022-07-12 12:23:23 +02:00
Laurent Destailleur
eeb967b540 Fix missing link to invoice 2022-07-12 11:59:33 +02:00
atm-lena
c7d4abb6a1 Merge branch 'develop_NEW_Service_DefaultWorkstation' of github.com:atm-lena/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 11:57:17 +02:00
atm-lena
8aa094a631 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 11:51:13 +02:00
Laurent Destailleur
57c5de5f9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 11:43:58 +02:00
Laurent Destailleur
9d249bd56d Fix phpunit 2022-07-12 11:37:17 +02:00
lvessiller
b57c40ef78 FIX load product stock in inventory lines 2022-07-12 11:32:12 +02:00
Laurent Destailleur
f396908c94 Update website templates 2022-07-12 11:24:46 +02:00
Laurent Destailleur
c804469082 FIX Export of website must not export .old and .back files 2022-07-12 11:20:34 +02:00
Laurent Destailleur
9abff2ff07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 10:57:11 +02:00
Laurent Destailleur
cf5825687e Debug v16 2022-07-12 10:56:03 +02:00
stickler-ci
a41dee9e06 Fixing style errors. 2022-07-12 08:09:45 +00:00
Laurent Destailleur
7ac00bfec9 Bad param 2022-07-12 10:09:01 +02:00
atm-lena
c068eebc43 Add function "convertDurationtoHour" 2022-07-12 10:03:31 +02:00
Laurent Destailleur
b1d762eb18 Fix php8.1 2022-07-12 09:37:15 +02:00
atm-lena
8a36e2e9d8 Màj column fk_fedault_workstatio and duration_unit 2022-07-12 09:21:51 +02:00
atm-lena
db5c5b9020 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_NEW_Service_DefaultWorkstation 2022-07-12 09:21:22 +02:00
atm-lena
6564333e55 Change sjquery on select2 2022-07-12 09:16:52 +02:00
This Charlène
7205cb0c21
Update modulehelp.php 2022-07-12 08:30:51 +02:00
Laurent Destailleur
98b686b531 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:16:54 +02:00
Laurent Destailleur
1f87f515ad Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:55 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +02:00
Laurent Destailleur
bce665e11b css 2022-07-12 02:04:29 +02:00
comaiteseb
4b5b0bd163
Update actioncomm.class.php
FIX issue #21495
2022-07-11 21:25:49 +02:00
jove@bisquerra.com
46f7c8cad5 Eliminate double checking if it is sent to the kitchen 2022-07-11 20:37:42 +02:00
Laurent Destailleur
f0090ef928 FIX #yogosha11755 2022-07-11 20:32:49 +02:00
Laurent Destailleur
1cbeaf6ac0 Fix php8 2022-07-11 20:05:49 +02:00
Laurent Destailleur
fe99e6c136 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-11 19:59:48 +02:00
Laurent Destailleur
85a0ae1236 Fix token for ping 2022-07-11 19:59:15 +02:00
Laurent Destailleur
4f9211d3e5 Fix link 2022-07-11 19:24:55 +02:00
Laurent Destailleur
661b863314
Merge pull request #21490 from Hystepik/develop#2
Close #19587 : box_action order by to datep
2022-07-11 17:48:56 +02:00
Laurent Destailleur
86ce98b7b4
Merge pull request #21493 from fappels/16_fix_php8
Fix some php 8 warnings.
2022-07-11 17:41:56 +02:00
Quatadah Nasdami
0da4360b9f almost done 2022-07-11 17:30:11 +02:00
Francis Appels
490944baac Fix php 8 warning 2022-07-11 17:29:26 +02:00
Laurent Destailleur
6f1d62d8a5 Fix trans 2022-07-11 17:06:03 +02:00
Quatadah Nasdami
2f6e9ea839 done 2022-07-11 16:28:28 +02:00
GregM
8e57d04f94 FIX dol_compress_dir names files on archives 2022-07-11 16:18:56 +02:00
Quatadah Nasdami
66ed4aa524 refixing the bug 2022-07-11 14:04:31 +02:00
Laurent Destailleur
f607ae40c3 Fix migration 2022-07-11 12:40:14 +02:00
Laurent Destailleur
5ba446f736
Merge pull request #21412 from ymollard/membership-rework
Membership rework
2022-07-11 12:13:34 +02:00
Laurent Destailleur
0f221b5f7c Fix php8 2022-07-11 12:12:18 +02:00
stickler-ci
afefc369ed Fixing style errors. 2022-07-11 10:06:31 +00:00
Yoan Mollard
fd4c071c55 Fix displayed amount when canEditAmount is true globally 2022-07-11 12:03:24 +02:00
Yoan Mollard
39c9eb8708 Fix: fetch the right amount for membership payment
It was defaulting to 9.99
2022-07-11 12:03:24 +02:00
Yoan Mollard
2699159dea Add admin link for errormsg "click here to finish mandatory setup" 2022-07-11 12:03:24 +02:00