Merge pull request #32818 from frederic34/clean_phpstan_baseline

clean phpstan baseline
This commit is contained in:
Laurent Destailleur 2025-01-29 00:04:03 +01:00 committed by GitHub
commit 91324505b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
33 changed files with 250 additions and 1061 deletions

File diff suppressed because it is too large Load Diff

View File

@ -3,7 +3,7 @@
* Copyright (C) 2012 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2012-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2023 Nick Fragoulis
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
*
@ -905,9 +905,9 @@ abstract class CommonInvoice extends CommonObject
/**
* Return label of object status
*
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
* @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, 1 otherwise)
* @return string Label of status
* @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
* @param int|float $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here float amount paid if you have it, 1 otherwise)
* @return string Label of status
*/
public function getLibStatut($mode = 0, $alreadypaid = -1)
{
@ -921,7 +921,7 @@ abstract class CommonInvoice extends CommonObject
* @param int $paye Status field paye (or $recur)
* @param int $status Id status
* @param int<0,6> $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
* @param int $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here amount paid if you have it, -1 otherwise)
* @param int|float $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommend to put here float amount paid if you have it, -1 otherwise)
* @param int $type Type invoice. If -1, we use $this->type
* @param int $nbofopendirectdebitorcredittransfer Nb of open direct debit or credit transfer
* @return string Label of status

View File

@ -1431,8 +1431,8 @@ function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w,
* @param CommonObject $object Object
* @param int $i Current line number
* @param Translate $outputlangs Object lang for output
* @param int $w Width
* @param int $h Height
* @param float $w Width
* @param float $h Height
* @param float $posx Pos x
* @param float $posy Pos y
* @param int<0,1> $hideref Hide reference

View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Nick Fragoulis
*
* This program is free software; you can redistribute it and/or modify
@ -284,9 +284,9 @@ class pdf_ban extends ModeleBankAccountDoc
* Show table for lines
*
* @param TCPDF $pdf Object PDF
* @param int $tab_top Top position of table
* @param int $tab_height Height of table (rectangle)
* @param int $nexY Y
* @param float $tab_top Top position of table
* @param float $tab_height Height of table (rectangle)
* @param float $nexY Y
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array

View File

@ -2,7 +2,7 @@
/* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2020 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Nick Fragoulis
*
* This program is free software; you can redistribute it and/or modify
@ -485,9 +485,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
* Show table for lines
*
* @param TCPDF $pdf Object PDF
* @param int $tab_top Top position of table
* @param int $tab_height Height of table (rectangle)
* @param int $nexY Y
* @param float $tab_top Top position of table
* @param float $tab_height Height of table (rectangle)
* @param float $nexY Y
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array
@ -509,7 +509,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
*
* @param TCPDF $pdf Object PDF
* @param CompanyBankAccount $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return float
*/
@ -546,9 +546,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
*
* @param TCPDF $pdf Object PDF
* @param CompanyBankAccount $object Object invoice
* @param int $posy Position depart
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
{

View File

@ -7,7 +7,7 @@
* Copyright (C) 2012 Cedric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2017-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
@ -714,9 +714,9 @@ class pdf_einstein extends ModelePDFCommandes
*
* @param TCPDF $pdf Object PDF
* @param Commande $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return int
* @return float
*/
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
@ -898,11 +898,11 @@ class pdf_einstein extends ModelePDFCommandes
*
* @param TCPDF $pdf Object PDF
* @param Commande $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
* @param float $deja_regle Montant deja regle
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @param Translate $outputlangsbis Object lang for output bis
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
{
@ -1225,7 +1225,7 @@ class pdf_einstein extends ModelePDFCommandes
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int $hidebottom Hide bottom bar of array

View File

@ -6,7 +6,7 @@
* Copyright (C) 2011 Fabrice CHERRIER
* Copyright (C) 2013-2024 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
@ -526,7 +526,7 @@ class pdf_strato extends ModelePDFContract
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (rectangle)
* @param int $nexY Y
* @param float $nexY Y
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array
@ -578,8 +578,8 @@ class pdf_strato extends ModelePDFContract
* Show footer signature of page
*
* @param TCPDF $pdf Object PDF
* @param int $tab_top tab height position
* @param int $tab_height tab height
* @param float $tab_top tab height position
* @param float $tab_height tab height
* @param Translate $outputlangs Object language for output
* @return void
*/

View File

@ -7,7 +7,7 @@
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2020 John BOTELLA
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Nick Fragoulis
*
* This program is free software; you can redistribute it and/or modify
@ -608,7 +608,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
*
* @param TCPDF $pdf Object PDF
* @param Delivery $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return void
*/
@ -639,7 +639,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int $hidebottom Hide bottom bar of array

View File

@ -6,7 +6,7 @@
* Copyright (C) 2011-2021 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 Nick Fragoulis
*
* This program is free software; you can redistribute it and/or modify
@ -609,7 +609,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
*
* @param TCPDF $pdf Object PDF
* @param Delivery $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return void
*/
@ -639,7 +639,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int $hidebottom Hide bottom bar of array

View File

@ -3,7 +3,7 @@
* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2023 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
@ -831,10 +831,10 @@ class pdf_espadon extends ModelePdfExpedition
*
* @param TCPDF $pdf Object PDF
* @param Expedition $object Object expedition
* @param int $deja_regle Amount already paid
* @param int $posy Start Position
* @param float $deja_regle Amount already paid
* @param float $posy Start Position
* @param Translate $outputlangs Object langs
* @return int Position for suite
* @return float Position for suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
@ -938,7 +938,7 @@ class pdf_espadon extends ModelePdfExpedition
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (rectangle)
* @param int $nexY Y
* @param float $nexY Y
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array

View File

@ -3,7 +3,7 @@
* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
* Copyright (C) 2024 Alexandre Spangaro <alexandre@inovea-conseil.com>
@ -716,10 +716,10 @@ class pdf_rouget extends ModelePdfExpedition
*
* @param TCPDF $pdf Object PDF
* @param Expedition $object Object expedition
* @param int $deja_regle Amount already paid
* @param int $posy Start Position
* @param float $deja_regle Amount already paid
* @param float $posy Start Position
* @param Translate $outputlangs Object langs
* @return int Position for suite
* @return float Position for suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
@ -832,7 +832,7 @@ class pdf_rouget extends ModelePdfExpedition
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (angle)
* @param int $nexY Y
* @param float $nexY Y
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array

View File

@ -2,7 +2,7 @@
/* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2016-2023 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018 Francis Appels <francis.appels@z-application.com>
* Copyright (C) 2019 Markus Welters <markus@welters.de>
* Copyright (C) 2019 Rafael Ingenleuf <ingenleuf@welters.de>
@ -902,9 +902,9 @@ class pdf_standard_expensereport extends ModeleExpenseReport
* Show table for lines
*
* @param TCPDF $pdf Object PDF
* @param int $tab_top Tab top
* @param int $tab_height Tab height
* @param int $nexY next y
* @param float $tab_top Tab top
* @param float $tab_height Tab height
* @param float $nexY next y
* @param Translate $outputlangs Output langs
* @param int $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int $hidebottom Hide bottom bar of array
@ -1025,7 +1025,7 @@ class pdf_standard_expensereport extends ModeleExpenseReport
*
* @param TCPDF $pdf Object PDF
* @param ExpenseReport $object Object expensereport
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
*/

View File

@ -8,7 +8,7 @@
* Copyright (C) 2012-2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2017-2018 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2022-2024 Anthony Berton <anthony.berton@bb2a.fr>
* Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
@ -955,10 +955,10 @@ class pdf_crabe extends ModelePDFFactures
*
* @param TCPDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @param int $heightforfooter Height for footer
* @return int Return integer <0 if KO, >0 if OK
* @param float $heightforfooter Height for footer
* @return float Return integer <0 if KO, >0 if OK
*/
protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
{
@ -1114,10 +1114,10 @@ class pdf_crabe extends ModelePDFFactures
* @param Facture $object Object invoice
* @param Translate $outputlangs Object langs for output
* @param int $default_font_size Font size
* @param int $tab3_posx pos x
* @param int $tab3_top pos y
* @param int $tab3_width width
* @param int $tab3_height height
* @param float $tab3_posx pos x
* @param float $tab3_top pos y
* @param float $tab3_width width
* @param float $tab3_height height
* @return void
*/
protected function _tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top, $tab3_width, $tab3_height)
@ -1154,10 +1154,10 @@ class pdf_crabe extends ModelePDFFactures
*
* @param TCPDF $pdf Object PDF
* @param Facture $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @param Translate $outputlangsbis Object lang for output bis
* @return int Pos y
* @return float Pos y
*/
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs, $outputlangsbis)
{
@ -1445,11 +1445,11 @@ class pdf_crabe extends ModelePDFFactures
*
* @param TCPDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Amount already paid (in the currency of invoice)
* @param int $posy Position depart
* @param float $deja_regle Amount already paid (in the currency of invoice)
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @param Translate $outputlangsbis Object lang for output bis
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis)
{

View File

@ -2040,9 +2040,9 @@ class pdf_octopus extends ModelePDFFactures
* Show table for lines
*
* @param TCPDI|TCPDF $pdf Object PDF
* @param int $tab_top Top position of table
* @param int $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $tab_top Top position of table
* @param float $tab_height Height of table (rectangle)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int<-1,1> $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int<0,1> $hidebottom Hide bottom bar of array
@ -2839,9 +2839,9 @@ class pdf_octopus extends ModelePDFFactures
* Show table for lines
*
* @param TCPDI|TCPDF $pdf Object PDF
* @param int $tab_top Top position of table
* @param int $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $tab_top Top position of table
* @param float $tab_height Height of table (rectangle)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int<-1,1> $hidetop 1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
* @param int<0,1> $hidebottom Hide bottom bar of array

View File

@ -627,7 +627,7 @@ class pdf_vinci extends ModelePDFMo
*
* @param TCPDF $pdf Object PDF
* @param Mo $object Object order
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
*/
@ -644,9 +644,9 @@ class pdf_vinci extends ModelePDFMo
*
* @param TCPDF $pdf Object PDF
* @param Mo $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return integer
* @return float
*/
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
@ -705,12 +705,12 @@ class pdf_vinci extends ModelePDFMo
/**
* Show total to pay
*
* @param TCPDF $pdf Object PDF
* @param TCPDF $pdf Object PDF
* @param Facture $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
* @param float $deja_regle Montant deja regle
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{

View File

@ -6,7 +6,7 @@
* Copyright (C) 2006-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Francis Appels <francis.appels@yahoo.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -36,36 +36,48 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php';
class pdf_tcpdflabel extends CommonStickerGenerator
{
// define 1d barcode style
/**
* @var array{position: '', align: 'C', stretch: bool, fitwidth: bool, cellfitalign: '', border: bool, hpadding: 'auto', vpadding: 'auto', fgcolor: array{0: 0, 1: 0, 2: 0}, bgcolor: bool, text: bool, font: 'helvetica', fontsize: 8, stretchtext: 4}
*/
private $_style1d = array(
'position' => '',
'align' => 'C',
'stretch' => false,
'fitwidth' => true,
'cellfitalign' => '',
'border' => false,
'hpadding' => 'auto',
'vpadding' => 'auto',
'fgcolor' => array(0, 0, 0),
'bgcolor' => false,
'text' => true,
'font' => 'helvetica',
'fontsize' => 8,
'stretchtext' => 4
'position' => '',
'align' => 'C',
'stretch' => false,
'fitwidth' => true,
'cellfitalign' => '',
'border' => false,
'hpadding' => 'auto',
'vpadding' => 'auto',
'fgcolor' => array(0, 0, 0),
'bgcolor' => false,
'text' => true,
'font' => 'helvetica',
'fontsize' => 8,
'stretchtext' => 4
);
// set style for 2d barcode
/**
* @var array{border: bool, vpadding: 'auto', hpadding: 'auto', fgcolor: array{0: 0, 1: 0, 2: 0}, bgcolor: bool, module_width: 1, module_height: 1}
*/
private $_style2d = array(
'border' => false,
'vpadding' => 'auto',
'hpadding' => 'auto',
'fgcolor' => array(0, 0, 0),
'bgcolor' => false,
'module_width' => 1, // width of a single module in points
'module_height' => 1 // height of a single module in points
'border' => false,
'vpadding' => 'auto',
'hpadding' => 'auto',
'fgcolor' => array(0, 0, 0),
'bgcolor' => false,
'module_width' => 1, // width of a single module in points
'module_height' => 1 // height of a single module in points
);
/**
* @var string
*/
private $_align2d = 'N';
/**
* @var float
*/
private $_xres = 0.4;
/**
@ -75,10 +87,10 @@ class pdf_tcpdflabel extends CommonStickerGenerator
* @param string $code code to print
* @param string $encoding type of barcode
* @param boolean $is2d true if 2d barcode
* @param int $x x position in user units
* @param int $y y position in user units
* @param int $w width in user units
* @param int $h height in user units
* @param float $x x position in user units
* @param float $y y position in user units
* @param float $w width in user units
* @param float $h height in user units
* @return void
*/
private function writeBarcode(&$pdf, $code, $encoding, $is2d, $x, $y, $w, $h)

View File

@ -176,7 +176,7 @@ class pdf_azur extends ModelePDFPropales
* Function to build pdf onto disk
*
* @param Propal $object Object to generate
* @param Translate $outputlangs Lang output object
* @param ?Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int<0,1> $hidedetails Do not show line details
* @param int<0,1> $hidedesc Do not show desc
@ -895,7 +895,7 @@ class pdf_azur extends ModelePDFPropales
*
* @param TCPDF $pdf Object PDF
* @param Propal $object Object proposal
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
*/
@ -912,9 +912,9 @@ class pdf_azur extends ModelePDFPropales
*
* @param TCPDF $pdf Object PDF
* @param Propal $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return int
* @return float
*/
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
@ -1097,11 +1097,11 @@ class pdf_azur extends ModelePDFPropales
*
* @param TCPDF $pdf Object PDF
* @param Propal $object Object propal
* @param int $deja_regle Amount already paid
* @param int $posy Start position
* @param float $deja_regle Amount already paid
* @param float $posy Start position
* @param Translate $outputlangs Object langs
* @param Translate $outputlangsbis Object lang for output bis
* @return int Position for continuation
* @return float Position for continuation
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
{
@ -1833,9 +1833,9 @@ class pdf_azur extends ModelePDFPropales
*
* @param TCPDF $pdf Object PDF
* @param Propal $object Object proposal
* @param int $posy Position depart
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
{

View File

@ -152,7 +152,7 @@ class pdf_cyan extends ModelePDFPropales
* Function to build pdf onto disk
*
* @param Propal $object Object to generate
* @param Translate $outputlangs Lang output object
* @param ?Translate $outputlangs Lang output object
* @param string $srctemplatepath Full path of source filename for generator using a template file
* @param int<0,1> $hidedetails Do not show line details
* @param int<0,1> $hidedesc Do not show desc

View File

@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2018 Quentin Vial-Gouteyron <quentin.vial-gouteyron@atm-consulting.fr>
* Copyright (C) 2023-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2023-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
*
@ -687,12 +687,12 @@ class pdf_squille extends ModelePdfReception
*
* @param TCPDF $pdf Object PDF
* @param Reception $object Object reception
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
* @param float $deja_regle Montant deja regle
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @param int $totalOrdered Total ordered
* @param int $totalAmount Total amount
* @return int Position pour suite
* @param float $totalOrdered Total ordered
* @param float $totalAmount Total amount
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $totalOrdered, $totalAmount = 0)
{

View File

@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -39,7 +39,13 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
public $version = 'dolibarr';
// variables not inherited
/**
* @var string
*/
public $prefixcustomer = 'CU';
/**
* @var string
*/
public $prefixsupplier = 'SU';

View File

@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -48,6 +48,9 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
*/
public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
* @var int
*/
public $position = 10;

View File

@ -4,7 +4,7 @@
* Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2014-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
@ -775,12 +775,12 @@ class pdf_eagle extends ModelePDFStockTransfer
*
* @param TCPDF $pdf Object PDF
* @param StockTransfer $object Object StockTransfer
* @param int $deja_regle Amount already paid
* @param int $posy Start Position
* @param float $already_paid Amount already paid / not used
* @param float $posy Start Position
* @param Translate $outputlangs Object langs
* @return int Position for suite
* @return float Position for suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
protected function _tableau_tot(&$pdf, $object, $already_paid, $posy, $outputlangs)
{
// phpcs:enable
$default_font_size = pdf_getPDFFontSize($outputlangs);

View File

@ -843,11 +843,11 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
/**
* Show miscellaneous information (payment mode, payment term, ...)
*
* @param TCPDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
* @return int Pos y
* @param TCPDF $pdf Object PDF
* @param StockTransfer $object Object to show
* @param int $posy Y
* @param Translate $outputlangs Langs object
* @return int Pos y
*/
protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
{
@ -1186,7 +1186,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
* Show top header of page.
*
* @param TCPDF $pdf Object PDF
* @param Object $object Object to show
* @param StockTransfer $object Object to show
* @param int<0,1> $showaddress 0=no, 1=yes
* @param Translate $outputlangs Object lang for output
* @param string $titlekey Translation key to show as title of document
@ -1207,7 +1207,7 @@ class pdf_eagle_proforma extends ModelePDFStockTransfer
pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
// Show Draft Watermark
if ($object->statut == 0 && getDolGlobalString('STOCKTRANSFER_DRAFT_WATERMARK')) {
if ($object->status == 0 && getDolGlobalString('STOCKTRANSFER_DRAFT_WATERMARK')) {
pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', getDolGlobalString('COMMANDE_DRAFT_WATERMARK'));
}

View File

@ -616,10 +616,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
*
* @param TCPDF $pdf Object PDF
* @param FactureFournisseur $object Object invoice
* @param int $deja_regle Amount already paid (in the currency of invoice)
* @param int $posy Position depart
* @param float $deja_regle Amount already paid (in the currency of invoice)
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position of cursor after output
* @return float Position of cursor after output
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
@ -946,9 +946,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
*
* @param TCPDF $pdf Object PDF
* @param Object $object Object to show
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @param int $heightforfooter Height for footer
* @param float $heightforfooter Height for footer
* @return int Return integer <0 if KO, >0 if OK
*/
protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)

View File

@ -851,7 +851,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object order
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
*/
@ -868,9 +868,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return integer
* @return float
*/
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
@ -933,10 +933,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object invoice
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
* @param float $deja_regle Montant deja regle
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{

View File

@ -714,7 +714,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object order
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
*/
@ -731,9 +731,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object to show
* @param int $posy Y
* @param float $posy Y
* @param Translate $outputlangs Langs object
* @return integer
* @return float
*/
protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
{
@ -795,10 +795,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
*
* @param TCPDF $pdf Object PDF
* @param CommandeFournisseur $object Object CommandeFournisseur
* @param int $deja_regle Amount already paid
* @param int $posy Position depart
* @param float $deja_regle Amount already paid
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{
@ -1000,7 +1000,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
* @param TCPDF $pdf Object PDF
* @param float|int $tab_top Top position of table
* @param float|int $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array

View File

@ -4,7 +4,7 @@
* Copyright (C) 2010-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2022 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 Nick Fragoulis
*
@ -517,9 +517,9 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
*
* @param TCPDF $pdf Object PDF
* @param PaiementFourn $object Object PaiementFourn
* @param int $posy Position depart
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_cheque(&$pdf, $object, $posy, $outputlangs)
{
@ -578,9 +578,9 @@ class pdf_standard_supplierpayment extends ModelePDFSuppliersPayments
* Show table for lines
*
* @param TCPDF $pdf Object PDF
* @param integer $tab_top Top position of table
* @param integer $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)
* @param float $tab_top Top position of table
* @param float $tab_height Height of table (rectangle)
* @param float $nexY Y (not used)
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array

View File

@ -833,7 +833,7 @@ class pdf_zenith extends ModelePDFSupplierProposal
*
* @param TCPDF $pdf Object PDF
* @param SupplierProposal $object Object supplier propsal
* @param int $posy Position y in PDF
* @param float $posy Position y in PDF
* @param Translate $outputlangs Object langs for output
* @return int Return integer <0 if KO, >0 if OK
*/
@ -915,10 +915,10 @@ class pdf_zenith extends ModelePDFSupplierProposal
*
* @param TCPDF $pdf Object PDF
* @param SupplierProposal $object Object supplier proposal
* @param int $deja_regle Montant deja regle
* @param int $posy Position depart
* @param float $deja_regle Montant deja regle
* @param float $posy Position depart
* @param Translate $outputlangs Object langs
* @return int Position pour suite
* @return float Position pour suite
*/
protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
{

View File

@ -3,7 +3,7 @@
* Copyright (C) 2022 Charlene Benke <charlene@patas-monkey.com>
* Copyright (C) 2023 Maxime Nicolas <maxime@oarces.com>
* Copyright (C) 2023 Benjamin GREMBI <benjamin@oarces.com>
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
* This program is free software; you can redistribute it and/or modify
@ -31,6 +31,14 @@
* $arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
* $file
*/
/**
* @var int<0,1> $diroutput
* @var string $defaulttopic
* @var string $defaulttopiclang
* @var string[] $arrayoffamiliestoexclude
* @var string $file
* @var CommonObject $object
*/
'
@phan-var-force int<0,1> $diroutput
@phan-var-force string $defaulttopic

View File

@ -11,7 +11,7 @@
* Copyright (C) 2015 Claudio Aschieri <c.aschieri@19.coop>
* Copyright (C) 2016-2024 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2020 Lenin Rivas <lenin@leninrivas.com>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
@ -1716,6 +1716,7 @@ class Expedition extends CommonObject
$num = $this->db->num_rows($resql);
$i = 0;
$line = new ExpeditionLigne($this->db);
$lineindex = 0;
$originline = 0;
@ -1741,8 +1742,8 @@ class Expedition extends CommonObject
$line->qty_shipped += $obj->qty_shipped;
} else {
$line = new ExpeditionLigne($this->db); // new group to start
$line->entrepot_id = $obj->fk_entrepot; // this is a property of a shipment line
$line->qty_shipped = $obj->qty_shipped; // this is a property of a shipment line
$line->entrepot_id = $obj->fk_entrepot; // this is a property of a shipment line
$line->qty_shipped = $obj->qty_shipped; // this is a property of a shipment line
}
$detail_entrepot = new stdClass();
@ -1772,7 +1773,7 @@ class Expedition extends CommonObject
$line->product_ref = $obj->product_ref;
$line->product_label = $obj->product_label;
$line->libelle = $obj->product_label; // TODO deprecated
$line->product_barcode = $obj->product_barcode; // Barcode number product
$line->product_barcode = $obj->product_barcode; // Barcode number product
$line->product_tosell = $obj->product_tosell;
$line->product_tobuy = $obj->product_tobuy;
$line->product_tobatch = $obj->product_tobatch;

View File

@ -1,9 +1,10 @@
<?php
/* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
/* Copyright (C) 2004-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2025 Frédéric France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

View File

@ -9,13 +9,13 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (C) 2018-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2018-2022 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2021 Josep Lluís Amador <joseplluis@lliuretic.cat>
* Copyright (C) 2022 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
* Copyright (C) 2024 Solution Libre SAS <contact@solution-libre.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
* Copyright (C) 2024 William Mead <william.mead@manchenumerique.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -553,16 +553,16 @@ class CommandeFournisseur extends CommonOrder
$this->user_validation_id = $obj->user_validation_id;
$this->user_approve_id = $obj->user_approve_id;
$this->user_approve_id2 = $obj->user_approve_id2;
$this->total_ht = $obj->total_ht;
$this->total_tva = $obj->total_tva;
$this->total_localtax1 = $obj->localtax1;
$this->total_localtax2 = $obj->localtax2;
$this->total_ttc = $obj->total_ttc;
$this->total_ht = $obj->total_ht;
$this->total_tva = $obj->total_tva;
$this->total_localtax1 = $obj->localtax1;
$this->total_localtax2 = $obj->localtax2;
$this->total_ttc = $obj->total_ttc;
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_valid = $this->db->jdate($obj->date_valid);
$this->date_approve = $this->db->jdate($obj->date_approve);
$this->date_approve2 = $this->db->jdate($obj->date_approve2);
$this->date_commande = $this->db->jdate($obj->date_commande); // date we make the order to supplier
$this->date_approve = $this->db->jdate($obj->date_approve);
$this->date_approve2 = $this->db->jdate($obj->date_approve2);
$this->date_commande = $this->db->jdate($obj->date_commande); // date we make the order to supplier
if (isset($obj->date_commande)) {
$this->date = $this->date_commande;
} else {
@ -1372,9 +1372,11 @@ class CommandeFournisseur extends CommonOrder
$this->ref = $this->newref;
if ($movetoapprovestatus) {
$this->statut = self::STATUS_ACCEPTED;
$this->statut = self::STATUS_ACCEPTED; // deprecated
$this->status = self::STATUS_ACCEPTED;
} else {
$this->statut = self::STATUS_VALIDATED;
$this->statut = self::STATUS_VALIDATED; // deprecated
$this->status = self::STATUS_VALIDATED;
}
if (empty($secondlevel)) { // standard or first level approval
$this->date_approve = $now;
@ -1531,7 +1533,8 @@ class CommandeFournisseur extends CommonOrder
dol_syslog(get_class($this)."::commande", LOG_DEBUG);
if ($this->db->query($sql)) {
$this->statut = self::STATUS_ORDERSENT;
$this->statut = self::STATUS_ORDERSENT; // deprecated
$this->status = self::STATUS_ORDERSENT;
$this->methode_commande_id = $methode;
$this->date_commande = $date;
$this->context = array('comments' => $comment);
@ -1827,7 +1830,7 @@ class CommandeFournisseur extends CommonOrder
$sql .= " localtax2=".(isset($this->total_localtax2) ? $this->total_localtax2 : "null").",";
$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
$sql .= " fk_statut=".(isset($this->status) ? $this->status : "null").",";
$sql .= " fk_user_author=".(isset($this->user_author_id) ? $this->user_author_id : "null").",";
$sql .= " fk_user_valid=".(isset($this->user_validation_id) && $this->user_validation_id > 0 ? $this->user_validation_id : "null").",";
$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
@ -1923,7 +1926,8 @@ class CommandeFournisseur extends CommonOrder
}
$this->id = 0;
$this->statut = self::STATUS_DRAFT;
$this->statut = self::STATUS_DRAFT; // deprecated
$this->status = self::STATUS_DRAFT;
// Clear fields
$this->user_author_id = $user->id;
@ -2007,7 +2011,7 @@ class CommandeFournisseur extends CommonOrder
dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
if ($this->statut == self::STATUS_DRAFT) {
if ($this->status == self::STATUS_DRAFT) {
include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
// Clean parameters
@ -2128,9 +2132,9 @@ class CommandeFournisseur extends CommonOrder
$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', (empty($this->fk_soc) ? $this->socid : $this->fk_soc));
if ($qty < $prod->packaging) {
$qty = $prod->packaging;
$qty = (float) $prod->packaging;
} else {
if (!empty($prod->packaging) && (fmod((float) $qty, $prod->packaging) > 0.000001)) {
if (!empty($prod->packaging) && (fmod((float) $qty, (float) $prod->packaging) > 0.000001)) {
$coeff = intval((float) $qty / $prod->packaging) + 1;
$qty = (float) $prod->packaging * $coeff;
setEventMessages($langs->trans('QtyRecalculatedWithPackaging'), null, 'mesgs');
@ -2211,8 +2215,9 @@ class CommandeFournisseur extends CommonOrder
$this->line->total_localtax2 = (float) $total_localtax2;
$this->line->total_ttc = (float) $total_ttc;
$this->line->product_type = $type;
$this->line->special_code = (!empty($special_code) ? $special_code : 0);
$this->line->special_code = (!empty($special_code) ? $special_code : 0);
$this->line->origin = $origin;
$this->line->origin_type = $origin;
$this->line->origin_id = $origin_id;
$this->line->fk_unit = $fk_unit;
@ -2258,8 +2263,7 @@ class CommandeFournisseur extends CommonOrder
return -1;
}
} else {
$this->error = $this->line->error;
$this->errors = $this->line->errors;
$this->setErrorsFromObject($this->line);
dol_syslog(get_class($this)."::addline error=".$this->error, LOG_ERR);
$this->db->rollback();
return -1;
@ -2312,7 +2316,7 @@ class CommandeFournisseur extends CommonOrder
$inventorycode = dol_print_date(dol_now(), 'dayhourlog');
if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY)) {
if (($this->status == self::STATUS_ORDERSENT || $this->status == self::STATUS_RECEIVED_PARTIALLY || $this->status == self::STATUS_RECEIVED_COMPLETELY)) {
$this->db->begin();
$sql = "INSERT INTO ".$this->db->prefix()."receptiondet_batch";
@ -2386,7 +2390,7 @@ class CommandeFournisseur extends CommonOrder
{
global $user;
if ($this->statut == 0) {
if ($this->status == 0) {
$line = new CommandeFournisseurLigne($this->db);
if ($line->fetch($idline) <= 0) {
@ -2679,8 +2683,8 @@ class CommandeFournisseur extends CommonOrder
$resql = $this->db->query($sql);
if ($resql) {
$result = 1;
$old_statut = $this->statut;
$this->statut = $statut;
$old_statut = $this->status;
$this->status = $statut;
$this->context['actionmsg2'] = $comment;
// Call trigger
@ -2693,7 +2697,7 @@ class CommandeFournisseur extends CommonOrder
if (empty($error)) {
$this->db->commit();
} else {
$this->statut = $old_statut;
$this->status = $old_statut;
$this->db->rollback();
$this->error = $this->db->lasterror();
$result = -1;
@ -2931,7 +2935,7 @@ class CommandeFournisseur extends CommonOrder
}
if (!$error) {
$this->statut = $status;
$this->status = $status;
$this->db->commit();
return 1;
} else {
@ -2971,7 +2975,7 @@ class CommandeFournisseur extends CommonOrder
$error = 0;
if ($this->statut == self::STATUS_DRAFT) {
if ($this->status == self::STATUS_DRAFT) {
// Clean parameters
if (empty($qty)) {
$qty = 0;
@ -3192,7 +3196,7 @@ class CommandeFournisseur extends CommonOrder
$this->multicurrency_tx = 1;
$this->multicurrency_code = $conf->currency;
$this->statut = 0;
$this->statut = 0; // deprecated
$this->status = 0;
// Lines
@ -3354,7 +3358,8 @@ class CommandeFournisseur extends CommonOrder
while ($obj = $this->db->fetch_object($resql)) {
$commandestatic->delivery_date = $this->db->jdate($obj->delivery_date);
$commandestatic->date_commande = $this->db->jdate($obj->date_commande);
$commandestatic->statut = $obj->fk_statut;
$commandestatic->statut = $obj->fk_statut; // deprecated
$commandestatic->status = $obj->fk_statut;
$response->nbtodo++;
$response->total += $obj->total_ht;
@ -3535,7 +3540,7 @@ class CommandeFournisseur extends CommonOrder
{
global $conf;
if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
if ($this->status == self::STATUS_ORDERSENT || $this->status == self::STATUS_RECEIVED_PARTIALLY) {
$now = dol_now();
if (!empty($this->delivery_date)) {
$date_to_test = $this->delivery_date;
@ -3549,7 +3554,7 @@ class CommandeFournisseur extends CommonOrder
$now = dol_now();
$date_to_test = $this->date_commande;
return ($this->statut > 0 && $this->statut < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
return ($this->status > 0 && $this->status < 5) && $date_to_test && $date_to_test < ($now - $conf->commande->fournisseur->warning_delay);
}
}
@ -3568,7 +3573,7 @@ class CommandeFournisseur extends CommonOrder
$text = '';
if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
if ($this->status == self::STATUS_ORDERSENT || $this->status == self::STATUS_RECEIVED_PARTIALLY) {
if (!empty($this->delivery_date)) {
$text = $langs->trans("DeliveryDate").' '.dol_print_date($this->delivery_date, 'day');
} else {

View File

@ -14,7 +14,7 @@
* Copyright (C) 2014 Ion agorria <ion@agorria.com>
* Copyright (C) 2016-2024 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2017 Gustavo Novaro
* Copyright (C) 2019-2024 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2019-2025 Frédéric France <frederic.france@free.fr>
* Copyright (C) 2023 Benjamin Falière <benjamin.faliere@altairis.fr>
* Copyright (C) 2024 MDW <mdeweerd@users.noreply.github.com>
*
@ -324,7 +324,7 @@ class Product extends CommonObject
public $fourn_multicurrency_code;
/**
* @var float
* @var ?float
*/
public $packaging;
@ -672,6 +672,11 @@ class Product extends CommonObject
*/
public $stats_facture_fournisseur = array();
/**
* @var array{}|array{suppliers:int,nb:int,rows:int,qty:float} stats supplier invoices rec
*/
public $stats_facturefournrec = array();
/**
* @var int|string Size of image / height
*/