Fix CI
This commit is contained in:
parent
0229e015ac
commit
7ad71279a7
3 changed files with 8 additions and 6 deletions
|
|
@ -2240,6 +2240,8 @@ while ($i < $imaxinloop) {
|
|||
break; // Should not happen
|
||||
}
|
||||
|
||||
$typenArray = $formcompany->typent_array(1);
|
||||
|
||||
$notshippable = 0;
|
||||
$warning = 0;
|
||||
$text_info = '';
|
||||
|
|
|
|||
|
|
@ -2744,11 +2744,11 @@ class Facture extends CommonInvoice
|
|||
$sql .= " paye=".(isset($this->paye) ? $this->db->escape((string) $this->paye) : 0).",";
|
||||
$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 .= " total_tva=".(isset($this->total_tva) ? (float) $this->total_tva : "null").",";
|
||||
$sql .= " total_tva=".((float) $this->total_tva).",";
|
||||
$sql .= " localtax1=".(isset($this->total_localtax1) ? (float) $this->total_localtax1 : "null").",";
|
||||
$sql .= " localtax2=".(isset($this->total_localtax2) ? (float) $this->total_localtax2 : "null").",";
|
||||
$sql .= " total_ht=".(isset($this->total_ht) ? (float) $this->total_ht : "null").",";
|
||||
$sql .= " total_ttc=".(isset($this->total_ttc) ? (float) $this->total_ttc : "null").",";
|
||||
$sql .= " total_ht=".((float) $this->total_ht).",";
|
||||
$sql .= " total_ttc=".((float) $this->total_ttc).",";
|
||||
$sql .= " revenuestamp=".((isset($this->revenuestamp) && $this->revenuestamp != '') ? (float) $this->revenuestamp : "null").",";
|
||||
$sql .= " fk_statut=".(isset($this->status) ? (int) $this->status : "null").",";
|
||||
$sql .= " fk_user_author=".(isset($this->user_creation_id) ? ((int) $this->user_creation_id) : "null").",";
|
||||
|
|
|
|||
|
|
@ -120,11 +120,11 @@ abstract class CommonInvoice extends CommonObject
|
|||
*/
|
||||
public $total_tva;
|
||||
/**
|
||||
* @var float
|
||||
* @var float|null
|
||||
*/
|
||||
public $total_localtax1;
|
||||
/**
|
||||
* @var float
|
||||
* @var float|null
|
||||
*/
|
||||
public $total_localtax2;
|
||||
/**
|
||||
|
|
@ -132,7 +132,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
*/
|
||||
public $total_ttc;
|
||||
/**
|
||||
* @var float
|
||||
* @var float|null
|
||||
*/
|
||||
public $revenuestamp;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue