Fix für Bug 1336 Fallunterscheidung für show_vc_details in Bezug auf Kunde oder Liefe...

[mfinanz.git] / bin / mozilla / ic.pl

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 9b5b20a25d0e63f9e17abd3bda7a6815889c1cf4..b29daa63c57d9bbf0044263886ba49c2491408fb 100644 (file)
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -290,14 +290,14 @@ sub update_prices {
 #      <th class=listtop colspan=6>| . $locale->text('choice part') . qq|</th>
 #     </tr>
 #        <tr height="5"></tr>
-#      <tr class=listheading>
-#        <th>&nbsp;</th>
-#        <th class=listheading>| . $locale->text('Part Number') . qq|</th>
-#        <th class=listheading>| . $locale->text('Part Description') . qq|</th>
-#        <th class=listheading>| . $locale->text('Unit of measure') . qq|</th>
-#        <th class=listheading>| . $locale->text('Sell Price') . qq|</th>
-#        <th class=listheading>| . $locale->text('soldtotal') . qq|</th>
-#      </tr>|;
+#        <tr class=listheading>
+#          <th>&nbsp;</th>
+#          <th class=listheading>| . $locale->text('Part Number') . qq|</th>
+#          <th class=listheading>| . $locale->text('Part Description') . qq|</th>
+#          <th class=listheading>| . $locale->text('Unit of measure') . qq|</th>
+#          <th class=listheading>| . $locale->text('Sell Price') . qq|</th>
+#          <th class=listheading>| . $locale->text('soldtotal') . qq|</th>
+#        </tr>|;
 #
 #  my $j = 0;
 #  my $i = $form->{rows};
@@ -308,20 +308,20 @@ sub update_prices {
 #        <tr class=listrow| . ($j % 2) . qq|>|;
 #    if ($j == 1) {
 #      print qq|
-#          <td><input name=ndx class=radio type=radio value=$j checked></td>|;
+#            <td><input name=ndx class=radio type=radio value=$j checked></td>|;
 #    } else {
 #      print qq|
-#        <td><input name=ndx class=radio type=radio value=$j></td>|;
+#          <td><input name=ndx class=radio type=radio value=$j></td>|;
 #    }
 #    print qq|
-#        <td><input name="new_partnumber_$j" type=hidden value="$form->{"partnumber_$j"}">$form->{"partnumber_$j"}</td>
-#        <td><input name="new_description_$j" type=hidden value="$form->{"description_$j"}">$form->{"description_$j"}</td>
-#        <td><input name="new_unit_$j" type=hidden value="$form->{"unit_$j"}">$form->{"unit_$j"}</td>
-#        <td><input name="new_sellprice_$j" type=hidden value="$form->{"sellprice_$j"}">$form->{"sellprice_$j"}</td>
-#        <td><input name="new_soldtotal_$j" type=hidden value="$form->{"soldtotal_$j"}">$form->{"soldtotal_$j"}</td>
+#          <td><input name="new_partnumber_$j" type=hidden value="$form->{"partnumber_$j"}">$form->{"partnumber_$j"}</td>
+#          <td><input name="new_description_$j" type=hidden value="$form->{"description_$j"}">$form->{"description_$j"}</td>
+#          <td><input name="new_unit_$j" type=hidden value="$form->{"unit_$j"}">$form->{"unit_$j"}</td>
+#          <td><input name="new_sellprice_$j" type=hidden value="$form->{"sellprice_$j"}">$form->{"sellprice_$j"}</td>
+#          <td><input name="new_soldtotal_$j" type=hidden value="$form->{"soldtotal_$j"}">$form->{"soldtotal_$j"}</td>
 #        </tr>
 #
-#      <input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
+#        <input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
 #  }
 #
 #  print qq|
@@ -1124,12 +1124,7 @@ sub generate_report {
   if ($form->{l_linetotal}) {
     $form->{l_onhand} = "Y";
     $form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice};
-    if ($form->{l_lastcost}) {
-      $form->{l_linetotallastcost} = "Y";
-      if (($form->{searchitems} eq 'assembly') && !$form->{bom}) {
-        $form->{l_linetotallastcost} = "";
-      }
-    }
+    $form->{l_linetotallastcost}  = $form->{searchitems} eq 'assembly' && !$form->{bom} ? "" : 'Y' if  $form->{l_lastcost};
     $form->{l_linetotallistprice} = "Y" if $form->{l_listprice};
   }
 
@@ -1156,9 +1151,12 @@ sub generate_report {
 
   IC->all_parts(\%myconfig, \%$form);
 
-  my @columns =
-    qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
-       priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal deliverydate);
+  my @columns = qw(
+    partnumber description partsgroup bin onhand rop unit listprice
+    linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
+    priceupdate weight image drawing microfiche invnumber ordnumber quonumber
+    transdate name serialnumber soldtotal deliverydate
+  );
 
   my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
   my @searchable_custom_variables  = grep { $_->{searchable} }  @{ $cvar_configs };
@@ -1190,6 +1188,7 @@ sub generate_report {
     'sellprice'          => { 'text' => $locale->text('Sell Price'), },
     'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
     'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
+    'transdate'          => { 'text' => $locale->text('Transdate'), },
     'unit'               => { 'text' => $locale->text('Unit'), },
     'weight'             => { 'text' => $locale->text('Weight'), },
     %column_defs_cvars,
@@ -1781,8 +1780,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-       $form->{addition} = "SAVED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $parts_id = $form->{id};
@@ -1914,8 +1913,8 @@ sub save_as_new {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-       $form->{addition} = "SAVED AS NEW";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED AS NEW";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   $form->{id} = 0;
@@ -1935,8 +1934,8 @@ sub delete {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-       $form->{addition} = "DELETED";
-       $form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history($form->dbconnect(\%myconfig));
   }
   # /saving the history
   my $rc = IC->delete(\%myconfig, \%$form);