Revision 30784a4d
Von Bernd Bleßmann vor fast 3 Jahren hinzugefügt
SL/AR.pm | ||
---|---|---|
487 | 487 |
qq| a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | . |
488 | 488 |
qq| a.marge_total, a.marge_percent, | . |
489 | 489 |
qq| a.transaction_description, a.direct_debit, | . |
490 |
qq| a.type, | . |
|
490 | 491 |
qq| pr.projectnumber AS globalprojectnumber, | . |
491 | 492 |
qq| c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | . |
492 | 493 |
qq| c.id as customer_id, | . |
SL/DB/Invoice.pm | ||
---|---|---|
539 | 539 |
my ($self) = @_; |
540 | 540 |
|
541 | 541 |
return 'ar_transaction' if !$self->invoice; |
542 |
return 'invoice_for_advance_payment_storno' if $self->type eq 'invoice_for_advance_payment' && $self->amount < 0 && $self->storno; |
|
543 |
return 'invoice_for_advance_payment' if $self->type eq 'invoice_for_advance_payment'; |
|
542 | 544 |
# stornoed credit_notes are still credit notes and not invoices |
543 | 545 |
return 'credit_note' if $self->type eq 'credit_note' && $self->amount < 0; |
544 | 546 |
return 'invoice_storno' if $self->type ne 'credit_note' && $self->amount < 0 && $self->storno; |
... | ... | |
559 | 561 |
return t8('Credit Note') if $self->invoice_type eq 'credit_note'; |
560 | 562 |
return t8('Invoice') . "(" . t8('Storno') . ")" if $self->invoice_type eq 'invoice_storno'; |
561 | 563 |
return t8('Credit Note') . "(" . t8('Storno') . ")" if $self->invoice_type eq 'credit_note_storno'; |
564 |
return t8('Invoice for Advance Payment') if $self->invoice_type eq 'invoice_for_advance_payment'; |
|
565 |
return t8('Invoice for Advance Payment') . "(" . t8('Storno') . ")" if $self->invoice_type eq 'invoice_for_advance_payment_storno'; |
|
562 | 566 |
return t8('Invoice'); |
563 | 567 |
} |
564 | 568 |
|
... | ... | |
573 | 577 |
return t8('Credit note (one letter abbreviation)') if $self->invoice_type eq 'credit_note'; |
574 | 578 |
return t8('Invoice (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->invoice_type eq 'invoice_storno'; |
575 | 579 |
return t8('Credit note (one letter abbreviation)') . "(" . t8('Storno (one letter abbreviation)') . ")" if $self->invoice_type eq 'credit_note_storno'; |
580 |
return t8('Invoice for Advance Payment (one letter abbreviation)') if $self->invoice_type eq 'invoice_for_advance_payment'; |
|
581 |
return t8('Invoice for Advance Payment with Storno (abbreviation)') if $self->invoice_type eq 'invoice_for_advance_payment_storno'; |
|
576 | 582 |
return t8('Invoice (one letter abbreviation)'); |
577 | 583 |
} |
578 | 584 |
|
bin/mozilla/ar.pl | ||
---|---|---|
1206 | 1206 |
my $is_storno = $ar->{storno} && $ar->{storno_id}; |
1207 | 1207 |
my $has_storno = $ar->{storno} && !$ar->{storno_id}; |
1208 | 1208 |
|
1209 |
$ar->{type} = |
|
1210 |
$has_storno ? $locale->text("Invoice with Storno (abbreviation)") : |
|
1211 |
$is_storno ? $locale->text("Storno (one letter abbreviation)") : |
|
1212 |
$ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") : |
|
1213 |
$ar->{invoice} ? $locale->text("Invoice (one letter abbreviation)") : |
|
1214 |
$locale->text("AR Transaction (abbreviation)"); |
|
1209 |
if ($ar->{type} eq 'invoice_for_advance_payment') { |
|
1210 |
$ar->{type} = |
|
1211 |
$has_storno ? $locale->text("Invoice for Advance Payment with Storno (abbreviation)") : |
|
1212 |
$is_storno ? $locale->text("Storno (one letter abbreviation)") : |
|
1213 |
$locale->text("Invoice for Advance Payment (one letter abbreviation)"); |
|
1214 |
|
|
1215 |
} else { |
|
1216 |
$ar->{type} = |
|
1217 |
$has_storno ? $locale->text("Invoice with Storno (abbreviation)") : |
|
1218 |
$is_storno ? $locale->text("Storno (one letter abbreviation)") : |
|
1219 |
$ar->{amount} < 0 ? $locale->text("Credit note (one letter abbreviation)") : |
|
1220 |
$ar->{invoice} ? $locale->text("Invoice (one letter abbreviation)") : |
|
1221 |
$locale->text("AR Transaction (abbreviation)"); |
|
1222 |
} |
|
1215 | 1223 |
|
1216 | 1224 |
map { $ar->{$_} = $form->format_amount(\%myconfig, $ar->{$_}, 2) } qw(netamount tax amount paid due marge_total marge_percent); |
1217 | 1225 |
|
locale/de/all | ||
---|---|---|
1876 | 1876 |
'Invoice email and Contact Person' => 'E-Mail des Rechnungsempfängers und CC an Ansprechpartner', |
1877 | 1877 |
'Invoice email settings' => 'E-Mail Rechnungsversand', |
1878 | 1878 |
'Invoice filter' => 'Rechnungsfilter', |
1879 |
'Invoice for Advance Payment (one letter abbreviation)' => 'A', |
|
1880 |
'Invoice for Advance Payment with Storno (abbreviation)' => 'A(S)', |
|
1879 | 1881 |
'Invoice for fees' => 'Rechnung über Gebühren', |
1880 | 1882 |
'Invoice has already been storno\'d!' => 'Diese Rechnung wurde bereits storniert.', |
1881 | 1883 |
'Invoice number' => 'Rechnungsnummer', |
locale/en/all | ||
---|---|---|
1876 | 1876 |
'Invoice email and Contact Person' => '', |
1877 | 1877 |
'Invoice email settings' => '', |
1878 | 1878 |
'Invoice filter' => '', |
1879 |
'Invoice for Advance Payment (one letter abbreviation)' => '', |
|
1880 |
'Invoice for Advance Payment with Storno (abbreviation)' => '', |
|
1879 | 1881 |
'Invoice for fees' => '', |
1880 | 1882 |
'Invoice has already been storno\'d!' => '', |
1881 | 1883 |
'Invoice number' => '', |
Auch abrufbar als: Unified diff
Anzahlungs-Rg.: Typ in Bericht anzeigen