Commit Graph

29193 Commits

Author SHA1 Message Date
Laurent Destailleur
076d93452f FIX Debug v16 2022-07-18 11:59:22 +02:00
Thomas Negre
0ac68c8635 fix signature style in email template 2022-07-18 09:55:54 +02:00
Regis Houssin
0c7a868306 FIX avoid Passing null to parameter #1 of type string is deprecated 2022-07-16 16:20:11 +02:00
Laurent Destailleur
2e42f45c99 FIX php8 2022-07-16 12:02:17 +02:00
Laurent Destailleur
ad2ced727a Fix php8 2022-07-16 10:59:36 +02:00
Laurent Destailleur
1855236027 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/admin.lang
2022-07-16 02:26:35 +02:00
Laurent Destailleur
a423f8685a php8 2022-07-16 02:23:30 +02:00
lvessiller
8f338d84b0 FIX resolve conflicts 2022-07-15 17:35:19 +02:00
Laurent Destailleur
a864771974 Debug 2022-07-15 15:51:55 +02:00
Laurent Destailleur
1d0ba05e90 Debug 2022-07-15 15:35:45 +02:00
Laurent Destailleur
b000ee7c50 NEW Add API for partnership module
Debug module builder
2022-07-15 13:41:02 +02:00
lvessiller
e5877cb2e3 FIX product filter in inventory list (Issue #21504) 2022-07-15 09:33:27 +02:00
Laurent Destailleur
4f54fb4f00 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-14 11:54:30 +02:00
Laurent Destailleur
3e6e4cc428 FIX php8 2022-07-14 10:58:51 +02:00
Laurent Destailleur
75693ce34a FIX php8 2022-07-14 10:56:55 +02:00
Laurent Destailleur
97acf949fc Clean message on email limit 2022-07-13 13:39:16 +02:00
Laurent Destailleur
abd3f272fa Fix backtopage after a cancel 2022-07-12 19:17:44 +02:00
Laurent Destailleur
8422d3079c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 19:10:08 +02:00
Laurent Destailleur
e6cf329596 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-07-12 19:09:16 +02:00
Laurent Destailleur
6c1b22eb48 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-07-12 19:08:15 +02:00
Laurent Destailleur
dfb5bb0936 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-07-12 19:07:35 +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
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
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
atm-lena
c068eebc43 Add function "convertDurationtoHour" 2022-07-12 10:03:31 +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
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
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
GregM
8e57d04f94 FIX dol_compress_dir names files on archives 2022-07-11 16:18:56 +02:00
stickler-ci
afefc369ed Fixing style errors. 2022-07-11 10:06:31 +00: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
stickler-ci
3434460cc3 Fixing style errors. 2022-07-11 09:55:39 +00:00
atm-lena
851416a61e No display extrafield line on PDF if empty 2022-07-11 11:48:37 +02:00
lmarcouiller
ce2bf519d5 Close #19587 : box_action order by to datep 2022-07-11 11:22:19 +02:00
Laurent Destailleur
e29df476e6 Merge branch 'develop' into membership-rework 2022-07-11 10:56:31 +02:00
Thomas Negre
c71000aef6 remove useless console.log() 2022-07-11 09:18:03 +02:00
Laurent Destailleur
30dff96ef4 Fix var_dump 2022-07-11 01:27:19 +02:00
Laurent Destailleur
bce8e28372 Merge pull request #21352 from badre-agtaib/new-#19511
New #19511
2022-07-10 19:49:35 +02:00
Laurent Destailleur
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00