2
0
forked from Wavyzz/dolibarr
Commit Graph

30293 Commits

Author SHA1 Message Date
Laurent Destailleur
fcf024ef4f Merge pull request #27742 from FHenry/17_fix_online_link
fix: onligne Signaturelink is bad for locaorexternal
2024-01-23 17:13:44 +01:00
Florian HENRY
a5422d2fc4 fix: onligne Signaturelink is bad for locaorexternal 2024-01-23 11:37:44 +01:00
Laurent Destailleur
90ddcaab8b Merge pull request #27647 from FHenry/17.0_fix_filter_entity
FIX: filter by entity on contact is missing
2024-01-19 18:02:48 +01:00
William Mead
e222842864 Added fk_facture_source to invoice exports. Added contributor details. 2024-01-19 09:43:26 +01:00
Florian HENRY
26bb72d12f FIX: filter by entity on contact is missing 2024-01-19 09:17:21 +01:00
Florian HENRY
d04cfa89ce FIX: filter by entity on contact is missing 2024-01-19 09:15:30 +01:00
Laurent Destailleur
a2cdfa5492 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2024-01-18 15:59:40 +01:00
Laurent Destailleur
387a06fdc5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2024-01-18 15:59:10 +01:00
Laurent Destailleur
7c0ccba344 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2024-01-18 15:58:19 +01:00
Eric Seigne
5a04b2393d end fix #10417 : custom payment number for supplier invoices 2024-01-15 18:43:17 +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
Noé
c2f3ce1491 FIX: BarCode Header not well displayed 2024-01-09 15:38:35 +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
e732a3b989 Merge pull request #27000 from W1W1-M/fix-pdf-cornas-page-head-cell-width
FIX pdf cornas page head multicell width (backport v17)
2023-12-06 15:39:47 +01:00
William Mead
f74073f1a3 Added contributor details 2023-12-06 15:18:25 +01:00
William Mead
b53420e64e Refactored & adjusted page head width 2023-12-06 15:17:29 +01:00
Laurent Destailleur
388eb1119e Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-12-06 15:10:46 +01:00
Laurent Destailleur
ea0c97a5d5 FIX #26735 FIX #26994 2023-12-06 15:10:30 +01:00
Laurent Destailleur
3d08acb69e Fix menu auguria 2023-12-04 20:55:30 +01:00
moreauf
97434c89bd 17.0: Correct bug in init_menu_auguria.sql Impossible to activate Menu 2023-12-04 12:29:22 +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
3294b721ac Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-23 18:46:57 +01:00
atm-jonathan
48ba0ec2d0 FIX warning param $lineID getSpecialCode is negatif (#26826)
* FIX warning param $lineID getSpecialCode is negatif

* retour de PR

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2023-11-23 17:12:57 +01:00
atm-jonathan
253ebd0a8b FIX warning php8.2 undefined_array_key (#26830) 2023-11-23 17:08:07 +01:00
Laurent Destailleur
4129813564 Fix missing parameter $filter 2023-11-21 17:07:10 +01:00
Laurent Destailleur
146c78a3de Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-20 19:54:27 +01:00
Laurent Destailleur
d1a80920ff Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-20 19:53:50 +01:00
Florian Mortgat
564d930d33 FIX escape HTML tags in return value of getFullName() (#26735) 2023-11-18 23:55:25 +01:00
Maxime Kohlhaas
ef1916f0db Fix : translated product desc was overwriting desc even if text was added after (#26687) 2023-11-18 14:15:34 +01:00
Laurent Destailleur
1b91a9f83b Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-18 01:24:59 +01:00
Maxime Kohlhaas
a680d1e34d Fix strpos inversion for expedition and receipt in files.lib (#26701) 2023-11-18 00:42:15 +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
Maxime Kohlhaas
de0b733430 Fix : missing getEntity for hrm public holiday (#26627) 2023-11-16 23:27:20 +01:00
MDW
c4542895d7 Fix recurrent supplier invoice generation (title) (#26601) 2023-11-16 15:43:48 +01:00
HENRY Florian
7c43aa86c9 fix: mising delete inventory perms with MAIN_USE_ADVANCED_PERMS (#26617)
* fix: mising delete inventory perms

* fix: mising delete inventory perms
2023-11-16 15:31:20 +01:00
Laurent Destailleur
201ad75360 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/accountancy/journal/expensereportsjournal.php
2023-11-12 23:02:18 +01:00
Laurent Destailleur
bd2285ab91 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-11-12 22:58:37 +01:00
Laurent Destailleur
1dbb3f1f34 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/product/stock/stockatdate.php
2023-11-12 22:58:23 +01:00
Laurent Destailleur
17ca6f651c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-11-12 22:18:06 +01:00