lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix warning

Browse Source
This commit is contained in:
Laurent Destailleur 2020-12-16 10:55:33 +01:00
parent 1b69b1c2fe
commit bf01ad8790
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/facture/class/facture.class.php
View File

@ -868,7 +868,7 @@ class Facture extends CommonInvoice
$line->situation_percent,
$line->fk_prev_id,
$line->fk_unit,
$line->pu_ht_devise,
$line->multicurrency_subprice,
$line->ref_ext
);
if ($result < 0)
@ -968,7 +968,7 @@ class Facture extends CommonInvoice
$_facrec->lines[$i]->situation_percent,
'',
$_facrec->lines[$i]->fk_unit,
$_facrec->lines[$i]->pu_ht_devise
$_facrec->lines[$i]->multicurrency_subprice
);
if ($result_insert < 0)
@ -2971,7 +2971,7 @@ class Facture extends CommonInvoice
* @param int $situation_percent Situation advance percentage
* @param int $fk_prev_id Previous situation line id reference
* @param string $fk_unit Code of the unit to use. Null to use the default one
* @param double $pu_ht_devise Unit price in currency
* @param double $pu_ht_devise Unit price in foreign currency
* @param string $ref_ext External reference of the line
* @return int <0 if KO, Id of line if OK
*/

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

@ -398,7 +398,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
$sql .= ", ".$conf->entity;
$sql .= ", '".$this->db->escape($this->type)."'";
$sql .= ", '".$this->db->escape($this->label ? $this->label : $this->libelle)."'";
$sql .= ", '".$this->db->escape(isset($this->label) ? $this->label : (isset($this->libelle) ? $this->libelle : ''))."'";
$sql .= ", ".$this->socid;
$sql .= ", '".$this->db->idate($now)."'";
$sql .= ", '".$this->db->idate($this->date)."'";
@ -497,7 +497,7 @@ class FactureFournisseur extends CommonInvoice
$this->lines[$i]->date_end,
$this->lines[$i]->array_options,
$this->lines[$i]->fk_unit,
$this->lines[$i]->pu_ht_devise
$this->lines[$i]->multicurrency_subprice
);
} else {
$this->error = $this->db->lasterror();
@ -2467,7 +2467,7 @@ class FactureFournisseur extends CommonInvoice
$xnbp = 0;
while ($xnbp < $nbp)
{
$line = new FactureLigne($this->db);
$line = new SupplierInvoiceLine($this->db);
$line->desc = $langs->trans("Description")." ".$xnbp;
$line->qty = 1;
$line->subprice = 100;
@ -2807,8 +2807,7 @@ class SupplierInvoiceLine extends CommonObjectLine
public $fk_facture_fourn;
/**
* Product label
* This field may contains label of product (when invoice create from order)
* This field may contains label of line (when invoice create from order)
* @var string
*/
public $label;
@ -2961,6 +2960,7 @@ class SupplierInvoiceLine extends CommonObjectLine
public $multicurrency_total_tva;
public $multicurrency_total_ttc;
/**
* Constructor
*