lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Can add a discount directly when building invoice

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-19 13:38:02 +00:00
parent 2cd2f001cf
commit b5b1bbd180
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/compta/facture.php
View File

@ -2108,12 +2108,16 @@ else
} }
else else
{ {
if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' - '.$addabsolutediscount.'<br>'; if ($absolute_creditnote > 0) // If not linke will be added later
else print '. '; {
if ($object->statut == 0 && $object->type != 2 && $object->type != 3) print ' - '.$addabsolutediscount.'<br>';
}
print '. ';
} }
if ($absolute_creditnote > 0) if ($absolute_creditnote > 0)
{ {
// If validated, we show link "add credit note to payment" // If validated, we show link "add credit note to payment"
if ($object->statut != 1 || $object->type == 2 || $object->type == 3) if ($object->statut != 1 || $object->type == 2 || $object->type == 3)
{ {
if ($object->statut == 0 && $object->type != 3) if ($object->statut == 0 && $object->type != 3)
@ -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)
{ {