From 5b2a44f16f543cda00f879ea8ab53dc69d1f470d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 3 Nov 2016 20:10:01 +0100 Subject: [PATCH] Fix phpunit regression --- htdocs/fourn/class/fournisseur.facture.class.php | 3 +-- htdocs/fourn/facture/card.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 534f12b3877..d8490fde20b 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -694,7 +694,6 @@ class FactureFournisseur extends CommonInvoice if (isset($this->tva)) $this->tva=trim($this->tva); if (isset($this->localtax1)) $this->localtax1=trim($this->localtax1); if (isset($this->localtax2)) $this->localtax2=trim($this->localtax2); - if (empty($this->total)) $this->total=0; if (empty($this->total_ht)) $this->total_ht=0; if (empty($this->total_tva)) $this->total_tva=0; // if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1); @@ -734,7 +733,7 @@ class FactureFournisseur extends CommonInvoice $sql.= " tva=".(isset($this->tva)?$this->tva:"null").","; $sql.= " localtax1=".(isset($this->localtax1)?$this->localtax1:"null").","; $sql.= " localtax2=".(isset($this->localtax2)?$this->localtax2:"null").","; - $sql.= " total=".(isset($this->total)?$this->total:"null").","; + //$sql.= " total=".(isset($this->total)?$this->total:"null").","; $sql.= " total_ht=".(isset($this->total_ht)?$this->total_ht:"null").","; $sql.= " total_tva=".(isset($this->total_tva)?$this->total_tva:"null").","; $sql.= " total_ttc=".(isset($this->total_ttc)?$this->total_ttc:"null").","; diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index e301c7aaa13..113c698f7f4 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -309,7 +309,7 @@ if (empty($reshook)) elseif ($action == 'setlabel' && $user->rights->fournisseur->facture->creer) { $object->fetch($id); - $object->label=$_POST['label']; + $object->label=GETPOST('label'); $result=$object->update($user); if ($result < 0) dol_print_error($db); }