X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=78ee3d3162cafad6a5ab5ef9add67d9986019f04;hb=f36eb9fca78c4940b486b7dafa4ab636cdaf99cd;hp=693914fa755af8e672e59b2b346aa0edfc26d9a8;hpb=d5c1e4fa391f26fc0acd568729a98493edf319d8;p=kivitendo-erp.git
diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 693914fa7..78ee3d316 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -357,14 +357,14 @@ sub form_header {
@values = ();
foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
push(@values, $item->{"id"});
- $labels{$item->{"id"}} = $item->{"name"};
+ $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
}
my $employees = qq|
| . $locale->text('Employee') . qq| |
| .
- NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee_id"},
+ NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
'-values' => \@values, '-labels' => \%labels)) . qq|
|
|;
@@ -438,7 +438,7 @@ sub form_header {
'-default' => $form->{"globalproject_id"}));
%labels = ();
- @values = ("");
+ @values = ();
foreach my $item (@{ $form->{ALL_SALESMEN} }) {
push(@values, $item->{id});
$labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
@@ -448,8 +448,8 @@ sub form_header {
qq|
| . $locale->text('Salesman') . qq| |
| .
- NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
- '-values' => \@values, '-labels' => \%labels))
+ NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id} ? $form->{salesman_id} : $form->{employee_id},
+ '-values' => \@values, '-labels' => \%labels))
. qq| |
|;
@@ -1011,7 +1011,8 @@ if ($form->{type} eq "credit_note") {
";
- my @triggers = ();
+ my @triggers = ();
+ my $totalpaid = 0;
$form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"});
for $i (1 .. $form->{paidaccounts}) {
@@ -1062,6 +1063,23 @@ if ($form->{type} eq "credit_note") {
push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i");
}
+ my $paid_missing = $form->{oldinvtotal} - $totalpaid;
+
+ print qq|
+
+ |
+ |
+ | . $locale->text('Total') . qq| |
+ | . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq| |
+
+
+ |
+ |
+ | . $locale->text('Missing amount') . qq| |
+ | . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq| |
+
+|;
+
map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal));
print qq|