Laurent Destailleur
20eef11950
Fix phan
2024-07-13 18:04:13 +02:00
Laurent Destailleur
a0e4cc9d00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/projet/tasks/time.php
2024-07-13 17:49:14 +02:00
Laurent Destailleur
5661a381ee
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/projet/tasks/time.php
2024-07-13 17:47:55 +02:00
Laurent Destailleur
305406d802
Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2024-07-13 17:45:13 +02:00
Laurent Destailleur
88ee5ec89a
Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0
2024-07-13 17:41:37 +02:00
Florent Poinsaut
23eeabe476
FIX #30362 Fix an user with user->rights->projet->lire can see task
...
time from other user on all project (#30363 )
Conflicts:
htdocs/projet/tasks/time.php
2024-07-13 17:40:55 +02:00
Florent Poinsaut
5f5074b048
FIX #30362 Fix an user with user->rights->projet->lire can see task time from other user on all project ( #30363 )
2024-07-13 17:28:25 +02:00
Laurent Destailleur
413b430cc7
Fix Phan
2024-07-13 17:25:48 +02:00
lvessiller-opendsi
09fdb887bb
FIX expedition PDF models using units labels ( #30358 )
2024-07-13 17:18:05 +02:00
Laurent Destailleur
085a56fab4
Fix phpunit
2024-07-13 17:16:18 +02:00
Frédéric FRANCE
f91c96842f
fix typo ( #30368 )
2024-07-13 17:11:20 +02:00
Laurent Destailleur
d48b976966
Fix phpunit
2024-07-13 02:32:31 +02:00
Laurent Destailleur
f00f82a3b6
Fix phpunit
2024-07-13 02:23:55 +02:00
Laurent Destailleur
7879e12bd2
Fix phpunit
2024-07-13 02:22:26 +02:00
Laurent Destailleur
0fe143d710
Fix doc
2024-07-13 02:10:44 +02:00
Laurent Destailleur
d90ae09a52
FIX Bad format of amount in invoice create page
2024-07-13 01:59:22 +02:00
Laurent Destailleur
73562b8734
FIX Missing trunc to $max
2024-07-13 01:59:15 +02:00
Laurent Destailleur
ba08148ffa
Clean code
2024-07-13 01:38:02 +02:00
Laurent Destailleur
33edcbdd59
FIX Missing trunc to $max
2024-07-13 01:32:21 +02:00
Laurent Destailleur
13e8ae7bb9
FIX Bad format of amount in invoice create page
2024-07-13 01:19:39 +02:00
Laurent Destailleur
680a776a26
Better information on security page
2024-07-13 01:09:22 +02:00
Laurent Destailleur
dd4089348a
Doc
2024-07-12 02:02:02 +02:00
Laurent Destailleur
a391143007
Removed dol_json_encode/decode in favor of native json_encode/decode
2024-07-12 02:01:09 +02:00
Laurent Destailleur
e3d858692e
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
2024-07-12 01:54:11 +02:00
Laurent Destailleur
7661b87f80
QUAL Removed inclusion of the file json.lib.php
2024-07-12 01:53:47 +02:00
Laurent Destailleur
07483c90d4
Add deprecated mention
2024-07-12 01:46:43 +02:00
Laurent Destailleur
d3ebd3fbe7
SEC: Possible RCE when php module json off. +Warning in security page.
2024-07-12 01:43:53 +02:00
Laurent Destailleur
decfb347e1
Move function
2024-07-11 19:50:17 +02:00
atm-lucas
f05c1b4aec
FIX - Unknown Character on HTML ( #30257 )
...
* Unknown Character
* Add replace on dol_htmlwithnojs
2024-07-11 19:36:50 +02:00
Laurent Destailleur
147a8bfaee
Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/subscription/list.php
htdocs/categories/viewcat.php
htdocs/contrat/card.php
htdocs/contrat/list.php
htdocs/eventorganization/conferenceorbooth_list.php
htdocs/expedition/list.php
htdocs/societe/card.php
2024-07-11 10:44:39 +02:00
iouston
2335ea3067
FIX public project form return an error if SOCIETE_EMAIL_UNIQUE ( #29942 )
...
* FIX Bug - public project form return an error if SOCIETE_EMAIL_UNIQUE
if SOCIETE_EMAIL_UNIQUE is 1, this form returns an error because the third party already exists.
* after comment from eldy
2024-07-11 10:26:46 +02:00
Laurent Destailleur
3b98b16b35
NEW Add country in search of project
2024-07-11 10:10:39 +02:00
Laurent Destailleur
263c1e5445
Fix travis
2024-07-11 00:49:57 +02:00
Alexandre SPANGARO
128769811c
Add css bodylist on list ( #30334 )
...
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-11 00:45:05 +02:00
Laurent Destailleur
f338532d21
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2024-07-10 23:21:42 +02:00
Laurent Destailleur
06bb3aa431
Make file contributing clearer.
2024-07-10 23:21:23 +02:00
Alexandre SPANGARO
013835e547
Use HasRight() ( #30333 )
2024-07-10 18:59:04 +02:00
Zephyriony
f2d622f176
Uniform select name across statistics pages ( #30335 )
2024-07-10 18:57:43 +02:00
Zephyriony
1a3c4d5289
Add doActions on ticket stats ( #30336 )
2024-07-10 18:57:14 +02:00
Frédéric FRANCE
38b01c0979
Update codespell-ignore.txt with develop list of words ( #30337 )
...
* Update codespell-ignore.txt with develop list of words
* Update codespell-ignore.txt
2024-07-10 18:54:33 +02:00
HENRY Florian
32aaab75b5
fix: hidden option MAIN_KEEP_REF_CUSTOMER_ON_CLONING always win on pr… ( #30340 )
...
* fix: hidden option MAIN_KEEP_REF_CUSTOMER_ON_CLONING always win on propal clone even if it's for enother customer
* Update propal.class.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-10 18:53:57 +02:00
kkhelifa-opendsi
572061ff80
NEW: Add ID of the line in the trigger context for addLine(), updateLine() and deleteLine() on contract ( #30343 )
2024-07-10 18:49:49 +02:00
HENRY Florian
8bce9c3866
fix: When update failed (extrafield check failed or 'date end' before 'date start' values inputed are lost ( #30346 )
...
* fix: When update failed (extrafield check failed or 'date end' before 'date start'valur inputed are lost
* fix: When update failed (extrafield check failed or 'date end' before 'date start'valur inputed are lost
* fix: When update failed (extrafield check failed or 'date end' before 'date start' values inputed are lost
* fix: When update failed (extrafield check failed or 'date end' before 'date start' values inputed are lost
* Update card.php
---------
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-07-10 18:48:57 +02:00
Frédéric FRANCE
c3d89d8b3a
fix phpstan expects int, null ... ( #30312 )
2024-07-09 20:46:47 +02:00
Mohamed DAOUD
2f351ae4dc
editinline message ( #30330 )
2024-07-09 19:38:23 +02:00
Alexandre SPANGARO
0b0818506a
Add llxHeader body css for event organization ( #30321 )
2024-07-09 19:37:34 +02:00
Alexandre SPANGARO
fce19af830
Use HasRight() ( #30322 )
...
* Use HasRight()
* se HasRight()
2024-07-09 19:30:34 +02:00
Frédéric FRANCE
fbbdf7fb3e
fix cti ( #30323 )
2024-07-09 19:29:35 +02:00
Frédéric FRANCE
94feb2cfa7
fix phpstan expects values ( #30324 )
...
* fix phpstan expects values
* fix phpstan expects values
2024-07-09 19:28:59 +02:00
Frédéric FRANCE
6601503edc
Fix phpstan llxheader ( #30328 )
...
* fix phpstan for llxHeader
* fix phpstan for llxHeader
* fix phpstan for llxFooter
2024-07-09 19:28:09 +02:00
