Revision b65a230d
Von Sven Schöling vor fast 15 Jahren hinzugefügt
bin/mozilla/ir.pl | ||
---|---|---|
475 | 475 |
# override sellprice if there is one entered |
476 | 476 |
my $sellprice = $form->parse_amount(\%myconfig, $form->{"sellprice_$i"}); |
477 | 477 |
|
478 |
# ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb |
|
479 |
$form->{"discount_$i"} = $form->format_amount(\%myconfig, |
|
480 |
$form->{vendor_discount} * 100 ); |
|
478 |
# ergaenzung fuer bug 736 Lieferanten-Rabatt auch in Einkaufsrechnungen vorbelegen jb |
|
479 |
$form->{"discount_$i"} = $form->format_amount(\%myconfig, $form->{vendor_discount} * 100 ); |
|
481 | 480 |
map { $form->{item_list}[$i]{$_} =~ s/\"/"/g } qw(partnumber description unit); |
482 | 481 |
map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] }; |
483 | 482 |
|
... | ... | |
614 | 613 |
($form->{AP}) = split /--/, $form->{AP}; |
615 | 614 |
($form->{AP_paid}) = split /--/, $form->{AP_paid}; |
616 | 615 |
if (IR->post_payment(\%myconfig, \%$form)){ |
617 |
if (!exists $form->{addition} && $form->{id} ne "") {
|
|
618 |
# saving the history
|
|
616 |
if (!exists $form->{addition} && $form->{id} ne "") {
|
|
617 |
# saving the history
|
|
619 | 618 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber}; |
620 |
$form->{addition} = "PAYMENT POSTED";
|
|
619 |
$form->{addition} = "PAYMENT POSTED";
|
|
621 | 620 |
$form->{what_done} = $form->{currency} . qq| | . $form->{paid} . qq| | . $locale->text("POSTED"); |
622 |
$form->save_history($form->dbconnect(\%myconfig));
|
|
623 |
# /saving the history
|
|
624 |
}
|
|
621 |
$form->save_history($form->dbconnect(\%myconfig));
|
|
622 |
# /saving the history
|
|
623 |
}
|
|
625 | 624 |
|
626 | 625 |
$form->redirect($locale->text('Payment posted!')); |
627 | 626 |
} |
... | ... | |
707 | 706 |
|
708 | 707 |
relink_accounts(); |
709 | 708 |
if (IR->post_invoice(\%myconfig, \%$form)){ |
710 |
# saving the history
|
|
711 |
if(!exists $form->{addition} && $form->{id} ne "") {
|
|
709 |
# saving the history
|
|
710 |
if(!exists $form->{addition} && $form->{id} ne "") {
|
|
712 | 711 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber}; |
713 | 712 |
$form->{addition} = "POSTED"; |
714 |
#$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber};
|
|
715 |
$form->save_history($form->dbconnect(\%myconfig));
|
|
716 |
}
|
|
717 |
# /saving the history
|
|
713 |
#$form->{what_done} = $locale->text("Rechnungsnummer") . qq| | . $form->{invnumber};
|
|
714 |
$form->save_history($form->dbconnect(\%myconfig));
|
|
715 |
}
|
|
716 |
# /saving the history
|
|
718 | 717 |
remove_draft() if $form->{remove_draft}; |
719 |
$form->redirect( $locale->text('Invoice')
|
|
718 |
$form->redirect( $locale->text('Invoice')
|
|
720 | 719 |
. " $form->{invnumber} " |
721 | 720 |
. $locale->text('posted!')); |
722 | 721 |
} |
... | ... | |
777 | 776 |
# saving the history |
778 | 777 |
if(!exists $form->{addition}) { |
779 | 778 |
$form->{snumbers} = qq|invnumber_| . $form->{invnumber}; |
780 |
$form->{addition} = "DELETED";
|
|
781 |
$form->save_history($form->dbconnect(\%myconfig));
|
|
779 |
$form->{addition} = "DELETED";
|
|
780 |
$form->save_history($form->dbconnect(\%myconfig));
|
|
782 | 781 |
} |
783 | 782 |
# /saving the history |
784 | 783 |
$form->redirect($locale->text('Invoice deleted!')); |
Auch abrufbar als: Unified diff
Tabs aus *.pl Dateien entfernt.