Debugcode...

[kivitendo-erp.git] / bin / mozilla / ir.pl
diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl

index 239a859..82239ae 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -418,13 +418,13 @@ sub form_header {
    $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
    print qq|
  <body onLoad="$onload">
-
+<script type="text/javascript" src="js/common.js"></script>
  <form method=post action=$form->{script}>
  |;
  
    $form->hide_form(qw(id title vc type level creditlimit creditremaining closedto locked shippted storno storno_id
                        max_dunning_level dunning_amount vendor_id oldvendor selectvendor taxaccounts
-                      fxgain_accno fxloss_accno taxpart taxservice),
+                      fxgain_accno fxloss_accno taxpart taxservice cursor_fokus),
                        map { $_.'_rate', $_.'_description' } split / /, $form->{taxaccounts} );
  
    print qq|<p>$form->{saved_message}</p>| if $form->{saved_message};
@@ -893,14 +893,14 @@ sub update {
  
    &check_name(vendor);
  
-  $form->{exchangerate} = $exchangerate if
-    $form->{forex} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell');
+  $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'sell');
+  $form->{exchangerate} = $form->{forex} if $form->{forex};
  
    for $i (1 .. $form->{paidaccounts}) {
      next unless $form->{"paid_$i"};
      map { $form->{"${_}_$i"} = $form->parse_amount(\%myconfig, $form->{"${_}_$i"}) } qw(paid exchangerate);
-    $form->{"exchangerate_$i"} = $exchangerate if
-      $form->{"forex_$i"} = $exchangerate = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+    $form->{"forex_$i"}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{"datepaid_$i"}, 'sell');
+    $form->{"exchangerate_$i"} = $form->{"forex_$i"} if $form->{"forex_$i"};
    }
  
    $i            = $form->{rowcount};
@@ -1081,8 +1081,9 @@ sub post {
  
    $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
  
-  $form->isblank("invdate", $locale->text('Invoice Date missing!'));
-  $form->isblank("vendor",  $locale->text('Vendor missing!'));
+  $form->isblank("invdate",   $locale->text('Invoice Date missing!'));
+  $form->isblank("vendor",    $locale->text('Vendor missing!'));
+  $form->isblank("invnumber", $locale->text('Invnumber missing!'));
  
    $form->{invnumber} =~ s/^\s*//g;
    $form->{invnumber} =~ s/\s*$//g;