| '.$langs->trans('Discounts');
print ' | ';
if ($soc->remise_client) print $langs->trans("CompanyHasRelativeDiscount",$soc->remise_client);
else print $langs->trans("CompanyHasNoRelativeDiscount");
- print '. ';
if ($absolute_discount > 0)
{
- if ($object->statut > 0 || $object->type == 2 || $object->type == 3)
+ print '. ';
+ if ($object->statut > 0 || $object->type == 2 || $object->type == 3)
{
if ($object->statut == 0)
{
@@ -2100,9 +2103,14 @@ else
// Remise dispo de type remise fixe (not credit note)
$filter='fk_facture_source IS NULL';
print '
';
- $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer);
+ $html->form_remise_dispo($_SERVER["PHP_SELF"].'?facid='.$object->id, 0, 'remise_id',$soc->id, $absolute_discount, $filter, $resteapayer, ' - '.$addabsolutediscount);
}
}
+ else
+ {
+ if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' - '.$addabsolutediscount.'
';
+ else print '. ';
+ }
if ($absolute_creditnote > 0)
{
// If validated, we show link "add credit note to payment"
@@ -2130,13 +2138,13 @@ else
{
print $langs->trans("CompanyHasNoAbsoluteDiscount").'.';
}
- if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
+ /*if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
{
if (! $absolute_discount && ! $absolute_creditnote) print '
';
- $addabsolutediscount=' '.$langs->trans("AddDiscount").'';
- $addcreditnote=' '.$langs->trans("AddCreditNote").'';
- print $addabsolutediscount.' - '.$addcreditnote;
- }
+ //print ' - ';
+ print $addabsolutediscount;
+ //print ' - '.$addcreditnote; // We disbale link to credit note
+ }*/
print ' |
';
// Date invoice
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index eae9aebdea7..7d9571945a1 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -233,7 +233,7 @@ Reductions=Reductions
ReductionsShort=Reduc.
Discount=Discount
Discounts=Discounts
-AddDiscount=Create discount
+AddDiscount=Create absolute discount
AddCreditNote=Create credit note
ShowDiscount=Show discount
RelativeDiscount=Relative discount
@@ -246,14 +246,14 @@ DiscountFromCreditNote=Discount from credit note %s
DiscountFromDeposit=Payments from deposit invoice %s
AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
CreditNoteDepositUse=Invoice must be validated to use this king of credits
-NewGlobalDiscount=New fix discount
+NewGlobalDiscount=New absolute discount
NewRelativeDiscount=New relative discount
NoteReason=Note/Reason
ReasonDiscount=Reason
AddGlobalDiscount=Add discount
DiscountOfferedBy=Granted by
-DiscountStillRemaining=Discount still remaining
-DiscountAlreadyCounted=Discount already counted
+DiscountStillRemaining=Discounts still remaining
+DiscountAlreadyCounted=Discounts already counted
BillAddress=Bill address
HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index c94b2a4d9b6..e207052c35f 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -153,7 +153,7 @@ CustomerRelativeDiscount=Relative customer discount
CustomerAbsoluteDiscount=Absolute customer discount
CustomerRelativeDiscountShort=Relative discount
CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a discount of