Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2023-11-30 21:45:58 +01:00
parent f2995e50d9
commit 240869f2f2
11 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/modules/delivery/doc/pdf_storm.modules.php
View File

@ -222,11 +222,6 @@ class pdf_storm extends ModelePDFDeliveryOrder
}
}
if (count($realpatharray) == 0) {
$this->posxpicture = $this->posxweightvol;
}
// Create pdf instance
$pdf = pdf_getInstance($this->format);

4
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
View File

@ -874,9 +874,11 @@ class pdf_espadon extends ModelePdfExpedition
* @param Translate $outputlangs Langs object
* @param int $hidetop Hide top bar of array
* @param int $hidebottom Hide bottom bar of array
* @param string $currency Currency code
* @param Translate $outputlangsbis Langs object bis
* @return void
*/
protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
{
global $conf;

1
htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
View File

@ -107,7 +107,6 @@ class pdf_eagle_proforma extends ModelePDFCommandes
$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
$this->option_modereg = 1; // Display payment mode
$this->option_condreg = 1; // Display payment terms
$this->option_codeproduitservice = 1; // Display product-service code
$this->option_multilang = 1; // Available in several languages
$this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes

1
htdocs/core/modules/supplier_invoice/doc/doc_generic_supplier_invoice_odt.modules.php
View File

@ -83,7 +83,6 @@ class doc_generic_supplier_invoice_odt extends ModelePDFSuppliersInvoices
$this->option_tva = 0; // Manage the vat option FACTURE_TVAOPTION
$this->option_modereg = 0; // Display payment mode
$this->option_condreg = 0; // Display payment terms
$this->option_codeproduitservice = 0; // Display product-service code
$this->option_multilang = 1; // Available in several languages
$this->option_escompte = 0; // Displays if there has been a discount
$this->option_credit_note = 0; // Support credit notes

10
htdocs/fourn/class/fournisseur.commande.class.php
View File

@ -382,7 +382,7 @@ class CommandeFournisseur extends CommonOrder
$sql = "SELECT c.rowid, c.entity, c.ref, ref_supplier, c.fk_soc, c.fk_statut as status, c.amount_ht, c.total_ht, c.total_ttc, c.total_tva,";
$sql .= " c.localtax1, c.localtax2, ";
$sql .= " c.date_creation, c.date_valid, c.date_approve, c.date_approve2,";
$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_approve, c.fk_user_approve2,";
$sql .= " c.fk_user_author as user_author_id, c.fk_user_valid as user_validation_id, c.fk_user_approve as user_approve_id, c.fk_user_approve2 as user_approve_id2,";
$sql .= " c.date_commande as date_commande, c.date_livraison as delivery_date, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_projet as fk_project, c.remise_percent, c.source, c.fk_input_method,";
$sql .= " c.fk_account,";
$sql .= " c.note_private, c.note_public, c.model_pdf, c.extraparams, c.billed,";
@ -428,10 +428,10 @@ class CommandeFournisseur extends CommonOrder
$this->statut = $obj->status; // deprecated
$this->status = $obj->status;
$this->billed = $obj->billed;
$this->user_author_id = $obj->fk_user_author;
$this->user_validation_id = $obj->fk_user_valid;
$this->user_approve_id = $obj->fk_user_approve;
$this->user_approve_id2 = $obj->fk_user_approve2;
$this->user_author_id = $obj->user_author_id;
$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;

16
htdocs/fourn/class/fournisseur.facture.class.php
View File

@ -147,9 +147,18 @@ class FactureFournisseur extends CommonInvoice
/**
* Set to 1 if the invoice is completely paid, otherwise is 0
* @var int
* @deprecated Use $paid
*/
public $paye;
/**
* Set to 1 if the invoice is completely paid, otherwise is 0
* @var int
*/
public $paid;
/**
* @deprecated Use $user_creation_id
*/
public $author;
/**
@ -942,9 +951,9 @@ class FactureFournisseur extends CommonInvoice
$this->status = $obj->status;
$this->statut = $obj->status; // For backward compatibility
$this->fk_statut = $obj->status; // For backward compatibility
$this->fk_user_author = $obj->fk_user_author;
$this->author = $obj->fk_user_author;
$this->fk_user_valid = $obj->fk_user_valid;
$this->user_creation_id = $obj->fk_user_author;
$this->author = $obj->fk_user_author; // deprecated
$this->user_validation_id = $obj->fk_user_valid;
$this->fk_facture_source = $obj->fk_facture_source;
$this->vat_reverse_charge = empty($obj->vat_reverse_charge) ? '0' : '1';
$this->fk_fac_rec_source = $obj->fk_fac_rec_source;
@ -982,7 +991,6 @@ class FactureFournisseur extends CommonInvoice
$this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
$this->socid = $obj->socid;
$this->socnom = $obj->socnom;
// Retrieve all extrafield
// fetch optionals attributes and labels

4
htdocs/holiday/class/holiday.class.php
View File

@ -2316,9 +2316,7 @@ class Holiday extends CommonObject
if ($obj->status == Holiday::STATUS_APPROVED || $obj->status == Holiday::STATUS_CANCELED) {
if ($obj->fk_user_approval_done) {
$auser = new User($this->db);
$auser->fetch($obj->fk_user_approval_done);
$this->user_approve = $auser;
$this->fk_user_approve = $obj->fk_user_approval_done;
}
}
}

2
htdocs/main.inc.php
View File

@ -3504,7 +3504,7 @@ if (!function_exists("llxFooter")) {
*/
function llxFooter($comment = '', $zone = 'private', $disabledoutputofmessages = 0)
{
global $conf, $db, $langs, $user, $mysoc, $object, $hookmanager;
global $conf, $db, $langs, $user, $mysoc, $object, $hookmanager, $action;
global $delayedhtmlcontent;
global $contextpage, $page, $limit, $mode;
global $dolibarr_distrib;

2
htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
View File

@ -839,7 +839,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
/**
* Show table for lines
*
* @param tcpdf $pdf Object PDF
* @param tcpdf $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)

2
htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php
View File

@ -753,7 +753,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
/**
* Show table for lines
*
* @param tcpdf $pdf Object PDF
* @param tcpdf $pdf Object PDF
* @param string $tab_top Top position of table
* @param string $tab_height Height of table (rectangle)
* @param int $nexY Y (not used)

12
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -654,14 +654,14 @@ class SupplierProposal extends CommonObject
* Update a proposal line
*
* @param int $rowid Id de la ligne
* @param double $pu Prix unitaire (HT ou TTC selon price_base_type)
* @param double $pu Unit price (HT or TTC depending on price_base_type)
* @param double $qty Quantity
* @param double $remise_percent Remise effectuee sur le produit
* @param double $txtva Taux de TVA
* @param double $remise_percent Discount on line
* @param double $txtva VAT rate
* @param double $txlocaltax1 Local tax 1 rate
* @param double $txlocaltax2 Local tax 2 rate
* @param string $desc Description
* @param double $price_base_type HT ou TTC
* @param double $price_base_type HT or TTC
* @param int $info_bits Miscellaneous informations
* @param int $special_code Special code (also used by externals modules!)
* @param int $fk_parent_line Id of parent line (0 in most cases, used by modules adding sublevels into lines).
@ -671,7 +671,7 @@ class SupplierProposal extends CommonObject
* @param string $label ???
* @param int $type 0/1=Product/service
* @param array $array_options extrafields array
* @param string $ref_supplier Supplier price reference
* @param string $ref_supplier Supplier price reference
* @param int $fk_unit Id of the unit to use.
* @param double $pu_ht_devise Unit price in currency
* @return int 0 if OK, <0 if KO
@ -748,6 +748,8 @@ class SupplierProposal extends CommonObject
$line->fetch($rowid);
$line->fetch_optionals();
$fk_product = $line->fk_product;
// Stock previous line records
$staticline = clone $line;