Revision 3915f5c6
Von Moritz Bunkus vor mehr als 17 Jahren hinzugefügt
| SL/AR.pm | ||
|---|---|---|
| 411 | 411 |
qq|SELECT a.id, a.invnumber, a.ordnumber, a.transdate, | . |
| 412 | 412 |
qq| a.duedate, a.netamount, a.amount, a.paid, | . |
| 413 | 413 |
qq| a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | . |
| 414 |
qq| a.shippingpoint, a.storno, a.globalproject_id, | . |
|
| 414 |
qq| a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
|
|
| 415 | 415 |
qq| a.marge_total, a.marge_percent, | . |
| 416 | 416 |
qq| a.transaction_description, | . |
| 417 | 417 |
qq| pr.projectnumber AS globalprojectnumber, | . |
| bin/mozilla/ap.pl | ||
|---|---|---|
| 781 | 781 |
|
| 782 | 782 |
# ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it |
| 783 | 783 |
print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
|
| 784 |
if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap'));
|
|
| 784 |
if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ap') && !IS->is_storno(\%myconfig, $form, 'ap', $form->{id}));
|
|
| 785 | 785 |
|
| 786 | 786 |
print qq| <input class=submit type=submit name=action value="| . $locale->text('Post Payment') . qq|">
|
| 787 | 787 |
<input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|">
|
| bin/mozilla/ar.pl | ||
|---|---|---|
| 1534 | 1534 |
|
| 1535 | 1535 |
map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent);
|
| 1536 | 1536 |
|
| 1537 |
my $is_storno = $ar->{storno} && IS->is_storno(\%myconfig, $form, 'ar');
|
|
| 1538 |
my $has_storno = $ar->{storno} && !$is_storno;
|
|
| 1537 |
my $is_storno = $ar->{storno} && !$ar->{storno_id};
|
|
| 1538 |
my $has_storno = $ar->{storno} && $ar->{storno_id};
|
|
| 1539 | 1539 |
|
| 1540 | 1540 |
$ar->{type} =
|
| 1541 | 1541 |
$has_storno ? $locale->text("Invoice with Storno (abbreviation)") :
|
Auch abrufbar als: Unified diff
Rechnungsliste: Unterscheidung zwischen Stornorechnung und stornierter Rechnung wieder gefixt.