diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index a5fe47b37f7..3d47b5175f8 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -125,7 +125,7 @@ if ($_GET["action"] == 'create') $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); print ''; - // Remise relative + // Réductions relatives (Remises-Ristournes-Rabbais) $relative_discount=$soc->remise_client; print ''.$langs->trans("CustomerRelativeDiscount").''; print ''; @@ -141,7 +141,7 @@ if ($_GET["action"] == 'create') } print ''; - // Remise avoirs + // Réductions absolues (Remises-Ristournes-Rabbais) $absolute_discount=$soc->getCurrentDiscount(); print ''.$langs->trans("CustomerAbsoluteDiscount").''; print ''; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 694bfc15ee6..17d9b406896 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -287,7 +287,7 @@ if ($socidp > 0) print ""; print ''; - // Remise permanente + // Réductions relative (Remises-Ristournes-Rabbais) print ''; print ''; print ''; - // Remise avoirs + // Réductions absolues (Remises-Ristournes-Rabbais) print '
'; print $langs->trans("CustomerRelativeDiscountShort"); @@ -297,7 +297,7 @@ if ($socidp > 0) print ''.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).'
'; print ''; print ''; - // Remise relative + // Réductions relatives (Remises-Ristournes-Rabbais) $relative_discount=$soc->remise_client; print ''; print ''; - // Remise avoirs + // Réductions (Remises-Ristournes-Rabbais) $absolute_discount=$soc->getCurrentDiscount(); print ''; print ''; - // Remise relative + // Réductions absolues (Remises-Ristournes-Rabbais) print ''; print ''; print ''; - // Remise avoirs + // Réductions (Remises-Ristournes-Rabbais) print '
'; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 3aae05bc120..8f1d3009fed 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -553,7 +553,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) $html->select_types_paiements($soc->mode_reglement,'mode_reglement_id'); print '
'.$langs->trans("CustomerRelativeDiscount").''; @@ -569,7 +569,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer) } print '
'.$langs->trans("CustomerAbsoluteDiscount").''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 186a82ce4ae..f7e3562e18c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -753,7 +753,7 @@ if ($_GET['action'] == 'create') $html->select_types_paiements($mode_reglement_id,'mode_reglement_id'); print '
'.$langs->trans("CustomerRelativeDiscount").''; if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print ''; print ''; if (! $_GET['propalid'] && ! $_GET['commandeid'] && ! $_GET['contratid']) print ''.($societe->remise_client?$societe->remise_client.'%':$langs->trans("DiscountNone")).'
'; print ''; print '
'; diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 1d44a414e10..34f09de773c 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -73,15 +73,15 @@ CustomerCard=Customer Card Customer=Customer CustomerDiscount=Customer Discount CustomerRelativeDiscount=Relative global discount -CustomerAbsoluteDiscount=Credit note +CustomerAbsoluteDiscount=Absolute discount CustomerRelativeDiscountShort=Relative discount -CustomerAbsoluteDiscountShort=Credit note +CustomerAbsoluteDiscountShort=Absolute discount CompanyHasRelativeDiscount=This customer has a discount of %s%% CompanyHasNoRelativeDiscount=This customer has no discount by default CompanyHasAbsoluteDiscount=This customer has a %s %s discount credit CompanyHasNoAbsoluteDiscount=This customer has no discount credit available -CustomerAbsoluteDiscountAllUsers=Credit note (granted by all users) -CustomerAbsoluteDiscountMy=Credit note (granted by yourself) +CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users) +CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) DiscountNone=None Supplier=Supplier CompanyList=Companies' list diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index 442a3b11df2..5eb334475c7 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -80,8 +80,8 @@ CompanyHasRelativeDiscount=Ce client a une remise par d CompanyHasNoRelativeDiscount=Ce client n'a pas de remise par défaut CompanyHasAbsoluteDiscount=Ce client a %s %s d'avoirs disponibles CompanyHasNoAbsoluteDiscount=Ce client n'a pas ou plus d'avoirs disponibles -CustomerAbsoluteDiscountAllUsers=Avoirs en cours (accordée par tout utilisateur) -CustomerAbsoluteDiscountMy=Avoirs en cours (accordé personnellement) +CustomerAbsoluteDiscountAllUsers=Remises en cours (accordées par tout utilisateur) +CustomerAbsoluteDiscountMy=Remises en cours (accordées personnellement) DiscountNone=Aucune Supplier=Fournisseur CompanyList=Liste des sociétés