Commit graph

151292 commits

Author SHA1 Message Date
John BOTELLA
d8be14bc2b fix merge conflict 2024-10-24 11:54:34 +02:00
John BOTELLA
fbb8252588 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-24 11:52:09 +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
786e280934 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-24 10:27:21 +02:00
John BOTELLA
e469c602e6 Image top margin 2024-10-24 10:27:06 +02:00
John BOTELLA
49bdad7fa4 Merge branch 'fix_v20_pdf_space_lost_with_images' of github.com:thersane-john/dolibarr into fix_v20_pdf_space_lost_with_images_sponge 2024-10-24 10:26:10 +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
Frédéric FRANCE
ee12679f49
Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-24 09:25:05 +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
ATM-NicolasV
399d778a7e
Fix:edition rapide de la date de livraison et propagation vers la commande (#31437)
* pouvoir modifier la date de livraison au statut brouillon et propagation de la valeur lors de la création d'une commande

* remove comment

---------

Co-authored-by: ATM-nicolasV <nicolas.vidal@atm-consutling.fr>
2024-10-24 03:14:23 +02:00
Laurent Destailleur
aa096448be Merge branch '18.0' of github.com:Dolibarr/dolibarr into 18.0 2024-10-24 03:07:20 +02:00
Laurent Destailleur
d9d0618eec Fix avoid unexpected deletion on accounting account when using multicompany 2024-10-24 03:06:23 +02:00
John BOTELLA
23722b3db8
Fix v20 linked doc note info repeated (#31462)
* FIX : space used by linked elements in PDF notes

* fix data repeated on object public note
2024-10-24 02:54:31 +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
e8f7237c63 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:58:08 +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
Thomas C.
39afafc585
FIX: If you have no stock of your product, an error is displayed when you delete the reception. (#31504)
* fix

* delete

* f

* indent

* indent
2024-10-23 23:11:02 +02:00
HENRY Florian
b37b2ba76f
fix: test on const with space.... (#31505) 2024-10-23 23:08:05 +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
Anthony Berton
1778401423
FIX---PHP-warning-multiprice-in-liste-product-if-level-is-not-defined-on-product (#31507)
* FIX - PHP warning multiprice in liste product if level is not defined on product

* Update list.php

---------

Co-authored-by: Anthony Berton <anthony.berton@bb2a.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-23 23:06:00 +02:00
atm-corentin
c48b035a15
FIX issue on action set condition in particular when you set a deposi… (#31518)
* fix issue on action set condition in particular when you set a deposit cond on propal

* fix some identation issues

* fix retour github actions pre commit

* Update card.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
2024-10-23 22:59:46 +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
a11e369e5c FIX Salary - Payment card - Missing date (#31512)
* FIX Salary - Payment card - Missing date

* Coryright
2024-10-23 20:51:28 +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
56ebe9bb5a
Merge remote-tracking branch 'upstream/develop' into extrafields_object_filter 2024-10-23 20:26:36 +02:00
Frédéric FRANCE
2b72b69870
add tpl search dir (#31522) 2024-10-23 20:26:14 +02:00
Alexandre SPANGARO
201d7bf901
FIX #31452 Predefined supplier invoice - Langage key & link to supplier card (#31514) 2024-10-23 20:25:48 +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