Commit graph

133486 commits

Author SHA1 Message Date
Laurent Destailleur
320f04b4a4
Merge pull request #27179 from atm-sami/17_FIX_too_long_output
FIX too long output
2024-01-15 17:29:46 +01:00
Laurent Destailleur
936be12f44 Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 17:21:26 +01:00
Laurent Destailleur
21efad237a Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 17:19:41 +01:00
Laurent Destailleur
e6c3c5993d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2024-01-15 17:14:27 +01:00
William Mead
e1ae23b398 Fixed PHPDoc 2024-01-15 16:55:07 +01:00
Christophe TREMBLAY-GUILLOUX
8083984f92 FIX: Remove blank line 2024-01-15 16:07:07 +01:00
Christophe TREMBLAY-GUILLOUX
2772b97bd4 FIX: typo: Swith => Switch 2024-01-15 15:52:00 +01:00
Christophe TREMBLAY-GUILLOUX
d6a79b4eac Merge remote-tracking branch 'upstream/develop' into develop 2024-01-15 15:50:48 +01:00
Christophe TREMBLAY-GUILLOUX
ee0b888b8e NEW: cronjob: deny to launch a method from a deactivated module 2024-01-15 15:38:30 +01:00
Regis Houssin
d4fd234b75 FIX missing entity filter for check if period exists 2024-01-15 15:11:27 +01:00
Greg Chanton
9e3c6f1dd6
Update balance.php
adds conditions to correctly manage column alignment following the MAIN_CHECKBOX_LEFT_COLUMN option
2024-01-15 14:53:25 +01:00
VESSILLER
09e2b49b88 Fix resolve conflicts 2024-01-15 14:45:38 +01:00
Laurent Destailleur
9a1a5fd91c Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-01-15 14:35:24 +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
88da390677 Fix error message 2024-01-15 14:34:28 +01:00
Laurent Destailleur
38fdbdaae1
Merge branch '17.0' into 17_FIX_too_long_output 2024-01-15 14:16:12 +01:00
Laurent Destailleur
6a2d7d1523
Update cronjob.class.php 2024-01-15 14:14:51 +01:00
VESSILLER
1f6c650fde Fix resolve conflicts 2024-01-15 14:05:02 +01:00
Laurent Destailleur
59100debb0
Merge pull request #27531 from vmaury/Fix_error_in_supplier_order_odt_template
Fix errors in supplier order odt template
2024-01-15 14:02:55 +01:00
Laurent Destailleur
23e8b48c5b Fix phpstan 2024-01-15 14:02:11 +01:00
Laurent Destailleur
e47c06c81d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 13:58:32 +01:00
Laurent Destailleur
96925bc645 NEW Upgrade Sabre lib to 4.6.0 2024-01-15 13:58:04 +01:00
VESSILLER
1a164eece5 Update from develop 2024-01-15 13:55:26 +01:00
William Mead
65d5d63bc2 Merge branch 'develop' into new-resource-full-address
# Conflicts:
#	htdocs/resource/class/dolresource.class.php
2024-01-15 12:20:32 +01:00
atm-sami
5453f0c628
Update cronjob.class.php 2024-01-15 12:06:11 +01:00
vmaury
cf67b09e06 Fix errors in supplier order odt template 2024-01-15 11:57:35 +01:00
Laurent Destailleur
233c52bdb2
Merge pull request #27525 from Dolibarr/dependabot/github_actions/actions/setup-node-4
Bump actions/setup-node from 3 to 4
2024-01-15 11:46:10 +01:00
Laurent Destailleur
17879abd59
Merge pull request #27524 from Dolibarr/dependabot/github_actions/actions/setup-python-5
Bump actions/setup-python from 4 to 5
2024-01-15 11:45:27 +01:00
Laurent Destailleur
8453008eff
Merge pull request #27523 from Dolibarr/dependabot/github_actions/actions/upload-artifact-4
Bump actions/upload-artifact from 3 to 4
2024-01-15 11:45:12 +01:00
Laurent Destailleur
5b04976a2a
Merge pull request #27518 from frederic34/patch-7
fix phpstan
2024-01-15 11:37:57 +01:00
Laurent Destailleur
7fecb5e44b
Merge pull request #27517 from frederic34/patch-5
fix phpstan
2024-01-15 11:37:44 +01:00
Sébastien NASSIET
790df062c7 Issue #27529
Check if $value2 is an array.
2024-01-15 11:37:19 +01:00
Laurent Destailleur
d9acb22f5d
Merge pull request #27530 from comaiteseb/patch-6
FIX #27529 Error PHP8.1 : Type Error in /space/www/2cvp/Dolibarr/htdocs/main.inc.php:2202
2024-01-15 11:36:43 +01:00
Christophe TREMBLAY-GUILLOUX
1a33117e86 File not joined : slash is missing in case DOL_DATA_ROOT doesn't end with slash 2024-01-15 11:33:30 +01:00
Laurent Destailleur
a2df2f2553 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2024-01-15 11:33:16 +01:00
Laurent Destailleur
085f7c2796
Merge pull request #27521 from libremaster/develop
File not joined : slash is missing in case DOL_DATA_ROOT doesn't end with a slash
2024-01-15 11:32:52 +01:00
Laurent Destailleur
dc9fa8a6e0
Merge pull request #27516 from frederic34/patch-3
fix phpstan
2024-01-15 11:31:31 +01:00
Laurent Destailleur
c2b29b9343
Merge pull request #27515 from frederic34/patch-1
fix phpstan
2024-01-15 11:31:15 +01:00
Laurent Destailleur
315b6850a9
Merge pull request #27514 from frederic34/patch-8
fix phpstan
2024-01-15 11:30:58 +01:00
Laurent Destailleur
3a8b3f9158
Merge pull request #27527 from W1W1-M/fix-resource-phpstan
Fix resource phpstan
2024-01-15 11:28:45 +01:00
Laurent Destailleur
3ac7706a63 Clean code 2024-01-15 11:28:25 +01:00
Sébastien NASSIET
b836f049a3
Issue #27529
Check if $value2 is an array.
2024-01-15 11:24:44 +01:00
Laurent Destailleur
179cd86cec
Merge pull request #27520 from frederic34/patch-10
fix phpstan
2024-01-15 11:04:20 +01:00
Laurent Destailleur
f47a30bd2f
Merge pull request #27526 from frederic34/patch-12
fix phpstan
2024-01-15 11:02:53 +01:00
William Mead
8111b1ebfe Merge remote-tracking branch 'origin/new-resource-full-address' into new-resource-full-address 2024-01-15 10:23:40 +01:00
William Mead
3c6e875a12 Translated code comments to english 2024-01-15 10:23:30 +01:00
William Mead
1c1c4396a9
Merge branch 'develop' into new-resource-full-address 2024-01-15 10:16:06 +01:00
Christophe Battarel
12f28e3a2e rename tablessql scripts 2024-01-15 10:00:42 +01:00
Christophe Battarel
3670ba75ba rename tables 2024-01-15 09:52:54 +01:00
Christophe Battarel
268024d424 change to receptiondet_batch into sql 2024-01-15 09:49:33 +01:00