diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index a56552b3fa0..a5e976c820a 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -350,18 +350,18 @@ if ($socidp > 0)
// Remise permanente
print '
| ';
print '';
- print ' | '.$objsoc->remise_client." % | ";
+ print ''.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).' | ';
print '
';
// Remise avoirs
print '| ';
print '';
@@ -370,7 +370,7 @@ if ($socidp > 0)
$amount_discount=$objsoc->getcurrentDiscount();
if ($amount_discount < 0) dolibarr_print_error($db,$societe->error);
if ($amount_discount > 0) print $amount_discount.' '.$langs->trans("Currency".$conf->monnaie);
- else print $langs->trans("None");
+ else print $langs->trans("DiscountNone");
print ' | ';
print '
';
diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php
index 7c71b055dc8..438ec2aaf65 100644
--- a/htdocs/facture.class.php
+++ b/htdocs/facture.class.php
@@ -281,42 +281,6 @@ class Facture
}
- /*
- * \todo Plus utilisé. A reprendre dans validation facture
- */
- function _affect_remise_exceptionnelle()
- {
- $error = 0;
-
- $this->db->begin();
-
- $sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
- $sql .= ' SET fk_facture = '.$this->id.',';
- $sql .= " amount_ht = '".price2num($remise)."'";
- $sql .= ' WHERE rowid ='.$this->remise_exceptionnelle[0];
- $sql .= ' AND fk_soc ='. $this->socidp;
-
- if (! $this->db->query( $sql))
- {
- $error++;
- }
-
- if ($reliquat > 0)
- {
- }
-
- if (! $error)
- {
- $this->db->commit();
- }
- else
- {
- $this->db->rollback();
- }
-
- return $error;
- }
-
/**
* \brief Recupére l'objet facture et ses lignes de factures
* \param rowid id de la facture a récupérer