Revision 7a98647b
Von Kivitendo Admin vor mehr als 9 Jahren hinzugefügt
| SL/CP.pm | ||
|---|---|---|
| 348 | 348 |
# saving the history |
| 349 | 349 |
$form->{id} = $form->{"id_$i"};
|
| 350 | 350 |
if(!exists $form->{addition}) {
|
| 351 |
$form->{snumbers} = qq|invnumber_| . $form->{"invnumber_$i"};
|
|
| 352 |
$form->{addition} = "POSTED";
|
|
| 351 |
$form->{snumbers} = qq|invnumber_| . $form->{"invnumber_$i"};
|
|
| 352 |
$form->{what_done} = "invoice";
|
|
| 353 |
$form->{addition} = "PAYMENT POSTED";
|
|
| 353 | 354 |
$form->save_history; |
| 354 | 355 |
} |
| 355 | 356 |
# /saving the history |
| bin/mozilla/ap.pl | ||
|---|---|---|
| 582 | 582 |
|
| 583 | 583 |
($form->{AP}) = split /--/, $form->{AP};
|
| 584 | 584 |
($form->{AP_paid}) = split /--/, $form->{AP_paid};
|
| 585 |
$form->redirect($locale->text('Payment posted!'))
|
|
| 586 |
if (AP->post_payment(\%myconfig, \%$form)); |
|
| 585 |
if (AP->post_payment(\%myconfig, \%$form)) {
|
|
| 586 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
|
|
| 587 |
$form->{what_done} = 'invoice';
|
|
| 588 |
$form->{addition} = "PAYMENT POSTED";
|
|
| 589 |
$form->save_history; |
|
| 590 |
$form->redirect($locale->text('Payment posted!'))
|
|
| 591 |
} else {
|
|
| 587 | 592 |
$form->error($locale->text('Cannot post payment!'));
|
| 593 |
}; |
|
| 588 | 594 |
|
| 589 | 595 |
|
| 590 | 596 |
$main::lxdebug->leave_sub(); |
| bin/mozilla/ar.pl | ||
|---|---|---|
| 620 | 620 |
|
| 621 | 621 |
($form->{AR}) = split /--/, $form->{AR};
|
| 622 | 622 |
($form->{AR_paid}) = split /--/, $form->{AR_paid};
|
| 623 |
$form->redirect($locale->text('Payment posted!')) if (AR->post_payment(\%myconfig, \%$form));
|
|
| 624 |
$form->error($locale->text('Cannot post payment!'));
|
|
| 623 |
if (AR->post_payment(\%myconfig, \%$form)) {
|
|
| 624 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
|
|
| 625 |
$form->{what_done} = 'invoice';
|
|
| 626 |
$form->{addition} = "PAYMENT POSTED";
|
|
| 627 |
$form->save_history; |
|
| 628 |
$form->redirect($locale->text('Payment posted!'))
|
|
| 629 |
} else {
|
|
| 630 |
$form->error($locale->text('Cannot post payment!'));
|
|
| 631 |
}; |
|
| 625 | 632 |
|
| 626 | 633 |
$main::lxdebug->leave_sub(); |
| 627 | 634 |
} |
| bin/mozilla/ir.pl | ||
|---|---|---|
| 668 | 668 |
if (IR->post_payment(\%myconfig, \%$form)){
|
| 669 | 669 |
if (!exists $form->{addition} && $form->{id} ne "") {
|
| 670 | 670 |
# saving the history |
| 671 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
|
|
| 672 |
$form->{addition} = "PAYMENT POSTED";
|
|
| 673 |
$form->{what_done} = $form->{currency} . qq| | . $form->{paid} . qq| | . $locale->text("POSTED");
|
|
| 671 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
|
|
| 672 |
$form->{addition} = "PAYMENT POSTED";
|
|
| 673 |
$form->{what_done} = "invoice";
|
|
| 674 | 674 |
$form->save_history; |
| 675 | 675 |
# /saving the history |
| 676 | 676 |
} |
| bin/mozilla/is.pl | ||
|---|---|---|
| 689 | 689 |
($form->{AR}) = split /--/, $form->{AR};
|
| 690 | 690 |
($form->{AR_paid}) = split /--/, $form->{AR_paid};
|
| 691 | 691 |
relink_accounts(); |
| 692 |
$form->redirect($locale->text('Payment posted!'))
|
|
| 693 |
if (IS->post_payment(\%myconfig, \%$form)); |
|
| 694 |
$form->error($locale->text('Cannot post payment!'));
|
|
| 695 |
|
|
| 692 |
if ( IS->post_payment(\%myconfig, \%$form) ) {
|
|
| 693 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber};
|
|
| 694 |
$form->{what_done} = $form->{type};
|
|
| 695 |
$form->{addition} = "PAYMENT POSTED";
|
|
| 696 |
$form->save_history; |
|
| 697 |
$form->redirect($locale->text('Payment posted!'))
|
|
| 698 |
} else {
|
|
| 699 |
$form->error($locale->text('Cannot post payment!'));
|
|
| 700 |
}; |
|
| 696 | 701 |
|
| 697 | 702 |
$main::lxdebug->leave_sub(); |
| 698 | 703 |
} |
| locale/de/all | ||
|---|---|---|
| 1834 | 1834 |
'Own bank account number or IBAN' => 'Eigene Kontonummer oder IBAN', |
| 1835 | 1835 |
'Own bank code' => 'Eigene Bankleitzahl', |
| 1836 | 1836 |
'Owner of account' => 'Kontoinhaber', |
| 1837 |
'PAYMENT POSTED' => 'Rechung gebucht',
|
|
| 1837 |
'PAYMENT POSTED' => 'Zahlung gebucht',
|
|
| 1838 | 1838 |
'PDF' => 'PDF', |
| 1839 | 1839 |
'PDF (OpenDocument/OASIS)' => 'PDF (OpenDocument/OASIS)', |
| 1840 | 1840 |
'PDF export -- options' => 'PDF-Export -- Optionen', |
Auch abrufbar als: Unified diff
history für Zahlungen ar/ap/is/ir und Zahlungsein- und ausgang
Die Spalte "addition" in history_erp hat jetzt einheitlich den Eintrag
"PAYMENT POSTED", übersetzt als "Zahlung gebucht".
Bei Verkaufsrechnungen, Kreditor- und Debitorenbuchung wird jetzt zum
ersten Mal die Zahlung in history protokolliert, zumindest via "Zahlung
buchen".