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

Try for FIX #19562

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-19 20:43:24 +01:00
parent b6cfc3a3e0
commit f09e603bf4
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,14 +147,15 @@ class Facture extends CommonInvoice
//Check constants for types //Check constants for types
public $type = self::TYPE_STANDARD; public $type = self::TYPE_STANDARD;
//var $amount; // Warning: Do not set default value into property defintion. it must stay null.
// For example to avoid to have substition done when object is generic and not yet defined.
public $remise_absolue; public $remise_absolue;
public $remise_percent; public $remise_percent;
public $total_ht = 0; public $total_ht;
public $total_tva = 0; public $total_tva;
public $total_localtax1 = 0; public $total_localtax1;
public $total_localtax2 = 0; public $total_localtax2;
public $total_ttc = 0; public $total_ttc;
public $revenuestamp; public $revenuestamp;
/** /**
@ -5613,17 +5614,17 @@ class FactureLigne extends CommonInvoiceLine
$sql .= " description='".$this->db->escape($this->desc)."'"; $sql .= " description='".$this->db->escape($this->desc)."'";
$sql .= ", ref_ext='".$this->db->escape($this->ref_ext)."'"; $sql .= ", ref_ext='".$this->db->escape($this->ref_ext)."'";
$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null"); $sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
$sql .= ", subprice=".price2num($this->subprice).""; $sql .= ", subprice=".price2num($this->subprice);
$sql .= ", remise_percent=".price2num($this->remise_percent).""; $sql .= ", remise_percent=".price2num($this->remise_percent);
if ($this->fk_remise_except) { if ($this->fk_remise_except) {
$sql .= ", fk_remise_except=".$this->fk_remise_except; $sql .= ", fk_remise_except=".$this->fk_remise_except;
} else { } else {
$sql .= ", fk_remise_except=null"; $sql .= ", fk_remise_except=null";
} }
$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'"; $sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
$sql .= ", tva_tx=".price2num($this->tva_tx).""; $sql .= ", tva_tx=".price2num($this->tva_tx);
$sql .= ", localtax1_tx=".price2num($this->localtax1_tx).""; $sql .= ", localtax1_tx=".price2num($this->localtax1_tx);
$sql .= ", localtax2_tx=".price2num($this->localtax2_tx).""; $sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
$sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'"; $sql .= ", localtax1_type='".$this->db->escape($this->localtax1_type)."'";
$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'"; $sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
$sql .= ", qty=".price2num($this->qty); $sql .= ", qty=".price2num($this->qty);
@ -5645,15 +5646,15 @@ class FactureLigne extends CommonInvoiceLine
if (!empty($this->rang)) { if (!empty($this->rang)) {
$sql .= ", rang=".((int) $this->rang); $sql .= ", rang=".((int) $this->rang);
} }
$sql .= ", situation_percent=".$this->situation_percent; $sql .= ", situation_percent = ".((float) $this->situation_percent);
$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit); $sql .= ", fk_unit = ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
$sql .= ", fk_user_modif =".$user->id; $sql .= ", fk_user_modif = ".((int) $user->id);
// Multicurrency // Multicurrency
$sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice).""; $sql .= ", multicurrency_subprice=".price2num($this->multicurrency_subprice);
$sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht).""; $sql .= ", multicurrency_total_ht=".price2num($this->multicurrency_total_ht);
$sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva).""; $sql .= ", multicurrency_total_tva=".price2num($this->multicurrency_total_tva);
$sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc).""; $sql .= ", multicurrency_total_ttc=".price2num($this->multicurrency_total_ttc);
$sql .= " WHERE rowid = ".((int) $this->rowid); $sql .= " WHERE rowid = ".((int) $this->rowid);

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

@ -181,15 +181,17 @@ class FactureFournisseur extends CommonInvoice
* @var float tva * @var float tva
* @deprecated Use $total_tva * @deprecated Use $total_tva
*/ */
public $tva = 0; public $tva;
// Warning: Do not set default value into property defintion. it must stay null.
// For example to avoid to have substition done when object is generic and not yet defined.
public $localtax1; public $localtax1;
public $localtax2; public $localtax2;
public $total_ht = 0; public $total_ht;
public $total_tva = 0; public $total_tva;
public $total_localtax1 = 0; public $total_localtax1;
public $total_localtax2 = 0; public $total_localtax2;
public $total_ttc = 0; public $total_ttc;
/** /**
* @deprecated * @deprecated
@ -727,7 +729,7 @@ class FactureFournisseur extends CommonInvoice
$this->remise = $obj->remise; $this->remise = $obj->remise;
$this->close_code = $obj->close_code; $this->close_code = $obj->close_code;
$this->close_note = $obj->close_note; $this->close_note = $obj->close_note;
$this->tva = $obj->tva; //$this->tva = $obj->tva;
$this->total_localtax1 = $obj->localtax1; $this->total_localtax1 = $obj->localtax1;
$this->total_localtax2 = $obj->localtax2; $this->total_localtax2 = $obj->localtax2;
$this->total_ht = $obj->total_ht; $this->total_ht = $obj->total_ht;
@ -861,7 +863,7 @@ class FactureFournisseur extends CommonInvoice
$line->qty = $obj->qty; $line->qty = $obj->qty;
$line->remise_percent = $obj->remise_percent; $line->remise_percent = $obj->remise_percent;
$line->fk_remise_except = $obj->fk_remise_except; $line->fk_remise_except = $obj->fk_remise_except;
$line->tva = $obj->total_tva; // deprecated //$line->tva = $obj->total_tva; // deprecated
$line->total_ht = $obj->total_ht; $line->total_ht = $obj->total_ht;
$line->total_ttc = $obj->total_ttc; $line->total_ttc = $obj->total_ttc;
$line->total_tva = $obj->total_tva; $line->total_tva = $obj->total_tva;
@ -961,9 +963,9 @@ class FactureFournisseur extends CommonInvoice
if (isset($this->close_note)) { if (isset($this->close_note)) {
$this->close_note = trim($this->close_note); $this->close_note = trim($this->close_note);
} }
if (isset($this->tva)) { /*if (isset($this->tva)) {
$this->tva = trim($this->tva); $this->tva = trim($this->tva);
} }*/
if (isset($this->localtax1)) { if (isset($this->localtax1)) {
$this->localtax1 = trim($this->localtax1); $this->localtax1 = trim($this->localtax1);
} }
@ -1035,7 +1037,7 @@ class FactureFournisseur extends CommonInvoice
$sql .= " remise=".(isset($this->remise) ? $this->remise : "null").","; $sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").","; $sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").","; $sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
$sql .= " tva=".(isset($this->tva) ? $this->tva : "null").","; //$sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
$sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").","; $sql .= " localtax1=".(isset($this->localtax1) ? $this->localtax1 : "null").",";
$sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").","; $sql .= " localtax2=".(isset($this->localtax2) ? $this->localtax2 : "null").",";
$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").","; $sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
@ -3269,7 +3271,7 @@ class SupplierInvoiceLine extends CommonObjectLine
$this->qty = $obj->qty; $this->qty = $obj->qty;
$this->remise_percent = $obj->remise_percent; $this->remise_percent = $obj->remise_percent;
$this->fk_remise_except = $obj->fk_remise_except; $this->fk_remise_except = $obj->fk_remise_except;
$this->tva = $obj->total_tva; // deprecated //$this->tva = $obj->total_tva; // deprecated
$this->total_ht = $obj->total_ht; $this->total_ht = $obj->total_ht;
$this->total_tva = $obj->total_tva; $this->total_tva = $obj->total_tva;
$this->total_localtax1 = $obj->total_localtax1; $this->total_localtax1 = $obj->total_localtax1;