New: Can add a discount directly when building invoice

This commit is contained in:
Laurent Destailleur 2011-02-19 13:38:02 +00:00
parent 2cd2f001cf
commit b5b1bbd180

View File

@ -2108,8 +2108,12 @@ else
} }
else else
{ {
if ($absolute_creditnote > 0) // If not linke will be added later
{
if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' - '.$addabsolutediscount.'<br>'; if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' - '.$addabsolutediscount.'<br>';
else print '. ';
}
print '. ';
} }
if ($absolute_creditnote > 0) if ($absolute_creditnote > 0)
{ {
@ -2136,7 +2140,9 @@ else
} }
if (! $absolute_discount && ! $absolute_creditnote) if (! $absolute_discount && ! $absolute_creditnote)
{ {
print $langs->trans("CompanyHasNoAbsoluteDiscount").'.'; print $langs->trans("CompanyHasNoAbsoluteDiscount");
if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' - '.$addabsolutediscount.'<br>';
else print '. ';
} }
/*if ($object->statut == 0 && $object->type != 2 && $object->type != 3) /*if ($object->statut == 0 && $object->type != 2 && $object->type != 3)
{ {