X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fis.pl;h=2cdf21e63680a5332923bfc419983962d76c286d;hb=0e6197ea79295e1a1232617ee4ed4ae99d8a0640;hp=4a08e718542a6f12e3af8f18daae32710396cc6a;hpb=382e874cd5a9ffcf41643b2b8b3b34d1f4737421;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 4a08e7185..2cdf21e63 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -144,6 +144,8 @@ sub invoice_links {
     }
   }
 
+  my $editing = $form->{id};
+
   $form->backup_vars(qw(payment_id language_id taxzone_id salesman_id taxincluded cp_id intnotes id shipto_id));
 
   IS->get_customer(\%myconfig, \%$form);
@@ -166,7 +168,7 @@ sub invoice_links {
   IS->retrieve_invoice(\%myconfig, \%$form);
   $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id shipto_id));
   $form->restore_vars(qw(taxincluded)) if $form->{id};
-  $form->restore_vars(qw(salesman_id)) if $main::editing;
+  $form->restore_vars(qw(salesman_id)) if $editing;
 
 
   # build vendor/customer drop down comatibility... don't ask
@@ -285,7 +287,7 @@ sub form_header {
 
   $main::auth->assert('invoice_edit');
 
-  our %TMPL_VAR = ();
+  my %TMPL_VAR = ();
   my @custom_hiddens;
 
   $form->{employee_id} = $form->{old_employee_id} if $form->{old_employee_id};
@@ -596,7 +598,7 @@ sub post_payment {
 
   $main::auth->assert('invoice_edit');
 
-  our $invdate;
+  my $invdate = $form->datetonum($form->{invdate}, \%myconfig);
 
   $form->{defaultcurrency} = $form->get_default_currency(\%myconfig);
   for my $i (1 .. $form->{paidaccounts}) {
@@ -886,8 +888,6 @@ sub credit_note {
 
   $form->{title}  = $locale->text('Add Credit Note');
   $form->{script} = 'is.pl';
-  our $script         = "is";
-  our $buysell        = 'buy';
 
 
   # bo creates the id, reset it
@@ -906,7 +906,7 @@ sub credit_note {
   &invoice_links;
 
   $form->{currency}     = $currency;
-  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, $buysell);
+  $form->{forex}        = $form->check_exchangerate( \%myconfig, $form->{currency}, $form->{invdate}, 'buy');
   $form->{exchangerate} = $form->{forex} || '';
 
   $form->{creditremaining} -= ($form->{oldinvtotal} - $form->{ordtotal});