From 7556fa493c56e9f2cb316cb76d2a827d158c3d21 Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Wed, 8 Sep 2004 12:01:11 +0000 Subject: [PATCH] =?UTF-8?q?Ajoute=20automatiquement=20la=20remise=20client?= =?UTF-8?q?=20lors=20de=20l'ajout=20d'une=20ligne=20si=20la=20remise=20ind?= =?UTF-8?q?iqu=E9e=20est=20inf=E9rieure=20=E0=20la=20remise=20client?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/facture.class.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index 166c4291895..4363bc27341 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -176,7 +176,7 @@ class Facture if ( $result_insert < 0) { - dolibarr_print_error($this->db); + dolibarr_print_error($this->db); } } /* @@ -590,8 +590,22 @@ class Facture $remise = 0; $_price = $pu; $subprice = $pu; + + $remise_percent = trim($remise_percent); - if (trim(strlen($remise_percent)) > 0) + if ($this->socidp) + { + $soc = new Societe($this->db); + $soc->fetch($this->socidp); + $remise_client = $soc->remise_client; + if ($remise_client > $remise_percent) + { + $remise_percent = $remise_client ; + } + } + + + if ($remise_percent > 0) { $remise = ($pu * $remise_percent / 100); $_price = ($pu - $remise);