diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 2479ac8e287..8367a09e27f 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -420,18 +420,6 @@ if ($_GET['action'] == 'del_ligne' && $user->rights->propale->creer) propale_pdf_create($db, $_GET['propalid'], $propal->modelpdf); } -// Action obsolète ? - -/* -if ($_POST['action'] == 'set_discount' && $user->rights->propale->creer) -{ - $propal = new Propal($db); - $propal->fetch($_GET['propalid']); - $propal->set_remise($user, $_POST['remise']); - propale_pdf_create($db, $_GET['propalid'], $propal->modelpdf); -} -*/ - if ($_POST['action'] == 'set_project') { $propal = new Propal($db); @@ -617,9 +605,9 @@ if ($_GET['propalid'] > 0) print ''.$langs->trans('Info').''; if ($societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$societe->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$societe->getCurrentDiscount(); + $absolute_discount=$societe->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 90565c7bda8..3082a65311d 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -528,9 +528,9 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) print ''.$langs->trans('Info').''; if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$soc->getCurrentDiscount(); + $absolute_discount=$soc->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; @@ -867,9 +867,9 @@ else print ''.$langs->trans('Info').''; if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$soc->getCurrentDiscount(); + $absolute_discount=$soc->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index 88776ec43f7..657a887759e 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -134,9 +134,9 @@ if ($_GET["id"] > 0) print ''.$langs->trans('Info').''; if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$soc->getCurrentDiscount(); + $absolute_discount=$soc->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a2df804a77d..fffd49e6874 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -743,9 +743,9 @@ if ($_GET['action'] == 'create') print ''.$langs->trans('Info').''; if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$soc->getCurrentDiscount(); + $absolute_discount=$soc->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; @@ -1343,9 +1343,9 @@ else print ''.$langs->trans('Info').''; if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$soc->getCurrentDiscount(); + $absolute_discount=$soc->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index ebc89e4a964..6ed32e87d05 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -198,9 +198,9 @@ if ($_GET["propalid"] > 0) print ''.$langs->trans('Info').''; if ($societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$societe->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$societe->getCurrentDiscount(); + $absolute_discount=$societe->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0d80b4fb48f..62029cf5d0d 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -346,9 +346,9 @@ if ($_GET["action"] == 'create') print ''.$langs->trans('Info').''; if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$soc->getCurrentDiscount(); + $absolute_discount=$soc->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; @@ -595,9 +595,9 @@ else print ''.$langs->trans('Info').''; if ($contrat->societe->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$contrat->societe->remise_client); else print $langs->trans("CompanyHasNoRelativeDiscount"); - $aboslute_discount=$contrat->societe->getCurrentDiscount(); + $absolute_discount=$contrat->societe->getCurrentDiscount(); print '. '; - if ($aboslute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print ''; diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 60fbd7bcf0e..780a2d7a0fa 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -78,7 +78,7 @@ CustomerRelativeDiscountShort=Remise relative CustomerAbsoluteDiscountShort=Remise fixe CompanyHasRelativeDiscount=Ce client a une remise par défaut de %s%% CompanyHasNoRelativeDiscount=Ce client n'a pas de remises par défaut -CompanyHasAbsoluteDiscount=Ce client a %s %s de remises disponibles +CompanyHasAbsoluteDiscount=Ce client a %s %s de remises fixes disponibles CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus de remises fixes disponibles CustomerAbsoluteDiscountAllUsers=Remises en cours (accordées par tout utilisateur) CustomerAbsoluteDiscountMy=Remises en cours (accordées personnellement)