John BOTELLA
d8be14bc2b
fix merge conflict
2024-10-24 11:54:34 +02:00
John BOTELLA
5d53b42d7d
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-24 11:45:16 +02:00
John BOTELLA
b7f85ffbc6
fix precommit hook
2024-10-24 11:44:37 +02:00
John BOTELLA
443d27c77c
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-24 11:43:37 +02:00
John BOTELLA
76491666b3
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into fix_v20_pdf_space_lost_with_images
2024-10-24 11:36:56 +02:00
John BOTELLA
af7bcaa31a
Image top margin
2024-10-24 10:25:37 +02:00
John BOTELLA
b70b73c6d0
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-24 10:23:14 +02:00
John BOTELLA
8a6119b1b0
Image top margin
2024-10-24 10:21:41 +02:00
omogenot
6b6d2398e1
Update pdf.lib.php ( #31530 )
...
Fix pdf_build_address function to use company address information should the contact information be empty.
This could occurs should a user define a hook that sets the contact object to null from the passed by reference $Parameters['targetcontact']
2024-10-24 03:16:23 +02:00
Frédéric FRANCE
c0a5e58a41
fix phpstan add exclude for level 6 ( #31482 )
...
* fix phpstan add exclude for level 6
* fix phpstan
* fix phpstan
* fix phpstan
* fix phpstan
* fix phpstan
2024-10-24 02:51:38 +02:00
Laurent Destailleur
109321cc6b
Merge commit
2024-10-24 01:40:45 +02:00
MDW
f3dc9a9e45
Qual: fix phan notices in interface_50_modAgenda_ActionsAuto.class ( #31478 )
...
# Qual: fix phan notices in interface_50_modAgenda_ActionsAuto.class
Fix several notices in interface_50_modAgenda_ActionsAuto.class with typing hints.
2024-10-24 01:32:10 +02:00
Laurent Destailleur
b45811b356
Removed not used property
2024-10-24 01:26:53 +02:00
Laurent Destailleur
75fcbdd3d4
Removed not used property
2024-10-24 01:19:10 +02:00
Laurent Destailleur
bfc3efeaf3
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
2024-10-24 01:13:16 +02:00
Laurent Destailleur
ff4344d5c8
Clean code
2024-10-24 01:12:58 +02:00
Frédéric FRANCE
e2ac3330a8
fix phpstan ( #31480 )
2024-10-24 00:27:53 +02:00
Frédéric FRANCE
2f81c32315
fix phpstan ( #31481 )
...
* fix phpstan
* fix phpstan
2024-10-24 00:26:36 +02:00
Baptiste Boulongne
853f62dfac
FIX #31486 Add missing url params considering filtertype ( #31488 )
...
Add missing url params to the BOM's create product (or service) button taking into account the filtertype
2024-10-24 00:20:55 +02:00
mikygee
d55f90b460
Bug fix #31369 date_solde not taken into account when sent through API ( #31490 )
...
* Bug fix #31369 date_solde not taken into account when sent through API
* Move $account->date_solde = time() above
---------
Co-authored-by: mikael <mikael@expevelidv751.expertinet.net>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-23 23:52:08 +02:00
Frédéric FRANCE
12ca029fb0
fix phpstan ( #31491 )
...
* fix phpstan
* fix phpstan
* fix phpstan
* fix phpstan
* fix phpstan
2024-10-23 23:28:38 +02:00
Frédéric FRANCE
b1c4912afc
fix phpstan ( #31493 )
...
* fix phpstan
* fix phpstan
2024-10-23 23:26:48 +02:00
Lucas Marcouiller
6c38fcf909
fix some diplay for skill and evaluation ( #31498 )
...
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-10-23 23:23:23 +02:00
Frédéric FRANCE
042eb90fe0
Update actions_massactions.inc.php ( #31502 )
...
* Update actions_massactions.inc.php
* Update massactions_pre.tpl.php
2024-10-23 23:22:04 +02:00
Lucas Marcouiller
c9ea1845c6
Fix bad way to update and create for skill ( #31503 )
...
* Fix bad way to update and create for skill
* add token to remove skill from job
* Update skill_tab.php
---------
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-23 23:20:44 +02:00
Lucas Marcouiller
dad1634994
New add link to smaller period of time in some project activity pages ( #31506 )
...
Co-authored-by: Hystepik <lmarcouiller@nltechno.com>
2024-10-23 23:07:37 +02:00
omogenot
f869034c8c
FIX: Make html form warehouse select filter between closed and opened work if const ENTREPOT_EXTRA_STATUS not set ( #31508 )
...
* Update html.formproduct.class.php
Fix filter status variable that is reset if global constant ENTREPOT_EXTRA_STATUS is not set. This prevents the warehouse list to display only opened or closed warehouse is the global const is not set.
* Update html.formproduct.class.php
Fix typo
2024-10-23 21:00:56 +02:00
Alexandre SPANGARO
5e13ea5556
FIX Salary - Card - Hide button "Make Transfert Request" if status is paid ( #31510 )
2024-10-23 20:54:03 +02:00
Alexandre SPANGARO
7f0d75c638
FIX Salary - Payment card - Missing date ( #31512 )
...
* FIX Salary - Payment card - Missing date
* Coryright
2024-10-23 20:49:49 +02:00
MaximilienR-easya
dcf708d7f4
NEW #31103 ( #31516 )
...
* New ticket admin configuration of the auto assign option
* Change to correspond the PR ##31140
2024-10-23 20:47:44 +02:00
Frédéric FRANCE
2b72b69870
add tpl search dir ( #31522 )
2024-10-23 20:26:14 +02:00
Anthony Berton
5ff9207199
NEW - order list det is stable ( #31521 )
...
Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
2024-10-23 20:25:17 +02:00
MDW
cb9ad5c259
Qual: Fix spelling ( #31515 )
...
# Qual: Fix spelling
Fix some typos in the comments (codespell).
2024-10-23 20:23:07 +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
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
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
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
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