Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 00:53:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
123,984 Commits 37 Branches 191 Tags
3dbfbe965aeffca951fdada3c53f94ceed2f6818
Commit Graph

9798 Commits

Author SHA1 Message Date
Laurent Destailleur
a257dcfa48 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-23 18:48:52 +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
Laurent Destailleur
1c7239e6ff Fix type 2023-11-23 17:19:10 +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
57de870989 FIX Test on permission for holiday tooltips 2023-11-21 16:20:21 +01:00
Laurent Destailleur
c1aefa75a7 FIX delivery note disappear after generation 2023-11-20 21:49:25 +01:00
Laurent Destailleur
cabd0937d0 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-20 19:59:34 +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
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
Maxime Kohlhaas
c756aa8ad3 Fix tasklist extrafields (#26672) 
* Fix : value of extrafields not displayed in task list on a project

* Fix : icon to select columns was not displayed
 2023-11-17 16:39:49 +01:00
Laurent Destailleur
ac248dfd90 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-11-17 12:03:56 +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
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
Eric
337fa2ac67 add category map to categorie (#26649) 2023-11-17 03:44:15 +01:00
Maxime Kohlhaas
de0b733430 Fix : missing getEntity for hrm public holiday (#26627) 2023-11-16 23:27:20 +01:00
Laurent Destailleur
061f340f90 Debug v19 2023-11-13 15:20:56 +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
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
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
9c7381601f Backport or better module compatibility 2023-11-05 19:35:34 +01:00
Laurent Destailleur
f9d520b29d Fix warning 2023-11-05 18:27:53 +01:00
Laurent Destailleur
0b9795f34c FIX upload of files src_object_type 2023-10-31 11:52:31 +01:00
Laurent Destailleur
85d36ddc58 FIX src_object_id and ttype not filed when uploading a file with API. 2023-10-31 11:52:17 +01:00
Laurent Destailleur
6822afac31 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-26 13:48:33 +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
Laurent Destailleur
8abde02b85 FIX dol_eval with function starting with ! 2023-10-18 16:26:27 +02:00
Laurent Destailleur
6311200b36 FIX #26170 2023-10-12 14:31:54 +02:00
Laurent Destailleur
feb5d6aa99 Fix Better protection if decryption fails 2023-10-10 14:55:23 +02:00
Laurent Destailleur
f7e4353b10 Doc 2023-10-10 14:49:11 +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
78db102acd Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-04 13:03:27 +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
9bd3bb0594 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/compta/bank/various_payment/card.php
	htdocs/compta/bank/various_payment/list.php
	htdocs/core/lib/security.lib.php
	htdocs/core/lib/signature.lib.php
 2023-10-04 12:43:03 +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
Laurent Destailleur
f6f25e1117 Fix regression 2023-10-04 10:34:47 +02:00
Laurent Destailleur
517b19cc6f Fix regression 2023-10-04 10:33:38 +02:00
Laurent Destailleur
726258ff4f Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/core/lib/signature.lib.php
 2023-10-04 10:32:24 +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