Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
124,136 Commits 35 Branches 179 Tags 1.7 GiB
5df2850dca
Commit Graph

12339 Commits

Author SHA1 Message Date
Laurent Destailleur
64fb9d0db7 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-11 13:45:16 +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
Laurent Destailleur
f3911bccc8 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-10 15:11:40 +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
Laurent Destailleur
d2b3920684 Merge 2023-12-29 16:51:05 +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
8be16aea52 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-06 15:20:00 +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
6eec24a2c4 Fix CSS 2023-11-21 16:33:42 +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
be509634a4 Fix phpunit 2023-11-18 02:13:49 +01:00
Laurent Destailleur
05f6575abe Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-18 01:21:35 +01:00
Laurent Destailleur
29e3386e6f Fix #26584 Fix #26673 2023-11-18 01:21:17 +01:00
Frédéric FRANCE
5ae8da372a
fix phpcs (#26697) 2023-11-18 00:42:52 +01:00
Saami PERDRIX
57eb6136a4
Trigger on update note (#26666) 
* ajout trigger sur update_note

* nom des triggers adapté selon objet
 2023-11-17 14:14:28 +01:00
Laurent Destailleur
042d583070 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:38 +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
Laurent Destailleur
2f340a1a77 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
	htdocs/comm/propal/card.php
 2023-11-12 23:06:31 +01:00
HENRY Florian
5a23bb27b0
fix: bad sql on delete discount (#26517) 2023-11-09 14:51:42 +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
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
am97
ee3bd43473
FIX user creation when LDAP is configured (#26332) 2023-10-23 18:39:22 +02:00
Laurent Destailleur
d3dd3dacfe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-10 22:52:04 +02:00
Laurent Destailleur
793922d468 Fix for compatibility 2023-10-09 09:20:37 +02:00
Laurent Destailleur
b3368514ab NEW Add option MAIN_MAIL_DEBUG_LOG_WITH_DATE to add 1 log file per email 2023-10-09 09:13:27 +02:00
Noé Courtier
06bbb9517b FIX: Use of line->insert instead of line->create 2023-10-06 17:02:26 +02:00
Laurent Destailleur
f4166de704 Fix warning 2023-10-06 16:21:39 +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
a0248fe9e3
Merge pull request #26036 from atm-sami/NEW_add_data_in_printObjectLine_hook 
add extrafields and defaulttpldir for hook parameters
 2023-10-02 18:29:50 +02:00
Laurent Destailleur
998b5a6dd8 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:05:13 +02:00
Laurent Destailleur
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +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
7d69ea717b FIX avoid php8 warning 2023-09-30 11:37:53 +02:00
atm-sami
a03cef0f87
Remove extrafields in hook parameters 2023-09-29 11:12:38 +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