Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2022-04-02 16:17:04 +02:00
commit 7745203c16

View File

@ -243,6 +243,7 @@ class FactureFournisseurRec extends CommonInvoice
// Clean parameters // Clean parameters
$this->titre = empty($this->titre) ? '' : $this->titre; $this->titre = empty($this->titre) ? '' : $this->titre;
$this->ref = $this->{$this->table_ref_field};
$this->ref_supplier = empty($this->ref_supplier) ? '' : $this->ref_supplier; $this->ref_supplier = empty($this->ref_supplier) ? '' : $this->ref_supplier;
$this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice; $this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice;
$this->suspended = empty($this->suspended) ? 0 : $this->suspended; $this->suspended = empty($this->suspended) ? 0 : $this->suspended;
@ -584,6 +585,7 @@ class FactureFournisseurRec extends CommonInvoice
$this->id = $obj->rowid; $this->id = $obj->rowid;
$this->titre = $obj->titre; $this->titre = $obj->titre;
$this->ref = $this->{$this->table_ref_field};
$this->ref_supplier = $obj->ref_supplier; $this->ref_supplier = $obj->ref_supplier;
$this->entity = $obj->entity; $this->entity = $obj->entity;
$this->socid = $obj->fk_soc; $this->socid = $obj->fk_soc;
@ -673,7 +675,6 @@ class FactureFournisseurRec extends CommonInvoice
return $this->fetch_lines(); return $this->fetch_lines();
} }
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
/** /**
* Get lines of template invoices into this->lines * Get lines of template invoices into this->lines