Index/Zähler für multiple Aufträge bei 1 beginnen lassen

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

index 8aed491..47e7131 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -35,6 +35,7 @@ use SL::FU;
  use SL::IS;
  use SL::PE;
  use SL::OE;
+use SL::DB::Default;
  use Data::Dumper;
  use List::Util qw(max sum);
  
@@ -350,7 +351,7 @@ sub form_header {
    $TMPL_VAR{creditwarning} = ($form->{creditlimit} != 0) && ($form->{creditremaining} < 0) && !$form->{update};
    $TMPL_VAR{is_credit_remaining_negativ} = $form->{creditremaining} =~ /-/;
  
-  $form->{fokus} = "invoice.customer";
+  $::request->{layout}->focus('#customer');
  
    my $follow_up_vc         =  $form->{customer};
    $follow_up_vc            =~ s/--\d*\s*$//;
@@ -444,10 +445,10 @@ sub form_footer {
  
    for my $i (1 .. $form->{paidaccounts}) {
      $form->{"changeable_$i"} = 1;
-    if ($::lx_office_conf{features}->{payments_changeable} == 0) {
+    if (SL::DB::Default->get->payments_changeable == 0) {
        # never
        $form->{"changeable_$i"} = ($form->{"acc_trans_id_$i"})? 0 : 1;
-    } elsif ($::lx_office_conf{features}->{payments_changeable} == 2) {
+    } elsif (SL::DB::Default->get->payments_changeable == 2) {
        # on the same day
        $form->{"changeable_$i"} = (($form->{"gldate_$i"} eq '') ||
                                    ($form->current_date(\%myconfig) eq $form->{"gldate_$i"}));
@@ -471,7 +472,9 @@ sub form_footer {
      paid_missing        => $form->{invtotal} - $totalpaid,
      print_options       => print_options(inline => 1),
      show_storno         => $form->{id} && !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && !$totalpaid,
-    show_delete         => ($form->current_date(\%myconfig) eq $form->{gldate}),
+    show_delete         => ($::instance_conf->get_is_changeable == 2)
+                             ? ($form->current_date(\%myconfig) eq $form->{gldate})
+                             : ($::instance_conf->get_is_changeable == 1),
    });
  ##print $form->parse_html_template('is/_payments'); # parser
  ##print $form->parse_html_template('webdav/_list'); # parser
@@ -804,7 +807,7 @@ sub use_as_template {
  
    $main::auth->assert('invoice_edit');
  
-  map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno);
+  map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked);
    $form->{paidaccounts} = 1;
    $form->{rowcount}--;
    $form->{invdate} = $form->current_date(\%myconfig);
@@ -885,8 +888,6 @@ sub delete {
    $form->header;
  
    print qq|
-<body>
-
  <form method="post" action="$form->{script}">
  |;