Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
127,160 Commits 36 Branches 189 Tags
10ee30214fc09e4c1962e80dca39df30dce8bf58
Commit Graph

8653 Commits

Author SHA1 Message Date
Frédéric FRANCE
b356adab3c Merge branch 'develop' into patch-4 2023-12-19 09:16:58 +01:00
Laurent Destailleur
932f9f28e6 css 2023-12-18 19:19:58 +01:00
Frédéric FRANCE
735cfee1d7 FIX 2023-12-18 15:14:07 +01:00
Laurent Destailleur
a7fa5accf9 Debug v19 2023-12-18 15:06:25 +01:00
Laurent Destailleur
0bcf61d220 Debug v19 2023-12-18 14:36:24 +01:00
Laurent Destailleur
6c873e66da Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 22:53:22 +01:00
Laurent Destailleur
1661534d5a Fix set PROFID1 2023-12-17 22:51:13 +01:00
Laurent Destailleur
98009ea6be Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/langs/en_US/recruitment.lang
	htdocs/master.inc.php
	htdocs/projet/contact.php
 2023-12-17 22:17:14 +01:00
Laurent Destailleur
438e922a75 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/master.inc.php
 2023-12-17 21:49:42 +01:00
Laurent Destailleur
9160d49625 Merge pull request #27125 from atm-lena/17.0_FIX_Issue26045 
17.0 fix issue 26045
 2023-12-17 21:36:55 +01:00
Laurent Destailleur
78d5e71a8f FIX #yogosha19506 2023-12-16 19:24:41 +01:00
atm-lena
97491b5446 FIX label 2023-12-15 15:48:38 +01:00
atm-lena
338f363fce Issue 26045 : force MAIN_PROFID1_IN_ADDRESS for fr soc 2023-12-15 15:45:52 +01:00
Laurent Destailleur
fb083a6cfc Fix warning with rector 2023-12-13 16:33:17 +01:00
Laurent Destailleur
7d109e9419 Fix phpcs 2023-12-13 12:46:23 +01:00
Laurent Destailleur
e040219fdc Fix phpcs 2023-12-13 12:45:07 +01:00
Laurent Destailleur
4c7dfea535 Clean code 2023-12-12 01:40:26 +01:00
Laurent Destailleur
255bb9c8ca Merge pull request #27053 from atm-saamiperdrix/FIX_WarningsOnEmailConfig 
GetDolGlobalString oublié sur config mails
 2023-12-11 23:06:58 +01:00
Laurent Destailleur
8a9eaaf0f6 Merge pull request #27027 from frederic34/patch-8 
fix phpdoc
 2023-12-11 15:49:05 +01:00
Laurent Destailleur
6b0b7deda6 Merge pull request #27038 from JonBendtsen/develop 
QUAL continuation of request made by eldy in #25946
 2023-12-11 14:47:02 +01:00
Laurent Destailleur
44bfd28332 Debug v19 2023-12-11 10:09:43 +01:00
Laurent Destailleur
9608f59485 Debug v19 2023-12-11 10:00:24 +01:00
Laurent Destailleur
2e445b2a6d Debug v19 2023-12-11 09:13:10 +01:00
Laurent Destailleur
29dc12dd58 Option MAIN_DISALLOW_URL_INTO_DESCRIPTIONS accept 1 or 2 value. 
Value 1 should be ready to be on by default in a next version.
Fix #yogosha18900
 2023-12-10 16:19:05 +01:00
Jon Bendtsen
f125899db2 continuation of request made by eldy in https://github.com/Dolibarr/dolibarr/pull/25946 2023-12-10 00:10:18 +01:00
Frédéric FRANCE
9326e03be8 Merge branch 'develop' into patch-8 2023-12-08 07:53:59 +01:00
Laurent Destailleur
60af6843fd Clean code 2023-12-08 02:05:51 +01:00
Laurent Destailleur
89e1e1b859 Merge pull request #26980 from atm-jonathan/FIX_in_array()_list.php 
FIX in_array() on key
 2023-12-08 01:59:32 +01:00
Frédéric FRANCE
5fbd5c28b6 fix phpdoc 2023-12-07 20:33:06 +01:00
Laurent Destailleur
1569a6ba79 Debug v19 2023-12-07 15:00:52 +01:00
Laurent Destailleur
20a9a9d298 Debug v19. dolibarr_main_stream_enabled must be changed into 
dolibarr_main_stream_to_disable
 2023-12-07 14:56:06 +01:00
Laurent Destailleur
7c151ab94d Merge pull request #26948 from hansemschnokeloch/fix-26912 
FIX #26912
 2023-12-06 15:59:46 +01:00
Saami PERDRIX - ATM Consulting
15cb20837a fix warning on email config 2023-12-06 13:35:43 +01:00
Jonathan Lescaut
771b735384 FIX in_array() on key 2023-12-05 16:12:18 +01:00
Laurent Destailleur
987d6c41b9 Fix with php-cs-fixer 2023-12-04 11:41:14 +01:00
pascal
475357448a FIX #26912 2023-12-03 15:25:22 +01:00
Laurent Destailleur
a8860c9360 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-03 12:50:07 +01:00
Laurent Destailleur
aa44100cbc Add test to check if a security experimental feature can work 2023-12-03 12:49:52 +01:00
Laurent Destailleur
04f5762435 Update stocktransfer.php 2023-12-02 21:13:42 +01:00
Frédéric FRANCE
b10eda1a79 fix missing token 2023-12-02 20:51:42 +01:00
Laurent Destailleur
3addb1dd26 Fix min php 2023-12-02 16:39:17 +01:00
Laurent Destailleur
1779fed19c Debug v19 2023-12-02 16:10:58 +01:00
Laurent Destailleur
268320b02a Debug v19 2023-12-02 16:06:06 +01:00
Laurent Destailleur
7835c1f6bc Debug setup 2023-12-02 15:49:29 +01:00
Laurent Destailleur
df6ca57763 Debug v19 2023-12-02 15:20:42 +01:00
Laurent Destailleur
c417949a7e Fix phpunit 2023-11-30 00:06:05 +01:00
Laurent Destailleur
7809b66688 Doc 2023-11-29 23:18:49 +01:00
Laurent Destailleur
3e1d5b1748 Fix for MAIN_RESTRICTHTML_ONLY_VALID_HTML 2023-11-29 23:17:22 +01:00
Laurent Destailleur
43f9210ab4 SEC: Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY 2023-11-29 20:19:21 +01:00
Laurent Destailleur
21239060df Debug v19 2023-11-28 20:56:20 +01:00