Commit graph

151292 commits

Author SHA1 Message Date
Lucas Marcouiller
4d047feca7
Fix bad sql whe exporting salaries (#31526)
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-10-23 20:20:54 +02:00
Laurent Destailleur
58c0b97300 FIX for #31237 #31524 2024-10-23 20:17:40 +02:00
Frédéric FRANCE
4f07ec967b
Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-23 19:06:40 +02:00
Frédéric FRANCE
3fcb57f911
wip 2024-10-23 19:06:21 +02:00
Frédéric FRANCE
80171b5fe5
Update modCaptchaStandard.class.php (#31528)
* Update modCaptchaStandard.class.php

* Update modCaptchaStandard.class.php
2024-10-23 18:51:20 +02:00
Frédéric FRANCE
05c4dbcf09
new ajax search with infinite scroll 2024-10-22 22:45:51 +02:00
Frédéric FRANCE
12a9b43dee
new ajax search with infinite scroll 2024-10-22 22:37:48 +02:00
Frédéric FRANCE
a7ee5b6a29
new ajax search with infinite scroll 2024-10-22 22:29:41 +02:00
Frédéric FRANCE
6b2767c3d2
Merge remote-tracking branch 'origin/extrafields_object_filter' into extrafields_object_filter 2024-10-22 21:46:10 +02:00
Frédéric FRANCE
2a0d4bf2ae
new ajax search with infinite scroll 2024-10-22 21:46:04 +02:00
John BOTELLA
007159a060 Merge branch 'fix_v20_pdf_space_lost_with_images_eratosthene2' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-22 14:33:41 +02:00
John BOTELLA
57849c1738 Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_eratosthene2 2024-10-22 14:32:10 +02:00
Frédéric FRANCE
6f95ffe650
Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-22 10:22:54 +02:00
John BOTELLA
21aa2f680f
Merge branch '20.0' into fix_v20_pdf_space_lost_with_images 2024-10-22 09:01:47 +02:00
John BOTELLA
9ee4f2bd03 Fix breaks on edge 2024-10-21 09:05:28 +02:00
John BOTELLA
2b85f401af Fix breaks on edge 2024-10-21 09:03:49 +02:00
John BOTELLA
a1a2d2f99e Fix breaks on edge 2024-10-21 08:59:27 +02:00
Frédéric FRANCE
bd2567528a
Merge branch 'develop' into extrafields_object_filter 2024-10-20 10:32:28 +02:00
Frédéric FRANCE
a185fb4296
fix phpstan (#31479)
* fix phpstan

* fix phpstan
2024-10-20 10:13:40 +02:00
MDW
76d801dcb3
Qual: Fix phan by adding typing hints, fix arguments (#31466)
* Do not analyze custom

* Update baseline, ignore everything in custom

* Qual: Fix notices in files related to ticket class

* Qual: Add typing hints to tpl files + other 'fixes'

* Qual: fix typing issu gy typing intermediate variable
2024-10-20 01:57:12 +02:00
MDW
fb3972b702
Qual: Fix phan notices in some payment/strip related classes (#31453)
* fix concat

* fix overwrite

* Clean code

* Do not analyze custom

* Update baseline, ignore everything in custom

* Qual: Fix notices in files related to ticket class

* Qual: Fix companybankaccount.class

* Fix phan/phpstan notices

---------

Co-authored-by: Frédéric FRANCE <frederic34@users.noreply.github.com>
Co-authored-by: Frédéric FRANCE <frederic.france@free.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-20 00:32:01 +02:00
Laurent Destailleur
c44e0e1d0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-20 00:31:15 +02:00
Laurent Destailleur
a30da69104 Fix phan 2024-10-20 00:30:59 +02:00
Frédéric FRANCE
bc06268df6
fix concat and CI 🔧 (#31469)
* fix concat

* fix overwrite

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-20 00:20:48 +02:00
Laurent Destailleur
28ee30dfd2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-20 00:20:32 +02:00
Laurent Destailleur
acac575512 Fix phan 2024-10-20 00:20:16 +02:00
omogenot
cd9e54b1a2
FIX: Replenishment lib class does not extract data from already received supplier orders (#31440)
* Update replenishment.lib.php

* Fix wrong table column name from fk_command to fk_element for table receptiondet_batch
* use error free  getDolGlobalString to access global variable to replace $conf->global access.

* Update replenishment.lib.php

Fix typo

* Update replenishment.lib.php

Use getDolGlobalInt instead of getDolGlobalString for numeric constant

* Update replenishment.lib.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-20 00:19:01 +02:00
sonikf
710905470b
fix translation for non latin languages (#31473) 2024-10-20 00:11:53 +02:00
Frédéric FRANCE
1d197e42bb
fix shippable tooltip value overwritten (#31468) 2024-10-20 00:11:04 +02:00
Frédéric FRANCE
b0c7b8750a
fix overwritten value (#31470) 2024-10-20 00:10:54 +02:00
Joachim Kueter
eb3bba03cd Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-20 00:06:34 +02:00
Laurent Destailleur
df2211e9f2 Fix phan 2024-10-20 00:05:00 +02:00
Laurent Destailleur
4db9323706 Fix phan 2024-10-20 00:03:46 +02:00
Laurent Destailleur
37880a7964 Debug v21 2024-10-19 23:42:26 +02:00
Laurent Destailleur
1d7169d051 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 20:48:41 +02:00
Laurent Destailleur
4a00350859 Fix test on malware 2024-10-19 20:48:05 +02:00
Laurent Destailleur
560829cacf Fix test on malware 2024-10-19 20:46:10 +02:00
Laurent Destailleur
b30798a2eb Test 2024-10-19 20:26:15 +02:00
Laurent Destailleur
53bf3e819e Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-19 20:17:29 +02:00
Laurent Destailleur
88d0636dcc Fix travis 2024-10-19 19:40:04 +02:00
Laurent Destailleur
992dc88491 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-10-19 15:33:12 +02:00
Laurent Destailleur
76ec55b81e Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 15:31:00 +02:00
Laurent Destailleur
c160da91ed Change URL for module blacklist feature 2024-10-19 15:29:43 +02:00
Laurent Destailleur
786291506a WIP: Feature to report malware 2024-10-19 15:16:50 +02:00
Laurent Destailleur
22c4d8f814 Merge 2024-10-19 14:56:14 +02:00
Laurent Destailleur
11d01197e3 Split code to avoid false positive 2024-10-19 14:51:30 +02:00
Laurent Destailleur
c70973c0c8 Merge v20 2024-10-19 14:44:55 +02:00
Laurent Destailleur
a294cadcc1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 14:33:05 +02:00
Laurent Destailleur
17c50368c1 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0 2024-10-19 14:32:08 +02:00
Laurent Destailleur
85f1338b19 Fix var_dump 2024-10-19 14:29:59 +02:00