Anpassung der Historienfunktion

[kivitendo-erp.git] / bin / mozilla / ic.pl

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 0a21785..ada06ee 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -37,6 +37,7 @@ use SL::IC;
 #use SL::PE;
 
 require "$form->{path}/io.pl";
+require "bin/mozilla/common.pl";
 
 1;
 
@@ -747,20 +748,9 @@ sub choice {
 sub list {
   $lxdebug->enter_sub();
 
-  # get parts for
-  if (($form->{partnumber} eq "") and ($form->{description} eq "")) {
-    IC->get_parts(\%myconfig, \%$form, "");
-  } else {
-    if ((!($form->{partnumber} eq "")) and ($form->{description} eq "")) {
-      IC->get_parts(\%myconfig, \%$form, "partnumber");
-    } else {
-      if (($form->{partnumber} eq "") and (!($form->{description} eq ""))) {
-        IC->get_parts(\%myconfig, \%$form, "description");
-      } else {
-        IC->get_parts(\%myconfig, \%$form, "all");
-      }    #fi
-    }    #fi
-  }    #fi
+  my @sortorders = ("", "partnumber", "description", "all");
+  my $sortorder = $sortorders[($form->{description} ? 2 : 0) + ($form->{partnumber} ? 1 : 0)];
+  IC->get_parts(\%myconfig, \%$form, $sortorder);
 
   $form->{title} = $locale->text('Top 100 hinzufuegen');
 
@@ -2409,7 +2399,7 @@ sub form_header {
              </tr>
               <tr>
                <th align="right" nowrap="true">|
-      . $locale->text('Geschäftsvolumen') . qq|</th>
+      . $locale->text('Geschäftsvolumen') . qq|</th>
                <td><input name=gv size=10 value=$form->{gv}></td>
              </tr>
 |;
@@ -3000,8 +2990,8 @@ sub update {
   }
 
   if ($form->{item} eq 'service') {
-    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-      qw(sellprice listprice);
+    map({ $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
+        qw(sellprice listprice lastcost));
     &form_header;
     &price_row;
     &form_footer;
@@ -3052,6 +3042,7 @@ sub save {
   }
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumber} = qq|partnumber_| . $form->{partnumber};
        $form->{addition} = "SAVED";
        $form->save_history($form->dbconnect(\%myconfig));
   }
@@ -3174,6 +3165,7 @@ sub save_as_new {
 
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumber} = qq|partnumber_| . $form->{partnumber};
        $form->{addition} = "SAVED AS NEW";
        $form->save_history($form->dbconnect(\%myconfig));
   }
@@ -3191,6 +3183,7 @@ sub delete {
   $lxdebug->enter_sub();
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumber} = qq|partnumber_| . $form->{partnumber};
        $form->{addition} = "DELETED";
        $form->save_history($form->dbconnect(\%myconfig));
   }
@@ -3269,4 +3262,4 @@ sub parts_language_selection {
   $lxdebug->leave_sub();
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }