vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #26091 from elkoiko/fix-warnings-contrat-and-contratligne

Browse source 
FIX warnings for undefined properties in Contrat and ContratLigne
This commit is contained in:
Laurent Destailleur 2023-10-04 09:46:11 +02:00 committed by GitHub
commit ee4d662ca7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
htdocs/contrat/class/contrat.class.php
View file

@ -1757,7 +1757,7 @@ class Contrat extends CommonObject
}
// if buy price not defined, define buyprice as configured in margin admin
if ($this->pa_ht == 0) {
if ($pa_ht == 0) {
if (($result = $this->defineBuyPrice($pu, $remise_percent)) < 0) {
return $result;
} else {
@ -3303,7 +3303,6 @@ class ContratLigne extends CommonObjectLine
$this->statut = $obj->statut;
$this->product_ref = $obj->product_ref;
$this->product_label = $obj->product_label;
$this->product_description = $obj->product_description;
$this->product_type = $obj->product_type;
$this->label = $obj->label; // deprecated. We do not use this field. Only ref and label of product, and description of contract line
$this->description = $obj->description;
@ -3440,7 +3439,7 @@ class ContratLigne extends CommonObjectLine
// qty, pu, remise_percent et txtva
// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
$localtaxes_type = getLocalTaxesFromRate($this->txtva, 0, $this->thirdparty, $mysoc);
$localtaxes_type = getLocalTaxesFromRate($this->tva_tx, 0, $this->thirdparty, $mysoc);
$tabprice = calcul_price_total($this->qty, $this->price_ht, $this->remise_percent, $this->tva_tx, $this->localtax1_tx, $this->localtax2_tx, 0, 'HT', 0, 1, $mysoc, $localtaxes_type);
$this->total_ht = $tabprice[0];