Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

11706 Commits

Author SHA1 Message Date
Laurent Destailleur
2f1eecd709 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-09 19:04:06 +01:00
Frédéric FRANCE
b92b8c443d fix cunits.class.php (backport) (#28068) 2024-02-08 13:09:39 +01:00
Laurent Destailleur
5a756ffc4c Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/takepos/invoice.php
 2024-02-07 17:44:39 +01:00
Laurent Destailleur
7b178844e8 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-02-01 12:16:50 +01:00
Laurent Destailleur
07d0093fbc Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-02-01 12:14:30 +01:00
Laurent Destailleur
ab585b6efc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-02-01 12:11:25 +01:00
Eric Seigne
8d9ddf4a51 fix comment about datehour -> datetime 2024-01-30 21:35:19 +01:00
atm-florian
101c5a2dca FIX 17.0 - php8 warnings: test for $field existence before checking if it is null or empty 2024-01-30 16:21:51 +01:00
Laurent Destailleur
0cc66bbed6 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-15 14:35:18 +01:00
Laurent Destailleur
2de0c09e8e Try a better fix for #27477 2024-01-13 15:44:37 +01:00
MDW
72210dc19b Fix: discount - add missing db parameter to dol_print_error (#27337) 
# Fix: discount - add missing db parameter to dol_print_error

dol_print_error requires the db instance to be the first parameter
 2024-01-10 16:57:10 +01:00
Florian HENRY
053e0981ad fix: pregmatch all always return empty array, muxt be tested like in findHtmlImages 2024-01-04 11:49:10 +01:00
Florian HENRY
43fceaf468 fix: pregmatch all always return empty array, muxt be tested like in findHtmlImages 2024-01-04 11:47:43 +01:00
Florian HENRY
06037295c4 Merge branch '17.0' of https://github.com/Dolibarr/dolibarr into 17_fix_img_in_mail 2023-12-13 11:34:41 +01:00
Florian HENRY
67ad440381 typo 2023-12-13 11:33:18 +01:00
Florian HENRY
6bb952bf9a typo 2023-12-13 11:32:48 +01:00
Florian HENRY
82c49e62d1 add unit test for image in email with src=../media/ or src=base64 2023-12-13 11:31:42 +01:00
Laurent Destailleur
ea0c97a5d5 FIX #26735 FIX #26994 2023-12-06 15:10:30 +01:00
Florian HENRY
9bbd285c3a fix: feature MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS was broken 2023-12-02 15:53:22 +01:00
Laurent Destailleur
4129813564 Fix missing parameter $filter 2023-11-21 17:07:10 +01:00
Florian Mortgat
564d930d33 FIX escape HTML tags in return value of getFullName() (#26735) 2023-11-18 23:55:25 +01:00
Laurent Destailleur
3a0b3fd8a8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:36 +01:00
Laurent Destailleur
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
HENRY Florian
102356d2c4 fix: When sendmail failed it return false, result is KO, need to say it to user (#26631) 
* fix: When sendmail failed it return false, need to be tested as is

* fix: When sendmail failed it return false, so >=0 do not trigger error

* fix: When sendmail failed it return false, so >=0 do not trigger error

* Update CMailFile.class.php

* Update actions_sendmails.inc.php

* Update actions_sendmails.inc.php

* Update CMailFile.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-17 12:01:03 +01:00
Laurent Destailleur
7c68dc3d1e Fix phpcs 2023-11-17 01:17:23 +01:00
Laurent Destailleur
144be811fc Fix phpcs 2023-11-17 00:54:15 +01:00
MDW
c4542895d7 Fix recurrent supplier invoice generation (title) (#26601) 2023-11-16 15:43:48 +01:00
Regis Houssin
56e9df9091 FIX avoid warning : Cannot use a scalar value as an array (#26437) 2023-11-07 18:53:37 +01:00
am97
ee3bd43473 FIX user creation when LDAP is configured (#26332) 2023-10-23 18:39:22 +02:00
Laurent Destailleur
793922d468 Fix for compatibility 2023-10-09 09:20:37 +02:00
Noé Courtier
06bbb9517b FIX: Use of line->insert instead of line->create 2023-10-06 17:02:26 +02:00
Laurent Destailleur
4298150413 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:22:33 +02:00
Laurent Destailleur
5e76fea64d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-01 15:53:36 +02:00
Laurent Destailleur
5560aab98e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-01 15:50:25 +02:00
Laurent Destailleur
b0b3d0e1e0 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-01 15:43:40 +02:00
Regis Houssin
9eb4c93c1c FIX add warning in the changelog 2023-09-27 09:44:58 +02:00
Regis Houssin
19e2f0c75c FIX missing contact_id for the trigger 2023-09-27 08:54:54 +02:00
Regis Houssin
bcc97f8b9f FIX wrong place of trigger delete 2023-09-26 23:49:21 +02:00
Laurent Destailleur
9300411ce3 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-26 20:45:16 +02:00
Laurent Destailleur
eed96efc9b Add log to try to debug trouble with triggers 2023-09-26 13:04:03 +02:00
Laurent Destailleur
257a961a93 Fix error management 2023-09-22 02:32:23 +02:00
Laurent Destailleur
97dde30c16 Fix warning 2023-09-09 15:52:52 +02:00
ATM-Nicolas
2487d5cbc4 FIX : SQL request parenthesis 2023-08-17 13:53:13 +02:00
Laurent Destailleur
9671cd730b Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-10 02:09:46 +02:00
Laurent Destailleur
2761f993e9 FIX creation of invoice from contract with discount lines 2023-08-10 02:09:17 +02:00
Regis Houssin
75ea7e52b2 FIX not create/update extrafields for visibility 0,2 and 5 2023-08-09 13:18:42 +02:00
Regis Houssin
38ddc9cea1 FIX avoid php8 warnings (#25596) 2023-08-09 12:36:26 +02:00
Laurent Destailleur
1998248e96 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-12 16:36:23 +02:00
Regis Houssin
76d6a30d48 FIX to avoid wrong path of file (#25320) 2023-07-12 16:30:34 +02:00
Laurent Destailleur
b10e7b9d57 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-07-06 22:10:18 +02:00