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

30419 Commits

Author SHA1 Message Date
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
lvessiller-opendsi
785c85205b FIX substitute project variables in invoice documents (#26445) 
* FIX substitute project variables in invoice documents

* Keep key to substitute if no link with project
 2023-11-08 17:32:23 +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
1a2e49cebe Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2023-11-05 19:45:42 +01:00
Laurent Destailleur
51574768f4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2023-11-05 19:40:07 +01:00
Laurent Destailleur
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
Laurent Destailleur
e080261e25 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-26 13:46:17 +02:00
HENRY Florian
7e3b098f78 fix: when option MAIN_USE_COMPANY_NAME_OF_CONTACT is set the VAT num have to be the VAT num of thirdparty of contact (#26371) 2023-10-26 12:28:00 +02:00
sonikf
21f602bf05 fix suppliers_bills_payment link (#26361) 2023-10-26 10:01:51 +02:00
am97
ee3bd43473 FIX user creation when LDAP is configured (#26332) 2023-10-23 18:39:22 +02:00
Laurent Destailleur
492bdd4a0e Merge 2023-10-20 13:14:10 +02:00
Laurent Destailleur
519836ea41 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-20 04:00:31 +02:00
Laurent Destailleur
ff03e34103 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-20 03:59:46 +02:00
Laurent Destailleur
f542b1de38 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-10-20 03:33:46 +02:00
Eric
0975b2bbb8 check if $_FILES['userfile'] is an array before getting values (#26269) 2023-10-20 02:30:15 +02:00
Eric
e4987c8f3b fix #26244 todelete could contains dupplicate val (#26245) 2023-10-18 03:05:05 +02:00
noec764
4675a93fc8 FIX: Error handling for computed values on import (#24897) 
* FIX: Error handling for computed values on import

* Fixing style errors.

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
 2023-10-15 21:18:03 +02:00
Anthony Berton
c2e5311a18 FIX - compare the result of the send mail file function 2023-10-09 11:20:10 +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
Andrés Maldonado
54a0245c4d FIX: modification of complementary attributes in commercial proposals 
The db object must not be cloned in order to avoid a PHP Fatal error:  Uncaught Exception: Serialization of 'PgSql\Connection' is not allowed

This commit replaces the dol_clone function by the one in the 17.0 branch
 2023-10-04 17:48:30 +02:00
Laurent Destailleur
2a96ac6428 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 13:02:09 +02:00
Laurent Destailleur
342cdc81ac Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-10-04 13:01:09 +02:00
Laurent Destailleur
a201f54777 css 2023-10-04 12:59:00 +02:00
Laurent Destailleur
a2ea4d77c3 Merge 2023-10-04 10:43:14 +02:00
Laurent Destailleur
0a015a82b4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-10-04 10:39:40 +02:00
Laurent Destailleur
9ac5270626 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:38:46 +02:00
Laurent Destailleur
8fc2beda1f Fix regression 2023-10-04 10:36:07 +02:00