X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=05aaced0dc44c9b18c21987f42e82de37310a198;hb=3dc2935c3cf31e5350f8acd83c3c67941a6a0dba;hp=80e0bbc554e277d6325882fdf03fb2e173c13ad9;hpb=e7214232350249fdab6da3445442ff85891a0d7c;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 80e0bbc55..05aaced0d 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -30,28 +30,55 @@
 # Inventory Control module
 #
 #======================================================================
-#$locale->text('ea');
 
+use POSIX qw(strftime);
+use List::Util qw(max);
+
+use SL::AM;
 use SL::IC;
+use SL::ReportGenerator;
 
 #use SL::PE;
 
-require "$form->{path}/io.pl";
+# use strict;
+#use warnings;
+
+# global imports
+our ($form, $locale, %myconfig, $lxdebug);
+
+require "bin/mozilla/io.pl";
+require "bin/mozilla/invoice_io.pl";
+require "bin/mozilla/common.pl";
+require "bin/mozilla/reportgenerator.pl";
 
 1;
 
+# Parserhappy(R):
+# type=submit $locale->text('Add Part')
+# type=submit $locale->text('Add Service')
+# type=submit $locale->text('Add Assembly')
+# type=submit $locale->text('Edit Part')
+# type=submit $locale->text('Edit Service')
+# type=submit $locale->text('Edit Assembly')
+# $locale->text('Parts')
+# $locale->text('Services')
+# $locale->text('Inventory quantity must be zero before you can set this part obsolete!')
+# $locale->text('Inventory quantity must be zero before you can set this assembly obsolete!')
+# $locale->text('Part Number missing!')
+# $locale->text('Service Number missing!')
+# $locale->text('Assembly Number missing!')
+# $locale->text('ea');
+
 # end of main
 
 sub add {
   $lxdebug->enter_sub();
 
-  $form->{title} = $locale->text('Add ' . ucfirst $form->{item});
+  $auth->assert('part_service_assembly_edit');
 
-  $form->{callback} =
-    "$form->{script}?action=add&item=$form->{item}&path=$form->{path}&login=$form->{login}&password=$form->{password}"
-    unless $form->{callback};
-
-  $form->{"unit_changeable"} = 1;
+  $form->{title}           = $locale->text('Add ' . ucfirst $form->{item});
+  $form->{callback}        = "$form->{script}?action=add&item=$form->{item}" unless $form->{callback};
+  $form->{unit_changeable} = 1;
 
   IC->get_pricegroups(\%myconfig, \%$form);
   &link_part;
@@ -63,548 +90,53 @@ sub add {
 sub search {
   $lxdebug->enter_sub();
 
-  $form->{title} = (ucfirst $form->{searchitems}) . "s";
-  $form->{title} = $locale->text($form->{title});
-
-  # switch for backward sorting
-  $form->{revers} = 0;
-
-  # memory for which table was sort at last time
-  $form->{lastsort} = "";
-
-  # counter for added entries to top100
-  $form->{ndxs_counter} = 0;
-
-  # $locale->text('Parts')
-  # $locale->text('Services')
-
-  # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";
-  if ($form->{jsscript}) {
-
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>
-       <td><input type=button name=transdatefrom id="trigger1" value=|
-      . $locale->text('button') . qq|></td>
-      |;
-    $button2 = qq|
-       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>
-       <td><input type=button name=transdateto name=transdateto id="trigger2" value=|
-      . $locale->text('button') . qq|></td>
-     |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "2", "transdatefrom", "BL", "trigger1",
-                          "transdateto", "BL", "trigger2");
-  } else {
-
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
-    $button2 = qq|
-                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
-  }
-
-  unless ($form->{searchitems} eq 'service') {
-
-    $onhand = qq|
-            <input name=itemstatus class=radio type=radio value=onhand>&nbsp;|
-      . $locale->text('On Hand') . qq|
-            <input name=itemstatus class=radio type=radio value=short>&nbsp;|
-      . $locale->text('Short') . qq|
-|;
-
-    $makemodel = qq|
-        <tr>
-          <th align=right nowrap>| . $locale->text('Make') . qq|</th>
-          <td><input name=make size=20></td>
-          <th align=right nowrap>| . $locale->text('Model') . qq|</th>
-          <td><input name=model size=20></td>
-        </tr>
-|;
-
-    $serialnumber = qq|
-          <th align=right nowrap>| . $locale->text('Serial Number') . qq|</th>
-          <td><input name=serialnumber size=20></td>
-|;
-
-    $l_serialnumber = qq|
-        <td><input name=l_serialnumber class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Serial Number') . qq|</td>
-|;
-
-  }
-
-  if ($form->{searchitems} eq 'assembly') {
-
-    $form->{title} = $locale->text('Assemblies');
+  $auth->assert('part_service_assembly_edit');
 
-    $toplevel = qq|
-        <tr>
-	  <td></td>
-          <td colspan=3>
-	  <input name=null class=radio type=radio value=1 checked>&nbsp;|
-      . $locale->text('Top Level') . qq|
-	  <input name=bom class=checkbox type=checkbox value=1>&nbsp;|
-      . $locale->text('Individual Items') . qq|
-          </td>
-        </tr>
-|;
+  $form->{revers}       = 0;  # switch for backward sorting
+  $form->{lastsort}     = ""; # memory for which table was sort at last time
+  $form->{ndxs_counter} = 0;  # counter for added entries to top100
 
-    $bought = qq|
-	<tr>
-	  <td></td>
-	  <td colspan=3>
-	    <table>
-	      <tr>
-	        <td>
-		  <table>
-		    <tr>
-		      <td><input name=sold class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Sold') . qq|</td>
-		    </tr>
-		    <tr>
-		      <td colspan=2><hr size=1 noshade></td>
-		    </tr>
-		    <tr>
-		      <td><input name=ordered class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Ordered') . qq|</td>
-		    </tr>
-		    <tr>
-		      <td colspan=4><hr size=1 noshade></td>
-		    </tr>
-		    <tr>
-		      <td><input name=quoted class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Quoted') . qq|</td>
-		    </tr>
-		  </table>
-		</td>
-		<td width=5%>&nbsp;</td>
-		<th>| . $locale->text('From') . qq|</th>
-                $button1
-		<th>| . $locale->text('To') . qq|</th>
-                $button2
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-|;
+  my %is_xyz     = map { +"is_$_" => ($form->{searchitems} eq $_) } qw(part service assembly);
 
-  } else {
+  $form->{title} = (ucfirst $form->{searchitems}) . "s";
+  $form->{title} = $locale->text($form->{title});
+  $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly});
 
-    $bought = qq|
-        <tr>
-          <td></td>
-          <td colspan=3>
-	    <table>
-	      <tr>
-	        <td>
-		  <table>
-		    <tr>
-		      <td><input name=bought class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Bought') . qq|</td>
-		      <td><input name=sold class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Sold') . qq|</td>
-		    </tr>
-		    <tr>
-		      <td colspan=4><hr size=1 noshade></td>
-		    </tr>
-		    <tr>
-		      <td><input name=onorder class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('On Order') . qq|</td>
-		      <td><input name=ordered class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Ordered') . qq|</td>
-		    </tr>
-		    <tr>
-		      <td colspan=4><hr size=1 noshade></td>
-		    </tr>
-		    <tr>
-		      <td><input name=rfq class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('RFQ') . qq|</td>
-		      <td><input name=quoted class=checkbox type=checkbox value=1></td>
-		      <td nowrap>| . $locale->text('Quoted') . qq|</td>
-		    </tr>
-		  </table>
-		</td>
-		<td width=5%>&nbsp;</td>
-		<td>
-		  <table>
-		    <tr>
-		      <th>| . $locale->text('From') . qq|</th>
-		      $button1
-		      <th>| . $locale->text('To') . qq|</th>
-		      $button2
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-|;
-  }
+  $form->{jsscript} = 1;
 
   $form->header;
 
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=searchitems value=$form->{searchitems}>
-<input type=hidden name=title value="$form->{title}">
-
-<input type=hidden name=revers value="$form->{revers}">
-<input type=hidden name=lastsort value="$form->{lastsort}">
-
-<table width="100%">
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <td>
-      <table>
-        <tr>
-          <th align=right nowrap>| . $locale->text('Part Number') . qq|</th>
-          <td><input name=partnumber size=20></td>
-        </tr>
-        <tr>
-          <th align=right nowrap>|
-    . $locale->text('Part Description') . qq|</th>
-          <td colspan=3><input name=description size=40></td>
-        </tr>
-	<tr>
-          <th align=right nowrap>| . $locale->text('Group') . qq|</th>
-          <td><input name=partsgroup size=20></td>
-	  $serialnumber
-	</tr>
-	$makemodel
-        <tr>
-          <th align=right nowrap>| . $locale->text('Drawing') . qq|</th>
-          <td><input name=drawing size=20></td>
-          <th align=right nowrap>| . $locale->text('Microfiche') . qq|</th>
-          <td><input name=microfiche size=20></td>
-        </tr>
-	$toplevel
-        <tr>
-          <td></td>
-          <td colspan=3>
-            <input name=itemstatus class=radio type=radio value=active checked>&nbsp;|
-    . $locale->text('Active') . qq|
-	    $onhand
-            <input name=itemstatus class=radio type=radio value=obsolete>&nbsp;|
-    . $locale->text('Obsolete') . qq|
-            <input name=itemstatus class=radio type=radio value=orphaned>&nbsp;|
-    . $locale->text('Orphaned') . qq|
-	  </td>
-	</tr>
-	$bought
-        <tr>
-	  <td></td>
-          <td colspan=3>
-	    <hr size=1 noshade>
-	  </td>
-	</tr>
-	<tr>
-          <th align=right nowrap>|
-    . $locale->text('Include in Report') . qq|</th>
-          <td colspan=3>
-            <table>
-              <tr>
-                <td><input name=l_partnumber class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Part Number') . qq|</td>
-		<td><input name=l_description class=checkbox type=checkbox value=Y checked>&nbsp;|
-    . $locale->text('Part Description') . qq|</td>
-		$l_serialnumber
-		<td><input name=l_unit class=checkbox type=checkbox value=Y checked>&nbsp;|
-    . $locale->text('Unit of measure') . qq|</td>
-	      </tr>
-	      <tr>
-                <td><input name=l_listprice class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('List Price') . qq|</td>
-		<td><input name=l_sellprice class=checkbox type=checkbox value=Y checked>&nbsp;|
-    . $locale->text('Sell Price') . qq|</td>
-		<td><input name=l_lastcost class=checkbox type=checkbox value=Y checked>&nbsp;|
-    . $locale->text('Last Cost') . qq|</td>
-		<td><input name=l_linetotal class=checkbox type=checkbox value=Y checked>&nbsp;|
-    . $locale->text('Line Total') . qq|</td>
-	      </tr>
-	      <tr>
-                <td><input name=l_priceupdate class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Updated') . qq|</td>
-		<td><input name=l_bin class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Bin') . qq|</td>
-		<td><input name=l_rop class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('ROP') . qq|</td>
-		<td><input name=l_weight class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Weight') . qq|</td>
-              </tr>
-	      <tr>
-                <td><input name=l_image class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Image') . qq|</td>
-		<td><input name=l_drawing class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Drawing') . qq|</td>
-		<td><input name=l_microfiche class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Microfiche') . qq|</td>
-		<td><input name=l_partsgroup class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Group') . qq|</td>
-              </tr>
-	      <tr>
-                <td><input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Subtotal') . qq|</td>
-		<td><input name=l_soldtotal class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('soldtotal') . qq|</td>
-		<td><input name=l_deliverydate class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('deliverydate') . qq|</td>    
-	      </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td colspan=4><hr size=3 noshade></td></tr>
-</table>
-
-$jsscript
-
-<input type=hidden name=nextsub value=generate_report>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input type=hidden name=revers value="$form->{revers}">
-<input type=hidden name=lastsort value="$form->{lastsort}">
-<input type=hidden name=sort value="description">
-
-<input type=hidden name=ndxs_counter value="$form->{ndxs_counter}">
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('TOP100') . qq|">
-</form>
+  print $form->parse_html_template('ic/search', { %is_xyz,
+                                                  dateformat => $myconfig{dateformat}, });
 
-</body>
-</html>
-|;
   $lxdebug->leave_sub();
 }    #end search()
 
-
 sub search_update_prices {
   $lxdebug->enter_sub();
 
-  $form->{title} = $locale->text('Update prices');
-  IC->get_pricegroups(\%myconfig, \%$form);
-
-  # use JavaScript Calendar or not
-#   $form->{jsscript} = $jscalendar;
-#   $jsscript = "";
-#   if ($form->{jsscript}) {
-# 
-#     # with JavaScript Calendar
-#     $button1 = qq|
-#        <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>
-#        <td><input type=button name=transdatefrom id="trigger1" value=|
-#       . $locale->text('button') . qq|></td>
-#       |;
-#     $button2 = qq|
-#        <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>
-#        <td><input type=button name=transdateto name=transdateto id="trigger2" value=|
-#       . $locale->text('button') . qq|></td>
-#      |;
-# 
-#     #write Trigger
-#     $jsscript =
-#       Form->write_trigger(\%myconfig, "2", "transdatefrom", "BL", "trigger1",
-#                           "transdateto", "BL", "trigger2");
-#   } else {
-# 
-#     # without JavaScript Calendar
-#     $button1 = qq|
-#                               <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
-#     $button2 = qq|
-#                               <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
-#   }
-
-    $onhand = qq|
-            <input name=itemstatus class=radio type=radio value=onhand>&nbsp;|
-      . $locale->text('On Hand') . qq|
-            <input name=itemstatus class=radio type=radio value=short>&nbsp;|
-      . $locale->text('Short') . qq|
-|;
-
-    $makemodel = qq|
-        <tr>
-          <th align=right nowrap>| . $locale->text('Make') . qq|</th>
-          <td><input name=make size=20></td>
-          <th align=right nowrap>| . $locale->text('Model') . qq|</th>
-          <td><input name=model size=20></td>
-        </tr>
-|;
-
-    $serialnumber = qq|
-          <th align=right nowrap>| . $locale->text('Serial Number') . qq|</th>
-          <td><input name=serialnumber size=20></td>
-|;
-
-    $l_serialnumber = qq|
-        <td><input name=l_serialnumber class=checkbox type=checkbox value=Y>&nbsp;|
-      . $locale->text('Serial Number') . qq|</td>
-|;
-
+  $auth->assert('part_service_assembly_edit');
 
+  my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form);
 
   $form->header;
 
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=title value="$form->{title}">
-
-<table width="100%">
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <td>
-      <table>
-        <tr>
-          <th align=right nowrap>| . $locale->text('Part Number') . qq|</th>
-          <td><input name=partnumber size=20></td>
-        </tr>
-        <tr>
-          <th align=right nowrap>|
-    . $locale->text('Part Description') . qq|</th>
-          <td colspan=3><input name=description size=40></td>
-        </tr>
-	<tr>
-          <th align=right nowrap>| . $locale->text('Group') . qq|</th>
-          <td><input name=partsgroup size=20></td>
-	  $serialnumber
-	</tr>
-	$makemodel
-        <tr>
-          <th align=right nowrap>| . $locale->text('Drawing') . qq|</th>
-          <td><input name=drawing size=20></td>
-          <th align=right nowrap>| . $locale->text('Microfiche') . qq|</th>
-          <td><input name=microfiche size=20></td>
-        </tr>
-	$toplevel
-        <tr>
-          <td></td>
-          <td colspan=3>
-            <input name=itemstatus class=radio type=radio value=active checked>&nbsp;|
-    . $locale->text('Active') . qq|
-	    $onhand
-            <input name=itemstatus class=radio type=radio value=obsolete>&nbsp;|
-    . $locale->text('Obsolete') . qq|
-            <input name=itemstatus class=radio type=radio value=orphaned>&nbsp;|
-    . $locale->text('Orphaned') . qq|
-	  </td>
-	</tr>
-	$bought
-        <tr>
-	  <td></td>
-          <td colspan=3>
-	    <hr size=1 noshade>
-	  </td>
-	</tr>|;
-  print qq|
-  <tr>
-    <td colspan=4>
-      <table width=100%>
-        <tr>
-          <th class="listheading">| . $locale->text('Preisklasse') . qq|</th>
-          <th class="listheading">| . $locale->text('Preis') . qq|</th>
-          <th class="listheading">| . $locale->text('Prozentual/Absolut') . qq|</th>
-        </tr>
-        <tr>
-          <td>| . $locale->text('Sell Price') . qq|</td>
-          <td><input name="sellprice" size=11 value="$form->{"sellprice"}"></td>
-          <td><input name="sellprice_type" class=radio type=radio value=percent checked>/<input name="sellprice_type" class=radio type=radio value=absolut></td>
-        </tr>
-        <tr>
-          <td>| . $locale->text('List Price') . qq|</td>
-          <td><input name="listprice" size=11 value="$form->{"listprice"}"></td>
-          <td><input name="listprice_type" class=radio type=radio value=percent checked>/<input name="listprice_type" class=radio type=radio value=absolut></td>
-        </tr>
-|;
-  for $i (1 .. $form->{price_rows}) {
-    print qq|
-        <tr>
-          <td width=50%><input type=hidden name="pricegroup_$i" size=30  value="$form->{"pricegroup_$i"}">$form->{"pricegroup_$i"}</td>
-          <td width=50%><input name="price_$i" size=11></td>
-          <input type=hidden name="pricegroup_id_$i" value="$form->{"pricegroup_id_$i"}">
-          <td><input name="pricegroup_type_$i" class=radio type=radio value=percent checked>/<input name="pricegroup_type_$i" class=radio type=radio value=absolut></td>
-        </tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-
-  <tr><td colspan=4><hr size=3 noshade></td></tr>
-</table>
-<input type=hidden name=nextsub value=confirm_price_update>
-<input type=hidden name=price_rows value=$form->{price_rows}>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-</form>
+  print $form->parse_html_template('ic/search_update_prices', { PRICE_ROWS => $pricegroups });
 
-</body>
-</html>
-|;
   $lxdebug->leave_sub();
 }    #end search()
 
 sub confirm_price_update {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
 
   $form->{nextsub} = "update_prices";
   $form->header;
 
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-|;
-
-  # delete action variable
   map { delete $form->{$_} } qw(action header);
 
-  foreach $key (keys %$form) {
-    $form->{$key} =~ s/\"/&quot;/g;
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
-  }
-
-  print qq|
-<h2 class=confirm>| . $locale->text('Confirm!') . qq|</h2>
-
-<h4>|
-    . $locale->text('Are you sure you want to update the prices')
-. qq| </h4>
-
-<p>
-<input name=action class=submit type=submit value="|
-    . $locale->text('Continue') . qq|">
-</form>
-|;
+  print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ] });
 
   $lxdebug->leave_sub();
 }
@@ -612,6 +144,8 @@ sub confirm_price_update {
 sub update_prices {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   if (IC->update_prices(\%myconfig, \%$form)) {
     $form->redirect($form->{update_count} . $locale->text('prices updated!'));
   } else {
@@ -621,322 +155,259 @@ sub update_prices {
   $lxdebug->leave_sub();
 }
 
-sub choice {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text('Top 100 hinzufuegen');
-
-  $form->header;
-
-  print qq|
-  <body>
-
-  <form method=post action=$form->{script}>
-
-  <input type=hidden name=searchitems value=$form->{searchitems}>
-  <input type=hidden name=title value="$form->{title}">
+#sub choice {
+#  $lxdebug->enter_sub();
+#
+#  $auth->assert('part_service_assembly_edit');
+#
+#  our ($j, $lastndx);
+#  my ($totop100);
+#
+#  $form->{title} = $locale->text('Top 100 hinzufuegen');
+#
+#  $form->header;
+#
+#  push @custom_hiddens, qw(searchitems title bom titel revers lastsort sort ndxs_counter extras);
+#  push @custom_hiddens, qw(itemstatus l_linetotal l_partnumber l_description l_onhand l_unit l_sellprice l_linetotalsellprice);
+#  my @HIDDENS = (
+#        +{ name => 'row',     value => $j              },
+#        +{ name => 'nextsub', value => 'item_selected' },
+#        +{ name => 'test',    value => 'item_selected' },
+#        +{ name => 'lastndx', value => $lastndx        },
+#    map(+{ name => $_,        value => $form->{$_}     }, @custom_hiddens),
+#  );
+#
+#  my ($partnumber, $description, $unit, $sellprice, $soldtotal);
+#  # if choice set data
+##  if ($form->{ndx}) {
+##    for my $i (0 .. $form->{ndxs_counter}) {
+##
+##      # insert data into top100
+##      push @{ $form->{parts} },
+##        { number      => "",
+##          partnumber  => $form->{"totop100_partnumber_$j"},
+##          description => $form->{"totop100_description_$j"},
+##          unit        => $form->{"totop100_unit_$j"},
+##          sellprice   => $form->{"totop100_sellprice_$j"},
+##          soldtotal   => $form->{"totop100_soldtotal_$j"},
+##        };
+##    }    #rof
+##  }    #fi
+#
+#  $totop100 = "";
+#
+#  # set data for next page
+#  for my $i (1 .. $form->{ndxs_counter}) {
+#    $partnumber  = $form->{"totop100_partnumber_$i"};
+#    $description = $form->{"totop100_description_$i"};
+#    $unit        = $form->{"totop100_unit_$i"};
+#    $sellprice   = $form->{"totop100_sellprice_$i"};
+#    $soldtotal   = $form->{"totop100_soldtotal_$i"};
+#
+#  push @PARTS, {
+#    totop100_partnumber  => $form->{"totop100_partnumber_$i"},
+#    totop100_description => $form->{"totop100_description_$i"},
+#    totop100_unit        => $form->{"totop100_unit_$i"},
+#    totop100_sellprice   => $form->{"totop100_sellprice_$i"},
+#    totop100_soldtotal   => $form->{"totop100_soldtotal_$i"},
+#  }
+#
+##    $totop100 .= qq|
+##<input type=hidden name=totop100_partnumber_$i value=$form->{"totop100_partnumber_$i"}>
+##<input type=hidden name=totop100_description_$i value=$form->{"totop100_description_$i"}>
+##<input type=hidden name=totop100_unit_$i value=$form->{"totop100_unit_$i"}>
+##<input type=hidden name=totop100_sellprice_$i value=$form->{"totop100_sellprice_$i"}>
+##<input type=hidden name=totop100_soldtotal_$i value=$form->{"totop100_soldtotal_$i"}>
+##    |;
+#  }    #rof
+#
+#  print $form->parse_html_template('ic/choice', +{ HIDDENS => \@HIDDENS, PARTS => \@PARTS });
+#
+#  $lxdebug->leave_sub();
+#}    #end choice
 
-  <input type=hidden name=revers value="$form->{revers}">
-  <input type=hidden name=lastsort value="$form->{lastsort}">|;
+#sub list {
+#  $lxdebug->enter_sub();
+#
+#  $auth->assert('part_service_assembly_edit');
+#
+#  our ($lastndx);
+#  our ($partnumber, $description, $unit, $sellprice, $soldtotal);
+#
+#  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');
+#
+#  $form->header;
+#
+#  print qq|
+#<body>
+#  <form method=post action=ic.pl>
+#    <table width=100%>
+#     <tr>
+#      <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>|;
+#
+#  my $j = 0;
+#  my $i = $form->{rows};
+#
+#  for ($j = 1; $j <= $i; $j++) {
+#
+#    print qq|
+#        <tr class=listrow| . ($j % 2) . qq|>|;
+#    if ($j == 1) {
+#      print qq|
+#	    <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>|;
+#    }
+#    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>
+#        </tr>
+#
+#	<input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
+#  }
+#
+#  print qq|
+#
+#</table>
+#
+#<br>
+#
+#
+#<input type=hidden name=itemstatus value="$form->{itemstatus}">
+#<input type=hidden name=l_linetotal value="$form->{l_linetotal}">
+#<input type=hidden name=l_partnumber value="$form->{l_partnumber}">
+#<input type=hidden name=l_description value="$form->{l_description}">
+#<input type=hidden name=l_onhand value="$form->{l_onhand}">
+#<input type=hidden name=l_unit value="$form->{l_unit}">
+#<input type=hidden name=l_sellprice value="$form->{l_sellprice}">
+#<input type=hidden name=l_linetotalsellprice value="$form->{l_linetotalsellprice}">
+#<input type=hidden name=sort value="$form->{sort}">
+#<input type=hidden name=revers value="$form->{revers}">
+#<input type=hidden name=lastsort value="$form->{lastsort}">
+#
+#<input type=hidden name=bom value="$form->{bom}">
+#<input type=hidden name=titel value="$form->{titel}">
+#<input type=hidden name=searchitems value="$form->{searchitems}">
+#
+#<input type=hidden name=row value=$j>
+#
+#<input type=hidden name=nextsub value=item_selected>
+#
+#<input name=lastndx type=hidden value=$lastndx>
+#
+#<input name=ndxs_counter type=hidden value=$form->{ndxs_counter}>|;
+#
+#  my $totop100 = "";
+#
+#  if (($form->{ndxs_counter}) > 0) {
+#    for ($i = 1; ($i < $form->{ndxs_counter} + 1); $i++) {
+#
+#      $partnumber  = $form->{"totop100_partnumber_$i"};
+#      $description = $form->{"totop100_description_$i"};
+#      $unit        = $form->{"totop100_unit_$i"};
+#      $sellprice   = $form->{"totop100_sellprice_$i"};
+#      $soldtotal   = $form->{"totop100_soldtotal_$i"};
+#
+#      $totop100 .= qq|
+#<input type=hidden name=totop100_partnumber_$i value=$form->{"totop100_partnumber_$i"}>
+#<input type=hidden name=totop100_description_$i value=$form->{"totop100_description_$i"}>
+#<input type=hidden name=totop100_unit_$i value=$form->{"totop100_unit_$i"}>
+#<input type=hidden name=totop100_sellprice_$i value=$form->{"totop100_sellprice_$i"}>
+#<input type=hidden name=totop100_soldtotal_$i value=$form->{"totop100_soldtotal_$i"}>
+#      |;
+#    }    #rof
+#  }    #fi
+#
+#  print $totop100;
+#
+#  print qq|
+#<input class=submit type=submit name=action value="|
+#    . $locale->text('TOP100') . qq|">
+#
+#</form>
+#</body>
+#</html>
+#|;
+#  $lxdebug->leave_sub();
+#}    #end list()
 
-  print qq|
-      <table>
-	<tr class=listheading>
-         <th class=listheading nowrap>|
-    . $locale->text('Part Number') . qq|</th>
-         <th class=listheading nowrap>|
-    . $locale->text('Part Description') . qq|</th>
-        </tr>
-        <tr valign=top>
-         <td><input type=text name=partnumber size=20 value=></td>
-         <td><input type=text name=description size=30 value=></td>
-       </tr>
-      </table>
-     <br>|;
+sub top100 {
+  $lxdebug->enter_sub();
 
-  print qq|
+  $auth->assert('part_service_assembly_edit');
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
+  if ($form->{ndx}) {
+    $form->{ndxs_counter}++;
 
-<input type=hidden name=itemstatus value="$form->{itemstatus}">
-<input type=hidden name=l_linetotal value="$form->{l_linetotal}">
-<input type=hidden name=l_partnumber value="$form->{l_partnumber}">
-<input type=hidden name=l_description value="$form->{l_description}">
-<input type=hidden name=l_onhand value="$form->{l_onhand}">
-<input type=hidden name=l_unit value="$form->{l_unit}">
-<input type=hidden name=l_sellprice value="$form->{l_sellprice}">
-<input type=hidden name=l_linetotalsellprice value="$form->{l_linetotalsellprice}">
-<input type=hidden name=sort value="$form->{sort}">
-<input type=hidden name=revers value="$form->{revers}">
-<input type=hidden name=lastsort value="$form->{lastsort}">
+    if ($form->{ndxs_counter} > 0) {
 
-<input type=hidden name=bom value="$form->{bom}">
-<input type=hidden name=titel value="$form->{titel}">
-<input type=hidden name=searchitems value="$form->{searchitems}">
+      my $index = $form->{ndx};
 
-<input type=hidden name=row value=$j>
+      $form->{"totop100_partnumber_$form->{ndxs_counter}"} = $form->{"new_partnumber_$index"};
+      $form->{"totop100_description_$form->{ndxs_counter}"} = $form->{"new_description_$index"};
+      $form->{"totop100_unit_$form->{ndxs_counter}"} = $form->{"new_unit_$index"};
+      $form->{"totop100_sellprice_$form->{ndxs_counter}"} = $form->{"new_sellprice_$index"};
+      $form->{"totop100_soldtotal_$form->{ndxs_counter}"} = $form->{"new_soldtotal_$index"};
+    }    #fi
+  }    #fi
+  &addtop100();
+  $lxdebug->leave_sub();
+}    #end top100
 
-<input type=hidden name=nextsub value=item_selected>
+sub addtop100 {
+  $lxdebug->enter_sub();
 
-<input type=hidden name=test value=item_selected>
+  $auth->assert('part_service_assembly_edit');
 
-<input name=lastndx type=hidden value=$lastndx>
+  my ($revers, $lastsort, $callback, $option, $description, $sameitem,
+      $partnumber, $unit, $sellprice, $soldtotal, $totop100, $onhand, $align);
+  my (@column_index, %column_header, %column_data);
+  my ($totalsellprice, $totallastcost, $totallistprice, $subtotalonhand, $subtotalsellprice, $subtotallastcost, $subtotallistprice);
 
-<input name=ndxs_counter type=hidden value=$form->{ndxs_counter}>
+  $form->{top100}      = "top100";
+  $form->{l_soldtotal} = "Y";
+  $form->{soldtotal}   = "soldtotal";
+  $form->{sort}        = "soldtotal";
+  $form->{l_qty}       = "N";
+  $form->{l_linetotal} = "";
+  $form->{revers}      = 1;
+  $form->{number}      = "position";
+  $form->{l_number}    = "Y";
 
-<input name=extras type=hidden value=$form->{extras}>|;
+  $totop100 = "";
 
-  # if choice set data
-  if ($form->{ndx}) {
-    for ($i = 0; $i < $form->{ndxs_counter}; $i++) {
+  $form->{title} = $locale->text('Top 100');
 
-      # prepeare data
-      $partnumber  = $form->{"totop100_partnumber_$j"};
-      $description = $form->{"totop100_description_$j"};
-      $unit        = $form->{"totop100_unit_$j"};
-      $sellprice   = $form->{"totop100_sellprice_$j"};
-      $soldtotal   = $form->{"totop100_soldtotal_$j"};
+  $revers   = $form->{revers};
+  $lastsort = $form->{lastsort};
 
-      # insert data into top100
-      push @{ $form->{parts} },
-        { number      => "",
-          partnumber  => "$partnumber",
-          description => "$description",
-          unit        => "$unit",
-          sellprice   => "$sellprice",
-          soldtotal   => "$soldtotal" };
-    }    #rof
+  if (($form->{lastsort} eq "") && ($form->{sort} eq undef)) {
+    $form->{revers}   = 0;
+    $form->{lastsort} = "partnumber";
+    $form->{sort}     = "partnumber";
   }    #fi
 
-  $totop100 = "";
-
-  # set data for next page
-  if (($form->{ndxs_counter}) > 0) {
-    for ($i = 1; ($i < $form->{ndxs_counter} + 1); $i++) {
-      $partnumber  = $form->{"totop100_partnumber_$i"};
-      $description = $form->{"totop100_description_$i"};
-      $unit        = $form->{"totop100_unit_$i"};
-      $sellprice   = $form->{"totop100_sellprice_$i"};
-      $soldtotal   = $form->{"totop100_soldtotal_$i"};
-
-      $totop100 .= qq|
-<input type=hidden name=totop100_partnumber_$i value=$form->{"totop100_partnumber_$i"}>
-<input type=hidden name=totop100_description_$i value=$form->{"totop100_description_$i"}>
-<input type=hidden name=totop100_unit_$i value=$form->{"totop100_unit_$i"}>
-<input type=hidden name=totop100_sellprice_$i value=$form->{"totop100_sellprice_$i"}>
-<input type=hidden name=totop100_soldtotal_$i value=$form->{"totop100_soldtotal_$i"}>
-      |;
-    }    #rof
-  }    #fi
-
-  print $totop100;
-
-  print qq|
-     <input class=submit type=submit name=action value="|
-    . $locale->text('list') . qq|">
-    </form>
-
-   </body>
-  </html>|;
-  $lxdebug->leave_sub();
-}    #end 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
-
-  $form->{title} = $locale->text('Top 100 hinzufuegen');
-
-  $form->header;
-
-  print qq|
-<body>
-  <form method=post action=ic.pl>
-    <table width=100%>
-     <tr>
-      <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>|;
-
-  my $j = 0;
-  my $i = $form->{rows};
-
-  for ($j = 1; $j <= $i; $j++) {
-
-    print qq|
-        <tr class=listrow1>|;
-    if ($j == 1) {
-      print qq|
-	    <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>|;
-    }
-    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>
-        </tr>
-
-	<input name="new_id_$j" type=hidden value="$form->{"id_$j"}">|;
-  }
-
-  print qq|
-
-</table>
-
-<br>
-
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input type=hidden name=itemstatus value="$form->{itemstatus}">
-<input type=hidden name=l_linetotal value="$form->{l_linetotal}">
-<input type=hidden name=l_partnumber value="$form->{l_partnumber}">
-<input type=hidden name=l_description value="$form->{l_description}">
-<input type=hidden name=l_onhand value="$form->{l_onhand}">
-<input type=hidden name=l_unit value="$form->{l_unit}">
-<input type=hidden name=l_sellprice value="$form->{l_sellprice}">
-<input type=hidden name=l_linetotalsellprice value="$form->{l_linetotalsellprice}">
-<input type=hidden name=sort value="$form->{sort}">
-<input type=hidden name=revers value="$form->{revers}">
-<input type=hidden name=lastsort value="$form->{lastsort}">
-
-<input type=hidden name=bom value="$form->{bom}">
-<input type=hidden name=titel value="$form->{titel}">
-<input type=hidden name=searchitems value="$form->{searchitems}">
-
-<input type=hidden name=row value=$j>
-
-<input type=hidden name=nextsub value=item_selected>
-
-<input name=lastndx type=hidden value=$lastndx>
-
-<input name=ndxs_counter type=hidden value=$form->{ndxs_counter}>|;
-
-  $totop100 = "";
-
-  if (($form->{ndxs_counter}) > 0) {
-    for ($i = 1; ($i < $form->{ndxs_counter} + 1); $i++) {
-      $j1 = $form->{"totop100_partnumber_$i"};
-      $j2 = $form->{"totop100_description_$i"};
-      $j3 = $form->{"totop100_unit_$i"};
-      $j4 = $form->{"totop100_sellprice_$i"};
-      $j5 = $form->{"totop100_soldtotal_$i"};
-
-      $partnumber  = $j1;
-      $description = $j2;
-      $unit        = $j3;
-      $sellprice   = $j4;
-      $soldtotal   = $j5;
-
-      $totop100 .= qq|
-<input type=hidden name=totop100_partnumber_$i value=$form->{"totop100_partnumber_$i"}>
-<input type=hidden name=totop100_description_$i value=$form->{"totop100_description_$i"}>
-<input type=hidden name=totop100_unit_$i value=$form->{"totop100_unit_$i"}>
-<input type=hidden name=totop100_sellprice_$i value=$form->{"totop100_sellprice_$i"}>
-<input type=hidden name=totop100_soldtotal_$i value=$form->{"totop100_soldtotal_$i"}>
-      |;
-    }    #rof
-  }    #fi
-
-  print $totop100;
-
-  print qq|
-<input class=submit type=submit name=action value="|
-    . $locale->text('TOP100') . qq|">
-
-</form>
-</body>
-</html>
-|;
-  $lxdebug->leave_sub();
-}    #end list()
-
-sub top100 {
-  $lxdebug->enter_sub();
-
-  if ($form->{ndx}) {
-    $form->{ndxs_counter}++;
-
-    if ($form->{ndxs_counter} > 0) {
-
-      $index = $form->{ndx};
-
-      $j1 = $form->{"new_partnumber_$index"};
-      $form->{"totop100_partnumber_$form->{ndxs_counter}"} = $j1;
-      $j2 = $form->{"new_description_$index"};
-      $form->{"totop100_description_$form->{ndxs_counter}"} = $j2;
-      $j3 = $form->{"new_unit_$index"};
-      $form->{"totop100_unit_$form->{ndxs_counter}"} = $j3;
-      $j4 = $form->{"new_sellprice_$index"};
-      $form->{"totop100_sellprice_$form->{ndxs_counter}"} = $j4;
-      $j5 = $form->{"new_soldtotal_$index"};
-      $form->{"totop100_soldtotal_$form->{ndxs_counter}"} = $j5;
-    }    #fi
-  }    #fi
-  &addtop100();
-  $lxdebug->leave_sub();
-}    #end top100
-
-sub addtop100 {
-  $lxdebug->enter_sub();
-
-  $form->{top100}      = "top100";
-  $form->{l_soldtotal} = "Y";
-  $form->{soldtotal}   = "soldtotal";
-  $form->{sort}        = "soldtotal";
-  $form->{l_qty}       = "N";
-  $callback .= "&form->{top100}=$form->{top100}";
-  $form->{l_linetotal} = "";
-  $form->{revers}      = 1;
-  $form->{number}      = "position";
-  $form->{l_number}    = "Y";
-
-  my $totop100 = "";
-
-  $form->{title} = $locale->text('Top 100');
-
-  $revers   = $form->{revers};
-  $lastsort = $form->{lastsort};
-
-  if (($form->{lastsort} eq "") && ($form->{sort} eq undef)) {
-    $form->{revers}   = 0;
-    $form->{lastsort} = "partnumber";
-    $form->{sort}     = "partnumber";
-  }    #fi
-
-  $callback =
-    "$form->{script}?action=top100&path=$form->{path}&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title="
-    . $form->escape($form->{title}, 1);
+  $callback =
+    "$form->{script}?action=top100&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title="
+    . $form->escape($form->{title}, 1);
 
   # if we have a serialnumber limit search
   if ($form->{serialnumber} || $form->{l_serialnumber}) {
@@ -1028,22 +499,23 @@ sub addtop100 {
     $callback .= "&partnumber=$form->{partnumber}";
     $option   .= $locale->text('Part Number') . qq| : $form->{partnumber}<br>|;
   }
+  if ($form->{ean}) {
+    $callback .= "&partnumber=$form->{ean}";
+    $option   .= $locale->text('EAN') . qq| : $form->{ean}<br>|;
+  }
   if ($form->{partsgroup}) {
     $callback .= "&partsgroup=$form->{partsgroup}";
     $option   .= $locale->text('Group') . qq| : $form->{partsgroup}<br>|;
   }
   if ($form->{serialnumber}) {
     $callback .= "&serialnumber=$form->{serialnumber}";
-    $option   .=
-      $locale->text('Serial Number') . qq| : $form->{serialnumber}<br>|;
+    $option   .= $locale->text('Serial Number') . qq| : $form->{serialnumber}<br>|;
   }
   if ($form->{description}) {
-    $callback .= "&description=$form->{description}";
+    $callback   .= "&description=$form->{description}";
     $description = $form->{description};
-    $description =~ s/
-/<br>/g;
-    $option .=
-      $locale->text('Part Description') . qq| : $form->{description}<br>|;
+    $description =~ s/\n/<br>/g;
+    $option     .= $locale->text('Part Description') . qq| : $form->{description}<br>|;
   }
   if ($form->{make}) {
     $callback .= "&make=$form->{make}";
@@ -1066,8 +538,8 @@ sub addtop100 {
     $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
   }
 
-  @columns = $form->sort_columns(
-    qw(number partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
+  my @columns = $form->sort_columns(
+    qw(number partnumber ean description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal)
   );
 
   if ($form->{l_linetotal}) {
@@ -1103,10 +575,7 @@ sub addtop100 {
     }
   }
 
-  $form->{l_lastcost} = ""
-    if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
-  foreach $item (@columns) {
+  foreach my $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
       push @column_index, $item;
 
@@ -1208,7 +677,7 @@ sub addtop100 {
     . qq|</a></th>|;
 
   $form->header;
-  $colspan = $#column_index + 1;
+  my $colspan = $#column_index + 1;
 
   print qq|
 <body>
@@ -1242,14 +711,14 @@ sub addtop100 {
 
   # insert numbers for top100
   my $j = 0;
-  foreach $ref (@{ $form->{parts} }) {
+  foreach my $ref (@{ $form->{parts} }) {
     $j++;
     $ref->{number} = $j;
   }
 
   # if avaible -> insert choice here
   if (($form->{ndxs_counter}) > 0) {
-    for ($i = 1; ($i < $form->{ndxs_counter} + 1); $i++) {
+    for (my $i = 1; ($i < $form->{ndxs_counter} + 1); $i++) {
       $partnumber  = $form->{"totop100_partnumber_$i"};
       $description = $form->{"totop100_description_$i"};
       $unit        = $form->{"totop100_unit_$i"};
@@ -1275,7 +744,8 @@ sub addtop100 {
     }    #rof
   }    #fi
        # build data for columns
-  foreach $ref (@{ $form->{parts} }) {
+  my $i = 0;
+  foreach my $ref (@{ $form->{parts} }) {
 
     if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) {
       if ($sameitem ne $ref->{ $form->{sort} }) {
@@ -1298,12 +768,11 @@ sub addtop100 {
       $onhand = 0 if ($form->{sold});
     }
 
-    $ref->{description} =~ s/
-/<br>/g;
+    $ref->{description} =~ s/\n/<br>/g;
 
     $column_data{number} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{number}, '', "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{number})
       . "</td>";
     $column_data{partnumber} =
       "<td align=$align>$ref->{partnumber}&nbsp;</a></td>";
@@ -1312,32 +781,29 @@ sub addtop100 {
 
     $column_data{onhand} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{onhand})
       . "</td>";
     $column_data{sellprice} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{sellprice})
       . "</td>";
     $column_data{listprice} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{listprice}, 2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{listprice})
       . "</td>";
     $column_data{lastcost} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{lastcost}, 2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{lastcost})
       . "</td>";
 
     $column_data{linetotalsellprice} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice},
-                             2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice}, 2)
       . "</td>";
     $column_data{linetotallastcost} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost},
-                             2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost}, 2)
       . "</td>";
     $column_data{linetotallistprice} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice},
-                             2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2)
       . "</td>";
 
     if (!$ref->{assemblyitem}) {
@@ -1353,10 +819,10 @@ sub addtop100 {
 
     $column_data{rop} =
       "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{rop}, '', "&nbsp;") . "</td>";
+      . $form->format_amount(\%myconfig, $ref->{rop}) . "</td>";
     $column_data{weight} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{weight}, '', "&nbsp;")
+      . $form->format_amount(\%myconfig, $ref->{weight})
       . "</td>";
     $column_data{unit}        = "<td>$ref->{unit}&nbsp;</td>";
     $column_data{bin}         = "<td>$ref->{bin}&nbsp;</td>";
@@ -1364,15 +830,15 @@ sub addtop100 {
 
     $column_data{invnumber} =
       ($ref->{module} ne 'oe')
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&callback=$callback>$ref->{invnumber}</a></td>"
       : "<td>$ref->{invnumber}</td>";
     $column_data{ordnumber} =
       ($ref->{module} eq 'oe')
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{ordnumber}</a></td>"
       : "<td>$ref->{ordnumber}</td>";
     $column_data{quonumber} =
       ($ref->{module} eq 'oe' && !$ref->{ordnumber})
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"
+      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&callback=$callback>$ref->{quonumber}</a></td>"
       : "<td>$ref->{quonumber}</td>";
 
     $column_data{name} = "<td>$ref->{name}</td>";
@@ -1413,15 +879,15 @@ sub addtop100 {
     map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
     $column_data{linetotalsellprice} =
         "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totalsellprice, 2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $totalsellprice, 2)
       . "</th>";
     $column_data{linetotallastcost} =
         "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totallastcost, 2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $totallastcost, 2)
       . "</th>";
     $column_data{linetotallistprice} =
         "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totallistprice, 2, "&nbsp;")
+      . $form->format_amount(\%myconfig, $totallistprice, 2)
       . "</th>";
 
     print "<tr class=listtotal>";
@@ -1444,10 +910,6 @@ sub addtop100 {
 
 <form method=post action=$form->{script}>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input type=hidden name=itemstatus value="$form->{itemstatus}">
 <input type=hidden name=l_linetotal value="$form->{l_linetotal}">
 <input type=hidden name=l_partnumber value="$form->{l_partnumber}">
@@ -1468,17 +930,11 @@ sub addtop100 {
   print $totop100;
 
   print qq|
-    <input type=hidden name=ndxs_counter value="$form->{ndxs_counter}">
+<!--    <input type=hidden name=ndxs_counter value="$form->{ndxs_counter}">-->
 
     <input class=submit type=submit name=action value="|
-    . $locale->text('choice') . qq|">|;
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
+    . $locale->text('choice') . qq|">
 
-  print qq|
   </form>
 
 </body>
@@ -1488,174 +944,141 @@ sub addtop100 {
   $lxdebug->leave_sub();
 }    # end addtop100
 
+#
+# Report for Wares.
+# Warning, deep magic ahead.
+# This function parses the requested details, sanity checks them, and converts them into a format thats usable for IC->all_parts
+#
+# flags coming from the form:
+# hardcoded:
+#  searchitems=part revers=0 lastsort=''
+#
+# filter:
+# partnumber ean description partsgroup serialnumber make model drawing microfiche
+# transdatefrom transdateto
+#
+# radio:
+#  itemstatus = active | onhand | short | obsolete | orphaned
+#  action     = continue | top100
+#
+# checkboxes:
+#  bought sold onorder ordered rfq quoted
+#  l_partnumber l_description l_serialnumber l_unit l_listprice l_sellprice l_lastcost
+#  l_linetotal l_priceupdate l_bin l_rop l_weight l_image l_drawing l_microfiche
+#  l_partsgroup l_subtotal l_soldtotal l_deliverydate
+#
+# hiddens:
+#  nextsub revers lastsort sort ndxs_counter
+#
 sub generate_report {
   $lxdebug->enter_sub();
 
-  $revers   = $form->{revers};
-  $lastsort = $form->{lastsort};
+  $auth->assert('part_service_assembly_edit');
 
+  my ($revers, $lastsort, $description);
+
+  $form->{title} = (ucfirst $form->{searchitems}) . "s";
+  $form->{title} =~ s/ys$/ies/;
+  $form->{title} = $locale->text($form->{title});
+
+  my $revers     = $form->{revers};
+  my $lastsort   = $form->{lastsort};
+
+  # sorting and direction of sorting
+  # ToDO: change this to the simpler field+direction method
   if (($form->{lastsort} eq "") && ($form->{sort} eq undef)) {
     $form->{revers}   = 0;
     $form->{lastsort} = "partnumber";
     $form->{sort}     = "partnumber";
   } else {
-
-    # switch between backward sorting of tables
     if ($form->{lastsort} eq $form->{sort}) {
-      if ($form->{revers} == 0) {
-        $form->{revers} = 1;
-      } else {
-        $form->{revers} = 0;
-      }    #fi
+      $form->{revers} = 1 - $form->{revers};
     } else {
-      $form->{revers} == 0;
+      $form->{revers} = 0;
       $form->{lastsort} = $form->{sort};
     }    #fi
   }    #fi
 
-  $callback =
-    "$form->{script}?action=generate_report&path=$form->{path}&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title="
-    . $form->escape($form->{title}, 1);
+  # special case if we have a serialnumber limit search
+  # serialnumbers are only given in invoices and orders,
+  # so they can only pop up in bought, sold, rfq, and quoted stuff
+  $form->{no_sn_joins} = 'Y' if (   !$form->{bought} && !$form->{sold}
+                                 && !$form->{rfq}    && !$form->{quoted}
+                                 && ($form->{l_serialnumber} || $form->{serialnumber}));
+
+  # special case for any checkbox of bought | sold | onorder | ordered | rfq | quoted.
+  # if any of these are ticked the behavior changes slightly for lastcost
+  # since all those are aggregation checks for the legder tables this is an internal switch
+  # refered to as ledgerchecks
+  $form->{ledgerchecks} = 'Y' if (   $form->{bought} || $form->{sold} || $form->{onorder}
+                                  || $form->{ordered} || $form->{rfq} || $form->{quoted});
+
+  # if something should be activated if something else is active, enter it here
+  my %dependencies = (
+    onhand       => [ qw(l_onhand) ],
+    short        => [ qw(l_onhand) ],
+    onorder      => [ qw(l_ordnumber) ],
+    ordered      => [ qw(l_ordnumber) ],
+    rfq          => [ qw(l_quonumber) ],
+    quoted       => [ qw(l_quonumber) ],
+    bought       => [ qw(l_invnumber) ],
+    sold         => [ qw(l_invnumber) ],
+    ledgerchecks => [ qw(l_name) ],
+    serialnumber => [ qw(l_serialnumber) ],
+    no_sn_joins  => [ qw(bought sold) ],
+  );
 
-  # if we have a serialnumber limit search
-  if ($form->{serialnumber} || $form->{l_serialnumber}) {
-    $form->{l_serialnumber} = "Y";
-    unless (   $form->{bought}
-            || $form->{sold}
-            || $form->{rfq}
-            || $form->{quoted}) {
-      $form->{bought} = $form->{sold} = 1;
-    }
-  }
+  # these strings get displayed at the top of the results to indicate the user which switches were used
+  my %optiontexts = (
+    active        => $locale->text('Active'),
+    obsolete      => $locale->text('Obsolete'),
+    orphaned      => $locale->text('Orphaned'),
+    onhand        => $locale->text('On Hand'),
+    short         => $locale->text('Short'),
+    onorder       => $locale->text('On Order'),
+    ordered       => $locale->text('Ordered'),
+    rfq           => $locale->text('RFQ'),
+    quoted        => $locale->text('Quoted'),
+    bought        => $locale->text('Bought'),
+    sold          => $locale->text('Sold'),
+    transdatefrom => $locale->text('From')       . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1),
+    transdateto   => $locale->text('To (time)')  . " " . $locale->date(\%myconfig, $form->{transdateto}, 1),
+    partnumber    => $locale->text('Part Number')      . ": '$form->{partnumber}'",
+    partsgroup    => $locale->text('Group')            . ": '$form->{partsgroup}'",
+    serialnumber  => $locale->text('Serial Number')    . ": '$form->{serialnumber}'",
+    description   => $locale->text('Part Description') . ": '$form->{description}'",
+    make          => $locale->text('Make')             . ": '$form->{make}'",
+    model         => $locale->text('Model')            . ": '$form->{model}'",
+    drawing       => $locale->text('Drawing')          . ": '$form->{drawing}'",
+    microfiche    => $locale->text('Microfiche')       . ": '$form->{microfiche}'",
+    l_soldtotal   => $locale->text('soldtotal'),
+  );
 
-  IC->all_parts(\%myconfig, \%$form);
+  my @itemstatus_keys = qw(active obsolete orphaned onhand short);
+  my @callback_keys   = qw(onorder ordered rfq quoted bought sold partnumber partsgroup serialnumber description make model
+                           drawing microfiche l_soldtotal l_deliverydate transdatefrom transdateto ean);
 
-  if ($form->{itemstatus} eq 'active') {
-    $option .= $locale->text('Active') . " : ";
-  }
-  if ($form->{itemstatus} eq 'obsolete') {
-    $option .= $locale->text('Obsolete') . " : ";
-  }
-  if ($form->{itemstatus} eq 'orphaned') {
-    $option .= $locale->text('Orphaned') . " : ";
-  }
-  if ($form->{itemstatus} eq 'onhand') {
-    $option .= $locale->text('On Hand') . " : ";
-    $form->{l_onhand} = "Y";
-  }
-  if ($form->{itemstatus} eq 'short') {
-    $option .= $locale->text('Short') . " : ";
-    $form->{l_onhand} = "Y";
-  }
-  if ($form->{onorder}) {
-    $form->{l_ordnumber} = "Y";
-    $callback .= "&onorder=$form->{onorder}";
-    $option   .= $locale->text('On Order') . " : ";
-  }
-  if ($form->{ordered}) {
-    $form->{l_ordnumber} = "Y";
-    $callback .= "&ordered=$form->{ordered}";
-    $option   .= $locale->text('Ordered') . " : ";
-  }
-  if ($form->{rfq}) {
-    $form->{l_quonumber} = "Y";
-    $callback .= "&rfq=$form->{rfq}";
-    $option   .= $locale->text('RFQ') . " : ";
-  }
-  if ($form->{quoted}) {
-    $form->{l_quonumber} = "Y";
-    $callback .= "&quoted=$form->{quoted}";
-    $option   .= $locale->text('Quoted') . " : ";
-  }
-  if ($form->{bought}) {
-    $form->{l_invnumber} = "Y";
-    $callback .= "&bought=$form->{bought}";
-    $option   .= $locale->text('Bought') . " : ";
+  # calculate dependencies
+  for (@itemstatus_keys, @callback_keys) {
+    next if ($form->{itemstatus} ne $_ && !$form->{$_});
+    map { $form->{$_} = 'Y' } @{ $dependencies{$_} } if $dependencies{$_};
   }
-  if ($form->{sold}) {
-    $form->{l_invnumber} = "Y";
-    $callback .= "&sold=$form->{sold}";
-    $option   .= $locale->text('Sold') . " : ";
-  }
-  if (   $form->{bought}
-      || $form->{sold}
-      || $form->{onorder}
-      || $form->{ordered}
-      || $form->{rfq}
-      || $form->{quoted}) {
 
-    $form->{l_lastcost} = "";
-    $form->{l_name}     = "Y";
-    if ($form->{transdatefrom}) {
-      $callback .= "&transdatefrom=$form->{transdatefrom}";
-      $option   .= "\n<br>"
-        . $locale->text('From')
-        . "&nbsp;"
-        . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
-    }
-    if ($form->{transdateto}) {
-      $callback .= "&transdateto=$form->{transdateto}";
-      $option   .= "\n<br>"
-        . $locale->text('To')
-        . "&nbsp;"
-        . $locale->date(\%myconfig, $form->{transdateto}, 1);
-    }
+  # generate callback and optionstrings
+  my @options;
+  for my  $key (@itemstatus_keys, @callback_keys) {
+    next if ($form->{itemstatus} ne $key && !$form->{$key});
+    push @options, $optiontexts{$key};
   }
 
-  $option .= "<br>";
+  # special case for lastcost
+  $form->{l_lastcost} = "" if $form->{ledgerchecks};
 
-  if ($form->{partnumber}) {
-    $callback .= "&partnumber=$form->{partnumber}";
-    $option   .= $locale->text('Part Number') . qq| : $form->{partnumber}<br>|;
-  }
-  if ($form->{partsgroup}) {
-    $callback .= "&partsgroup=$form->{partsgroup}";
-    $option   .= $locale->text('Group') . qq| : $form->{partsgroup}<br>|;
-  }
-  if ($form->{serialnumber}) {
-    $callback .= "&serialnumber=$form->{serialnumber}";
-    $option   .=
-      $locale->text('Serial Number') . qq| : $form->{serialnumber}<br>|;
-  }
   if ($form->{description}) {
-    $callback .= "&description=$form->{description}";
     $description = $form->{description};
-    $description =~ s/
-/<br>/g;
-    $option .=
-      $locale->text('Part Description') . qq| : $form->{description}<br>|;
-  }
-  if ($form->{make}) {
-    $callback .= "&make=$form->{make}";
-    $option   .= $locale->text('Make') . qq| : $form->{make}<br>|;
-  }
-  if ($form->{model}) {
-    $callback .= "&model=$form->{model}";
-    $option   .= $locale->text('Model') . qq| : $form->{model}<br>|;
-  }
-  if ($form->{drawing}) {
-    $callback .= "&drawing=$form->{drawing}";
-    $option   .= $locale->text('Drawing') . qq| : $form->{drawing}<br>|;
-  }
-  if ($form->{microfiche}) {
-    $callback .= "&microfiche=$form->{microfiche}";
-    $option   .= $locale->text('Microfiche') . qq| : $form->{microfiche}<br>|;
-  }
-
-  # table soldtotal aktive
-  if ($form->{l_soldtotal}) {
-    $callback .= "&soldtotal=$form->{soldtotal}";
-    $option   .= $locale->text('soldtotal') . qq| : $form->{soldtotal}<br>|;
-  }
-
-  if ($form->{l_deliverydate}) {
-    $callback .= "&deliverydate=$form->{deliverydate}";
+    $description =~ s/\n/<br>/g;
   }
 
-  @columns = $form->sort_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)
-  );
-
   if ($form->{l_linetotal}) {
     $form->{l_onhand} = "Y";
     $form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice};
@@ -1689,339 +1112,183 @@ sub generate_report {
     }
   }
 
-  $form->{l_lastcost} = ""
-    if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
-  foreach $item (@columns) {
-    if ($form->{"l_$item"} eq "Y") {
-      push @column_index, $item;
-
-      # add column to callback
-      $callback .= "&l_$item=Y";
-    }
-  }
-
-  if ($form->{l_subtotal} eq 'Y') {
-    $callback .= "&l_subtotal=Y";
-  }
-  $column_header{partnumber} =
-    qq|<th nowrap><a class=listheading href=$callback&sort=partnumber&revers=$form->{revers}&lastsort=$form->{lastsort}>|
-    . $locale->text('Part Number')
-    . qq|</a></th>|;
-  $column_header{description} =
-    qq|<th nowrap><a class=listheading href=$callback&sort=description&revers=$form->{revers}&lastsort=$form->{lastsort}>|
-    . $locale->text('Part Description')
-    . qq|</a></th>|;
-  $column_header{partsgroup} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=partsgroup>|
-    . $locale->text('Group')
-    . qq|</a></th>|;
-  $column_header{bin} =
-      qq|<th><a class=listheading href=$callback&sort=bin>|
-    . $locale->text('Bin')
-    . qq|</a></th>|;
-  $column_header{priceupdate} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=priceupdate>|
-    . $locale->text('Updated')
-    . qq|</a></th>|;
-  $column_header{onhand} =
-    qq|<th nowrap><a  class=listheading href=$callback&sort=onhand&revers=$form->{revers}&lastsort=$form->{lastsort}>|
-    . $locale->text('Qty')
-    . qq|</th>|;
-  $column_header{unit} =
-    qq|<th class=listheading nowrap>| . $locale->text('Unit') . qq|</th>|;
-  $column_header{listprice} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('List Price')
-    . qq|</th>|;
-  $column_header{lastcost} =
-    qq|<th class=listheading nowrap>| . $locale->text('Last Cost') . qq|</th>|;
-  $column_header{rop} =
-    qq|<th class=listheading nowrap>| . $locale->text('ROP') . qq|</th>|;
-  $column_header{weight} =
-    qq|<th class=listheading nowrap>| . $locale->text('Weight') . qq|</th>|;
-
-  $column_header{invnumber} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=invnumber>|
-    . $locale->text('Invoice Number')
-    . qq|</a></th>|;
-  $column_header{ordnumber} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=ordnumber>|
-    . $locale->text('Order Number')
-    . qq|</a></th>|;
-  $column_header{quonumber} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=quonumber>|
-    . $locale->text('Quotation')
-    . qq|</a></th>|;
-
-  $column_header{name} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=name>|
-    . $locale->text('Name')
-    . qq|</a></th>|;
-
-  $column_header{sellprice} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Sell Price')
-    . qq|</th>|;
-  $column_header{linetotalsellprice} =
-    qq|<th class=listheading nowrap>| . $locale->text('Extended') . qq|</th>|;
-  $column_header{linetotallastcost} =
-    qq|<th class=listheading nowrap>| . $locale->text('Extended') . qq|</th>|;
-  $column_header{linetotallistprice} =
-    qq|<th class=listheading nowrap>| . $locale->text('Extended') . qq|</th>|;
-
-  $column_header{image} =
-    qq|<th class=listheading nowrap>| . $locale->text('Image') . qq|</a></th>|;
-  $column_header{drawing} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=drawing>|
-    . $locale->text('Drawing')
-    . qq|</a></th>|;
-  $column_header{microfiche} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=microfiche>|
-    . $locale->text('Microfiche')
-    . qq|</a></th>|;
-
-  $column_header{serialnumber} =
-      qq|<th nowrap><a class=listheading href=$callback&sort=serialnumber>|
-    . $locale->text('Serial Number')
-    . qq|</a></th>|;
-  $column_header{soldtotal} =
-    qq|<th nowrap><a class=listheading href=$callback&sort=soldtotal&revers=$form->{revers}&lastsort=$form->{lastsort}>|
-    . $locale->text('soldtotal')
-    . qq|</a></th>|;
-
-  $column_header{deliverydate} =
-    qq|<th nowrap><a class=listheading href=$callback&sort=deliverydate&revers=$form->{revers}&lastsort=$form->{lastsort}>|
-    . $locale->text('deliverydate')
-    . qq|</a></th>|;
-
-  $form->header;
-  $colspan = $#column_index + 1;
-
-  print qq|
-<body>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-
-  <tr><td colspan=$colspan>$option</td></tr>
-
-  <tr class=listheading>
-|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-  </tr>
-  |;
-
-  # add order to callback
-  $form->{callback} = $callback .= "&sort=$form->{sort}";
-
-  # escape callback for href
-  $callback = $form->escape($callback);
-
-  if (@{ $form->{parts} }) {
-    $sameitem = $form->{parts}->[0]->{ $form->{sort} };
-  }
-
-  foreach $ref (@{ $form->{parts} }) {
-
-    if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) {
-      if ($sameitem ne $ref->{ $form->{sort} }) {
-        &parts_subtotal;
-        $sameitem = $ref->{ $form->{sort} };
-      }
-    }
+  IC->all_parts(\%myconfig, \%$form);
 
-    $ref->{exchangerate} = 1 unless $ref->{exchangerate};
-    $ref->{sellprice} *= $ref->{exchangerate};
-    $ref->{listprice} *= $ref->{exchangerate};
-    $ref->{lastcost}  *= $ref->{exchangerate};
+  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 %column_defs = (
+    'bin'                => { 'text' => $locale->text('Bin'), },
+    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
+    'description'        => { 'text' => $locale->text('Part Description'), },
+    'drawing'            => { 'text' => $locale->text('Drawing'), },
+    'image'              => { 'text' => $locale->text('Image'), },
+    'invnumber'          => { 'text' => $locale->text('Invoice Number'), },
+    'lastcost'           => { 'text' => $locale->text('Last Cost'), },
+    'linetotallastcost'  => { 'text' => $locale->text('Extended'), },
+    'linetotallistprice' => { 'text' => $locale->text('Extended'), },
+    'linetotalsellprice' => { 'text' => $locale->text('Extended'), },
+    'listprice'          => { 'text' => $locale->text('List Price'), },
+    'microfiche'         => { 'text' => $locale->text('Microfiche'), },
+    'name'               => { 'text' => $locale->text('Name'), },
+    'onhand'             => { 'text' => $locale->text('Qty'), },
+    'ordnumber'          => { 'text' => $locale->text('Order Number'), },
+    'partnumber'         => { 'text' => $locale->text('Part Number'), },
+    'partsgroup'         => { 'text' => $locale->text('Group'), },
+    'priceupdate'        => { 'text' => $locale->text('Updated'), },
+    'quonumber'          => { 'text' => $locale->text('Quotation'), },
+    'rop'                => { 'text' => $locale->text('ROP'), },
+    'sellprice'          => { 'text' => $locale->text('Sell Price'), },
+    'serialnumber'       => { 'text' => $locale->text('Serial Number'), },
+    'soldtotal'          => { 'text' => $locale->text('soldtotal'), },
+    'unit'               => { 'text' => $locale->text('Unit'), },
+    'weight'             => { 'text' => $locale->text('Weight'), },
+  );
 
-    # use this for assemblies
-    $onhand = $ref->{onhand};
+  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
+  map { $column_defs{$_}->{align}   = 'right' } qw(onhand sellprice listprice lastcost linetotalsellprice linetotallastcost linetotallistprice rop weight soldtotal);
 
-    $align = "left";
-    if ($ref->{assemblyitem}) {
-      $align = "right";
-      $onhand = 0 if ($form->{sold});
-    }
+  my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, map { "l_$_" } @columns);
+  my $callback         = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
 
-    $ref->{description} =~ s/
-/<br>/g;
+  my @sort_full        = qw(partnumber description onhand soldtotal deliverydate);
+  my @sort_no_revers   = qw(partsgroup bin priceupdate invnumber ordnumber quonumber name image drawing serialnumber);
 
-    $column_data{partnumber} =
-      "<td align=$align><a href=$form->{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partnumber}&nbsp;</a></td>";
-    $column_data{description} = "<td><a href=$form->{script}?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}&nbsp;</a></td>";
-    $column_data{partsgroup}  = "<td>$ref->{partsgroup}&nbsp;</td>";
+  foreach my $col (@sort_full) {
+    $column_defs{$col}->{link} = join '&', $callback, "sort=$col", map { "$_=" . E($form->{$_}) } qw(revers lastsort);
+  }
+  map { $column_defs{$_}->{link} = "${callback}&sort=$_" } @sort_no_revers;
 
-    $column_data{onhand} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
-      . "</td>";
-    $column_data{sellprice} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, "&nbsp;")
-      . "</td>";
-    $column_data{listprice} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{listprice}, 2, "&nbsp;")
-      . "</td>";
-    $column_data{lastcost} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{lastcost}, 2, "&nbsp;")
-      . "</td>";
+  # add order to callback
+  $form->{callback} = join '&', ($callback, map { "${_}=" . E($form->{$_}) } qw(sort revers));
 
-    $column_data{linetotalsellprice} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{sellprice},
-                             2, "&nbsp;")
-      . "</td>";
-    $column_data{linetotallastcost} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{lastcost},
-                             2, "&nbsp;")
-      . "</td>";
-    $column_data{linetotallistprice} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice},
-                             2, "&nbsp;")
-      . "</td>";
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-    if (!$ref->{assemblyitem}) {
-      $totalsellprice += $onhand * $ref->{sellprice};
-      $totallastcost  += $onhand * $ref->{lastcost};
-      $totallistprice += $onhand * $ref->{listprice};
+  my %attachment_basenames = (
+    'part'     => $locale->text('part_list'),
+    'service'  => $locale->text('service_list'),
+    'assembly' => $locale->text('assembly_list'),
+  );
 
-      $subtotalonhand    += $onhand;
-      $subtotalsellprice += $onhand * $ref->{sellprice};
-      $subtotallastcost  += $onhand * $ref->{lastcost};
-      $subtotallistprice += $onhand * $ref->{listprice};
-    }
+  $report->set_options('top_info_text'         => $locale->text('Options') . ': ' . join(', ', grep $_, @options),
+                       'raw_bottom_info_text'  => $form->parse_html_template('ic/generate_report_bottom'),
+                       'output_format'         => 'HTML',
+                       'title'                 => $form->{title},
+                       'attachment_basename'   => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time),
+  );
+  $report->set_options_from_form();
 
-    $column_data{rop} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{rop}, '', "&nbsp;") . "</td>";
-    $column_data{weight} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{weight}, '', "&nbsp;")
-      . "</td>";
-    $column_data{unit}        = "<td>$ref->{unit}&nbsp;</td>";
-    $column_data{bin}         = "<td>$ref->{bin}&nbsp;</td>";
-    $column_data{priceupdate} = "<td>$ref->{priceupdate}&nbsp;</td>";
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-    $column_data{invnumber} =
-      ($ref->{module} ne 'oe')
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{invnumber}</a></td>"
-      : "<td>$ref->{invnumber}</td>";
-    $column_data{ordnumber} =
-      ($ref->{module} eq 'oe')
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{ordnumber}</a></td>"
-      : "<td>$ref->{ordnumber}</td>";
-    $column_data{quonumber} =
-      ($ref->{module} eq 'oe' && !$ref->{ordnumber})
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=$ref->{type}&id=$ref->{trans_id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"
-      : "<td>$ref->{quonumber}</td>";
+  $report->set_export_options('generate_report', @hidden_variables, qw(sort revers));
 
-    $column_data{name} = "<td>$ref->{name}</td>";
+  $report->set_sort_indicator($form->{sort}, $form->{revers} ? 0 : 1);
 
-    $column_data{image} =
-      ($ref->{image})
-      ? "<td><a href=$ref->{image}><img src=$ref->{image} height=32 border=0></a></td>"
-      : "<td>&nbsp;</td>";
-    $column_data{drawing} =
-      ($ref->{drawing})
-      ? "<td><a href=$ref->{drawing}>$ref->{drawing}</a></td>"
-      : "<td>&nbsp;</td>";
-    $column_data{microfiche} =
-      ($ref->{microfiche})
-      ? "<td><a href=$ref->{microfiche}>$ref->{microfiche}</a></td>"
-      : "<td>&nbsp;</td>";
+  my @subtotal_columns = qw(sellprice listprice lastcost);
+  my %subtotals = map { $_ => 0 } ('onhand', @subtotal_columns);
+  my %totals    = map { $_ => 0 } @subtotal_columns;
+  my $idx       = 0;
+  my $same_item = $form->{parts}[0]{ $form->{sort} } if (scalar @{ $form->{parts} });
 
-    $column_data{serialnumber} = "<td>$ref->{serialnumber}</td>";
+  my $defaults  = AM->get_defaults();
 
-    $column_data{soldtotal} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{soldtotal}, '', "&nbsp;")
-      . "</td>";
+  # postprocess parts
+  foreach my $ref (@{ $form->{parts} }) {
 
-    $column_data{deliverydate} = "<td>$ref->{deliverydate}</td>";
+    # fresh row, for inserting later
+    my $row = { map { $_ => { 'data' => $ref->{$_} } } @columns };
 
-    $i++;
-    $i %= 2;
-    print "<tr class=listrow$i>";
+    $ref->{exchangerate} ||= 1;
+    $ref->{price_factor} ||= 1;
+    $ref->{sellprice}     *= $ref->{exchangerate} / $ref->{price_factor};
+    $ref->{listprice}     *= $ref->{exchangerate} / $ref->{price_factor};
+    $ref->{lastcost}      *= $ref->{exchangerate} / $ref->{price_factor};
 
-    map { print "\n$column_data{$_}" } @column_index;
+    # use this for assemblies
+    my $onhand = $ref->{onhand};
 
-    print qq|
-    </tr>
-|;
+    if ($ref->{assemblyitem}) {
+      $row->{partnumber}{align}   = 'right';
+      $row->{onhand}{data}        = 0;
+      $onhand                     = 0 if ($form->{sold});
+    }
 
-  }
+    my $edit_link               = build_std_url('action=edit', 'id=' . E($ref->{id}), 'callback');
+    $row->{partnumber}->{link}  = $edit_link;
+    $row->{description}->{link} = $edit_link;
 
-  if ($form->{l_subtotal} eq 'Y') {
-    &parts_subtotal;
-  }
+    foreach (qw(sellprice listprice lastcost)) {
+      $row->{$_}{data}            = $form->format_amount(\%myconfig, $ref->{$_}, -2);
+      $row->{"linetotal$_"}{data} = $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{$_}, 2);
+    }
 
-  if ($form->{"l_linetotal"}) {
-    map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-    $column_data{linetotalsellprice} =
-        "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totalsellprice, 2, "&nbsp;")
-      . "</th>";
-    $column_data{linetotallastcost} =
-        "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totallastcost, 2, "&nbsp;")
-      . "</th>";
-    $column_data{linetotallistprice} =
-        "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totallistprice, 2, "&nbsp;")
-      . "</th>";
+    map { $row->{$_}{data} = $form->format_amount(\%myconfig, $ref->{$_}); } qw(onhand rop weight soldtotal);
 
-    print "<tr class=listtotal>";
+    $row->{weight}->{data} .= ' ' . $defaults->{weightunit};
 
-    map { print "\n$column_data{$_}" } @column_index;
+    if (!$ref->{assemblyitem}) {
+      foreach my $col (@subtotal_columns) {
+        $totals{$col}    += $onhand * $ref->{$col};
+        $subtotals{$col} += $onhand * $ref->{$col};
+      }
 
-    print qq|</tr>
-    |;
-  }
+      $subtotals{onhand} += $onhand;
+    }
 
-  print qq|
-  <tr><td colspan=$colspan><hr size=3 noshade></td></tr>
-</table>
+    # set module stuff
+    if ($ref->{module} eq 'oe') {
+      my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{customer_id} ne '' ? 'sales_order' : 'purchase_order'), 'id=' . E($ref->{trans_id}), 'callback');
+      $row->{ordnumber}{link} = $edit_oe_link;
+      $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
 
-|;
+    } else {
+      $row->{invnumber}{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'type=invoice', 'id=' . E($ref->{trans_id}), 'callback');
+    }
 
-  print qq|
+    # set properties of images
+    if ($ref->{image} && (lc $report->{options}->{output_format} eq 'html')) {
+      $row->{image}{data}     = '';
+      $row->{image}{raw_data} = '<a href="' . H($ref->{image}) . '"><img src="' . H($ref->{image}) . '" height="32" border="0"></a>';
+    }
+    map { $row->{$_}{link} = $ref->{$_} } qw(drawing microfiche);
 
-<br>
+    $report->add_data($row);
 
-<form method=post action=$form->{script}>
+    my $next_ref = $form->{parts}[$idx + 1];
 
-<input name=callback type=hidden value="$form->{callback}">
+    # insert subtotal rows
+    if (($form->{l_subtotal} eq 'Y') &&
+        (!$next_ref ||
+         (!$next_ref->{assemblyitem} && ($same_item ne $next_ref->{ $form->{sort} })))) {
+      my $row = { map { $_ => { 'class' => 'listsubtotal', } } @columns };
 
-<input type=hidden name=item value=$form->{searchitems}>
+      if (($form->{searchitems} ne 'assembly') || !$form->{bom}) {
+        $row->{onhand}->{data} = $form->format_amount(\%myconfig, $subtotals{onhand});
+      }
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>|;
+      map { $row->{"linetotal$_"}->{data} = $form->format_amount(\%myconfig, $subtotals{$_}, 2) } @subtotal_columns;
+      map { $subtotals{$_} = 0 } ('onhand', @subtotal_columns);
 
-  print qq|
-  <input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">|;
+      $report->add_data($row);
 
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
+      $same_item = $next_ref->{ $form->{sort} };
+    }
+
+    $idx++;
   }
 
-  print qq|
-  </form>
+  if ($form->{"l_linetotal"}) {
+    my $row = { map { $_ => { 'class' => 'listtotal', } } @columns };
 
-</body>
-</html>
-|;
+    map { $row->{"linetotal$_"}->{data} = $form->format_amount(\%myconfig, $totals{$_}, 2) } @subtotal_columns;
+
+    $report->add_separator();
+    $report->add_data($row);
+  }
+
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
 }    #end generate_report
@@ -2029,25 +1296,31 @@ sub generate_report {
 sub parts_subtotal {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
+  # imports
+  our (%column_data, @column_index);
+  our ($subtotalonhand, $totalsellprice, $totallastcost, $totallistprice, $subtotalsellprice, $subtotallastcost, $subtotallistprice);
+
   map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
   $subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom});
 
   $column_data{onhand} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalonhand, '', "&nbsp;")
+    . $form->format_amount(\%myconfig, $subtotalonhand)
     . "</th>";
 
   $column_data{linetotalsellprice} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalsellprice, 2, "&nbsp;")
+    . $form->format_amount(\%myconfig, $subtotalsellprice, 2)
     . "</th>";
   $column_data{linetotallistprice} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotallistprice, 2, "&nbsp;")
+    . $form->format_amount(\%myconfig, $subtotallistprice, 2)
     . "</th>";
   $column_data{linetotallastcost} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotallastcost, 2, "&nbsp;")
+    . $form->format_amount(\%myconfig, $subtotallastcost, 2)
     . "</th>";
 
   $subtotalonhand    = 0;
@@ -2069,8 +1342,15 @@ sub parts_subtotal {
 sub edit {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
+  # show history button
+  $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
+  #/show hhistory button
   IC->get_part(\%myconfig, \%$form);
 
+  $form->{"original_partnumber"} = $form->{"partnumber"};
+
   $form->{title} = $locale->text('Edit ' . ucfirst $form->{item});
 
   &link_part;
@@ -2082,26 +1362,28 @@ sub edit {
 sub link_part {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   IC->create_links("IC", \%myconfig, \%$form);
 
   # currencies
-  map { $form->{selectcurrency} .= "<option>$_\n" } split /:/,
-    $form->{currencies};
+  map({ $form->{selectcurrency} .= "<option>$_\n" }
+      split(/:/, $form->{currencies}));
 
   # parts and assemblies have the same links
-  $item = $form->{item};
+  my $item = $form->{item};
   if ($form->{item} eq 'assembly') {
     $item = 'part';
   }
 
   # build the popup menus
   $form->{taxaccounts} = "";
-  foreach $key (keys %{ $form->{IC_links} }) {
-    foreach $ref (@{ $form->{IC_links}{$key} }) {
+  foreach my $key (keys %{ $form->{IC_links} }) {
+    foreach my $ref (@{ $form->{IC_links}{$key} }) {
 
       # if this is a tax field
       if ($key =~ /IC_tax/) {
-        if ($key =~ /$item/) {
+        if ($key =~ /\Q$item\E/) {
           $form->{taxaccounts} .= "$ref->{accno} ";
           $form->{"IC_tax_$ref->{accno}_description"} =
             "$ref->{accno}--$ref->{description}";
@@ -2134,644 +1416,87 @@ sub link_part {
     $form->{IC_expense}       = $form->{IC_cogs};
   }
 
-  delete $form->{IC_links};
-  delete $form->{amount};
-
-  $form->get_partsgroup(\%myconfig, { all => 1 });
-
-  $form->{partsgroup} = "$form->{partsgroup}--$form->{partsgroup_id}";
-
-  if (@{ $form->{all_partsgroup} }) {
-    $form->{selectpartsgroup} = qq|<option>\n|;
-    map {
-      $form->{selectpartsgroup} .=
-        qq|<option value="$_->{partsgroup}--$_->{id}">$_->{partsgroup}\n|
-    } @{ $form->{all_partsgroup} };
-  }
-
-  if ($form->{item} eq 'assembly') {
-
-    foreach $i (1 .. $form->{assembly_rows}) {
-      if ($form->{"partsgroup_id_$i"}) {
-        $form->{"partsgroup_$i"} =
-          qq|$form->{"partsgroup_$i"}--$form->{"partsgroup_id_$i"}|;
-      }
-    }
-    $form->get_partsgroup(\%myconfig);
-
-    if (@{ $form->{all_partsgroup} }) {
-      $form->{selectassemblypartsgroup} = qq|<option>\n|;
-
-      map {
-        $form->{selectassemblypartsgroup} .=
-          qq|<option value="$_->{partsgroup}--$_->{id}">$_->{partsgroup}\n|
-      } @{ $form->{all_partsgroup} };
-    }
-  }
-  $lxdebug->leave_sub();
-}
-
-sub form_header {
-  $lxdebug->enter_sub();
-
-  my $dec = '';
-
-  #decimalplaces for listprice
-  ($dec) = ($form->{listprice} =~ /\.(\d+)/);
-  $dec = length $dec;
-  my $decimalplaces = ($dec == 2) ? $dec : 2;
-  $form->{listprice} =
-    $form->format_amount(\%myconfig, $form->{listprice}, $decimalplaces);
-
-  #decimalplaces for sellprice and gv
-  ($dec) = ($form->{sellprice} =~ /\.(\d+)/);
-  $dec = length $dec;
-  my $decimalplaces = ($dec == 2) ? $dec : 2;
-
-  map {
-    $form->{$_} =
-      $form->format_amount(\%myconfig, $form->{$_}, $decimalplaces)
-  } qw(sellprice gv);
-
-  ($dec) = ($form->{lastcost} =~ /\.(\d+)/);
-  $dec = length $dec;
-  my $decimalplaces = ($dec == 2) ? $dec : 2;
-
-  $form->{lastcost} =
-    $form->format_amount(\%myconfig, $form->{lastcost}, $decimalplaces);
-
-  map { $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}) }
-    qw(weight rop stock);
-
-  foreach $item (qw(partnumber description unit notes)) {
-    $form->{$item} =~ s/\"/&quot;/g;
-  }
-
-  $payment = qq|<option value=""></option>|;
-  foreach $item (@{ $form->{payment_terms} }) {
-    if ($form->{payment_id} eq $item->{id}) {
-      $payment .= qq|<option value="$item->{id}" selected>$item->{description}</option>|;
-    } else {
-      $payment .= qq|<option value="$item->{id}">$item->{description}</option>|;
-    }
-  }
-
-
-  if (($rows = $form->numtextrows($form->{notes}, 40)) < 2) {
-    $rows = 4;
-  }
-
-  $notes =
-    qq|<textarea name=notes rows=$rows cols=50 wrap=soft>$form->{notes}</textarea>|;
-  if (($rows = $form->numtextrows($form->{description}, 40)) > 1) {
-    $description =
-      qq|<textarea name="description" rows=$rows cols=40 wrap=soft>$form->{description}</textarea>|;
-  } else {
-    $description =
-      qq|<input name=description size=40 value="$form->{description}">|;
-  }
-
-  foreach $item (split / /, $form->{taxaccounts}) {
-    $form->{"IC_tax_$item"} = ($form->{"IC_tax_$item"}) ? "checked" : "";
-  }
-
-  IC->retrieve_buchungsgruppen(\%myconfig, $form);
-  if (@{ $form->{BUCHUNGSGRUPPEN} }) {
-    foreach $item (@{ $form->{BUCHUNGSGRUPPEN} }) {
-      if ($item->{id} == $form->{buchungsgruppen_id}) {
-        $form->{selectbuchungsgruppe} .=
-          "<option value=$item->{id} selected>$item->{description}\n";
-      } elsif (($form->{id} && $form->{orphaned}) || (!$form->{id})) {
-        $form->{selectbuchungsgruppe} .=
-          "<option value=$item->{id}>$item->{description}\n";
-      }
-
-    }
-  }
-
-  $buchungsgruppe = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Buchungsgruppe') . qq|</th>
-		<td><select name=buchungsgruppen_id>$form->{selectbuchungsgruppe}</select></td>
-	      </tr>|;
-
-
-  # set option
-  foreach $item (qw(IC IC_income IC_expense)) {
-    if ($form->{$item}) {
-      if ($form->{id} && $form->{orphaned}) {
-        $form->{"select$item"} =~ s/ selected//;
-        $form->{"select$item"} =~
-          s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
-      } else {
-        $form->{"select$item"} = qq|<option selected>$form->{$item}|;
-      }
-    }
-  }
-
-  if ($form->{selectpartsgroup}) {
-    $form->{selectpartsgroup} = $form->unescape($form->{selectpartsgroup});
-    $partsgroup =
-      qq|<input type=hidden name=selectpartsgroup value="|
-      . $form->escape($form->{selectpartsgroup}, 1) . qq|">|;
-    $form->{selectpartsgroup} =~
-      s/(<option value="\Q$form->{partsgroup}\E")/$1 selected/;
-
-    $partsgroup .=
-      qq|<select name=partsgroup>$form->{selectpartsgroup}</select>|;
-    $group = $locale->text('Group');
-  }
-
-  # tax fields
-  foreach $item (split / /, $form->{taxaccounts}) {
-    $tax .= qq|
-      <input class=checkbox type=checkbox name="IC_tax_$item" value=1 $form->{"IC_tax_$item"}>&nbsp;<b>$form->{"IC_tax_${item}_description"}</b>
-      <br><input type=hidden name=IC_tax_${item}_description value="$form->{"IC_tax_${item}_description"}">
-|;
-  }
-
-  $form->{obsolete} = "checked" if $form->{obsolete};
-
-  $lastcost = qq|
- 	      <tr>
-                <th align="right" nowrap="true">|
-    . $locale->text('Last Cost') . qq|</th>
-                <td><input name=lastcost size=11 value=$form->{lastcost}></td>
-              </tr>
-|;
-  if (!$eur) {
-    $linkaccounts = qq|
-               <tr>
-		<th align=right>| . $locale->text('Inventory') . qq|</th>
-		<td><select name=IC>$form->{selectIC}</select></td>
-		<input name=selectIC type=hidden value="$form->{selectIC}">
-	      </tr>|;
-  }
-
-  if ($form->{item} eq "part") {
-
-    $linkaccounts .= qq|
-	      <tr>
-		<th align=right>| . $locale->text('Revenue') . qq|</th>
-		<td><select name=IC_income>$form->{selectIC_income}</select></td>
-		<input name=selectIC_income type=hidden value="$form->{selectIC_income}">
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Expense') . qq|</th>
-		<td><select name=IC_expense>$form->{selectIC_expense}</select></td>
-		<input name=selectIC_expense type=hidden value="$form->{selectIC_expense}">
-	      </tr>
-|;
-
-    $weight = qq|
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('Weight') . qq|</th>
-		<td>
-		  <table>
-		    <tr>
-		      <td>
-			<input name=weight size=10 value=$form->{weight}>
-		      </td>
-		      <th>
-			&nbsp;
-			$form->{weightunit}
-			<input type=hidden name=weightunit value=$form->{weightunit}>
-		      </th>
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-|;
-
-  }
-
-  if ($form->{item} eq "assembly") {
-
-    $lastcost = "";
-
-    $linkaccounts = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Revenue') . qq|</th>
-		<td><select name=IC_income>$form->{selectIC_income}</select></td>
-		<input name=selectIC_income type=hidden value="$form->{selectIC_income}">
-	      </tr>
-|;
-
-    $weight = qq|
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('Weight') . qq|</th>
-		<td>
-		  <table>
-		    <tr>
-		      <td>
-			&nbsp;$form->{weight}
-			<input type=hidden name=weight value=$form->{weight}>
-		      </td>
-		      <th>
-			&nbsp;
-			$form->{weightunit}
-			<input type=hidden name=weightunit value=$form->{weightunit}>
-		      </th>
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-|;
-
-  }
-
-  if ($form->{item} eq "service") {
-
-    $linkaccounts = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Revenue') . qq|</th>
-		<td><select name=IC_income>$form->{selectIC_income}</select></td>
-		<input name=selectIC_income type=hidden value="$form->{selectIC_income}">
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Expense') . qq|</th>
-		<td><select name=IC_expense>$form->{selectIC_expense}</select></td>
-		<input name=selectIC_expense type=hidden value="$form->{selectIC_expense}">
-	      </tr>
-|;
-
-  }
-  $linkaccounts = qq|<input type=hidden name=IC_income value="$form->{IC_income_default}">|;
-
-  if ($form->{IC_cogs_default}) {
-    $form->{IC_expense_default} = $form->{IC_cogs_default};
-  }
-
-  if (($form->{item} eq "service") || ($form->{item} eq "part")) {
-    $linkaccounts .= qq|<input type=hidden name=IC_expense value="$form->{IC_expense_default}">|;
-  }
-  if ($form->{item} eq "part") {
-    $linkaccounts .= qq|<input type=hidden name=IC value="$form->{IC_default}">|;
-  }
-
-  if ($form->{item} ne 'service') {
-    $n   = ($form->{onhand} > 0) ? "1" : "0";
-    $rop = qq|
-	      <tr>
-		<th align="right" nowrap>| . $locale->text('On Hand') . qq|</th>
-		<th align=left nowrap class="plus$n">&nbsp;|
-      . $form->format_amount(\%myconfig, $form->{onhand}) . qq|</th>
-	      </tr>
-|;
-
-    if ($form->{item} eq 'assembly') {
-      $rop .= qq|
-              <tr>
-	        <th align="right" nowrap>| . $locale->text('Stock') . qq|</th>
-		<td><input name=stock size=10 value=$form->{stock}></td>
-	      </tr>
-|;
-    }
-
-    $rop .= qq|
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('ROP') . qq|</th>
-		<td><input name=rop size=10 value=$form->{rop}></td>
-	      </tr>
-|;
-
-    $bin = qq|
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('Bin') . qq|</th>
-		<td><input name=bin size=10 value=$form->{bin}></td>
-	      </tr>
-|;
-    $vegv = qq|
- 	      <tr>
-		<th align="right" nowrap="true">|
-      . $locale->text('Verrechnungseinheit') . qq|</th>
-		<td><input name=ve size=10 value=$form->{ve}></td>
-	      </tr>
-              <tr>
-		<th align="right" nowrap="true">|
-      . $locale->text('Geschäftsvolumen') . qq|</th>
-		<td><input name=gv size=10 value=$form->{gv}></td>
-	      </tr>
-|;
-    $aluok = $form->{alu} == 1 ? "checked" : "";
-
-    $alu .= qq|
-              <tr>
-                <th align=right nowrap>|
-    . $locale->text('Aluartikel') . qq|</th>
-                <td><input class=checkbox type=checkbox name=alu value=1 $aluok></td>
-             </tr>|;
-
-    $notdiscountableok = ($form->{not_discountable}) == 1 ? "checked" : "";
-    $notdiscountable .= qq|
-              <tr>
-                <th align=right nowrap>|
-    . $locale->text('Not Discountable') . qq|</th>
-                <td><input class=checkbox type=checkbox name=not_discountable value=1 $notdiscountableok></td>
-             </tr>
-|;
-
-  $formel =
-    qq|<ilayer><layer  onmouseover="this.T_STICKY=true;this.T_STATIC=true;return escape('| . $locale->text('The formula needs the following syntax:<br>For regular article:<br>Variablename= Variable Unit;<br>Variablename2= Variable2 Unit2;<br>...<br>###<br>Variable + ( Variable2 / Variable )<br><b>Please be beware of the spaces in the formula</b><br><br>For alu article:<br>Length:<br>Weight/m:<br>Length ist total length of article and weight/m ist the weight pro meter') . qq|')"><textarea name=formel rows=4 cols=40 wrap=soft>$form->{formel}</textarea></layer><ilayer>|;
-    $imagelinks = qq|
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-	  <th align=right nowrap>| . $locale->text('Image') . qq|</th>
-	  <td><input name=image size=40 value="$form->{image}"></td>
-	  <th align=right nowrap>| . $locale->text('Microfiche') . qq|</th>
-	  <td><input name=microfiche size=20 value="$form->{microfiche}"></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Drawing') . qq|</th>
-	  <td><input name=drawing size=40 value="$form->{drawing}"></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-|;
-
-  }
-
-  if ($form->{id}) {
-    $obsolete = qq|
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('Obsolete') . qq|</th>
-		<td><input name=obsolete type=checkbox class=checkbox value=1 $form->{obsolete}></td>
-	      </tr>
-|;
-  }
-  $shopok = $form->{shop} == 1 ? "checked" : "";
-  $shop .= qq|
-              <tr>
-                <th align=right nowrap>|
-    . $locale->text('Shopartikel') . qq|</th>
-                <td><input class=checkbox type=checkbox name=shop value=1 $shopok></td>
-             </tr>
-|;
-
-
-  # type=submit $locale->text('Add Part')
-  # type=submit $locale->text('Add Service')
-  # type=submit $locale->text('Add Assembly')
-
-  # type=submit $locale->text('Edit Part')
-  # type=submit $locale->text('Edit Service')
-  # type=submit $locale->text('Edit Assembly')
-  # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";
-  if ($form->{jsscript}) {
+  delete $form->{IC_links};
+  delete $form->{amount};
 
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td width="13"><input name=priceupdate id=priceupdate size=11  title="$myconfig{dateformat}" value="$form->{priceupdate}"></td>
-       <td width="4" align="left"><input type=button name=priceupdate id="trigger1" value=|
-      . $locale->text('button') . qq|></td>
-      |;
+  $form->get_partsgroup(\%myconfig, { all => 1 });
 
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "1", "priceupdate", "BL", "trigger1");
-  } else {
+  $form->{partsgroup} = "$form->{partsgroup}--$form->{partsgroup_id}";
 
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
+  if (@{ $form->{all_partsgroup} }) {
+    $form->{selectpartsgroup} = qq|<option>\n|;
+    map { $form->{selectpartsgroup} .= qq|<option value="$_->{partsgroup}--$_->{id}">$_->{partsgroup}\n| } @{ $form->{all_partsgroup} };
   }
 
-  my $unit_select = '<input type="hidden" name="unit_changeable" value="' . $form->{"unit_changeable"} . '">';
-  if (!$form->{"unit_changeable"}) {
-    $unit_select .= '<input type="hidden" name="unit" value="' . $form->{"unit"} . '">' . $form->{"unit"};
-  } else {
-    my $units = AM->retrieve_units(\%myconfig, $form, $form->{"item"} eq "service" ? "service" : "dimension");
-    $unit_select .= AM->unit_select_html($units, "unit", $form->{"unit"});
-  }
+  if ($form->{item} eq 'assembly') {
 
-  $form->{fokus} = "ic.partnumber";
-  $form->header;
+    foreach my $i (1 .. $form->{assembly_rows}) {
+      if ($form->{"partsgroup_id_$i"}) {
+        $form->{"partsgroup_$i"} =
+          qq|$form->{"partsgroup_$i"}--$form->{"partsgroup_id_$i"}|;
+      }
+    }
+    $form->get_partsgroup(\%myconfig);
 
-  print qq|
-  <body onLoad="fokus()">
- <script type="text/javascript" src="js/common.js"></script>
- <script type="text/javascript" src="js/parts_language_selection.js"></script>
-
-<form method=post name="ic" action=$form->{script}>
-
-<input name=id type=hidden value=$form->{id}>
-<input name=item type=hidden value=$form->{item}>
-<input name=title type=hidden value="$form->{title}">
-<input name=makemodel type=hidden value="$form->{makemodel}">
-<input name=alternate type=hidden value="$form->{alternate}">
-<input name=onhand type=hidden value=$form->{onhand}>
-<input name=orphaned type=hidden value=$form->{orphaned}>
-<input name=taxaccounts type=hidden value="$form->{taxaccounts}">
-<input name=rowcount type=hidden value=$form->{rowcount}>
-<input name=eur type=hidden value=$eur>
-<input name=language_values type=hidden value="$form->{language_values}">
-
-<table width="100%">
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign=top>
-          <th align=left>| . $locale->text('Part Number') . qq|</th>
-          <th align=left>| . $locale->text('Part Description') . qq|</th>
-          <th align=left>$group</th>
-        </tr>
-	<tr valign=top>
-          <td><input name=partnumber value="$form->{partnumber}" size=20></td>
-          <td>$description</td>
-          <td>$partsgroup</td>
-	  <input type=hidden name=oldpartsgroup value="$form->{oldpartsgroup}">
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <table width="100%" height="100%">
-        <tr valign=top>
-          <td width=70%>
-            <table width="100%" height="100%">
-              <tr class="listheading">
-                <th class="listheading" align="center" colspan=2>|
-    . $locale->text('') . qq|</th>
-              </tr>
-              <td colspan=2>
-                <table>
-                  $buchungsgruppe
-                  $linkaccounts
-                </table>
-              </td>
-              <tr>
-                <th align="left">| . $locale->text('Notes') . qq|</th>
-                <th align="left">| . $locale->text('Formula') . qq|</th>
-              </tr>
-              <tr>
-                <td>
-                  $notes
-                </td>
-                <td>
-                  $formel
-                </td>
-              </tr>
-              <tr>
-                <td colspan=2>
-                  <button type="button" onclick="parts_language_selection_window('language_values')">| . $locale->text('Set Language Values') . qq|</button>
-                </td>
-              </tr>
-              <tr>
-              <td colspan=2>
-                <table>
-                <tr>
-	       <th align=right>| . $locale->text('Payment Terms') . qq|</th>
-	         <td><select name=payment_id>$payment</select></td>
-                </tr>
-               </table>
-              </td>
-              </tr>
-            </table>
-          </td>
-	  <td width="30%">
-	    <table width="100%">
-	      <tr>
-                <th align="right" nowrap="true">|
-    . $locale->text('Updated') . qq|</th>
-                $button1
-              </tr>
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('List Price') . qq|</th>
-		<td><input name=listprice size=11 value=$form->{listprice}></td>
-	      </tr>
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('Sell Price') . qq|</th>
-		<td><input name=sellprice size=11 value=$form->{sellprice}></td>
-	      </tr>
-	      $lastcost
-	      <tr>
-		<th align="right" nowrap="true">| . $locale->text('Unit') . qq|</th>
-		<td>$unit_select</td>
-	      </tr>
-	      $weight
-	      $rop
-	      $bin
-              $notdiscountable
-              $vegv
-              $shop
-              $alu
-	      $obsolete
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  $imagelinks
+    if (@{ $form->{all_partsgroup} }) {
+      $form->{selectassemblypartsgroup} = qq|<option>\n|;
 
-$jsscript
-|;
+      map {
+        $form->{selectassemblypartsgroup} .=
+          qq|<option value="$_->{partsgroup}--$_->{id}">$_->{partsgroup}\n|
+      } @{ $form->{all_partsgroup} };
+    }
+  }
   $lxdebug->leave_sub();
 }
 
-sub form_footer {
+sub form_header {
   $lxdebug->enter_sub();
 
-  if ($form->{item} eq "assembly") {
+  $auth->assert('part_service_assembly_edit');
 
-    print qq|
-	<tr>
-	  <td>
-            <table width="100%">
-              <tr>
-                <th colspan=2 align=right>|
-      . $locale->text('Total') . qq|&nbsp;</th>
-                <th align=right>|
-      . $form->format_amount(\%myconfig, $form->{assemblytotal}, 2) . qq|</th>
-              </tr>
-            </table>
-          </td>
-        </tr>
-        <input type=hidden name=assembly_rows value=$form->{assembly_rows}>
-|;
-  }
+  $form->{eur}              = $eur; # config dumps into namespace - yuck
+  $form->{pg_keys}          = sub { "$_[0]->{partsgroup}--$_[0]->{id}" };
+  $form->{description_area} = ($form->{rows} = $form->numtextrows($form->{description}, 40)) > 1;
+  $form->{notes_rows}       =  max 4, $form->numtextrows($form->{notes}, 40), $form->numtextrows($form->{formel}, 40);
 
-  print qq|
-      <input type=hidden name=path value=$form->{path}>
-      <input type=hidden name=login value=$form->{login}>
-      <input type=hidden name=password value=$form->{password}>
-      <input type=hidden name=callback value="$form->{callback}">
-      <input type=hidden name=previousform value="$form->{previousform}">
-      <input type=hidden name=taxaccount2 value="$form->{taxaccount2}">
-      <input type=hidden name=vc value=$form->{vc}>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
+  map { $form->{"is_$_"}  = ($form->{item} eq $_) } qw(part service assembly);
+  map { $form->{$_}       =~ s/"/&quot;/g;        } qw(unit);
 
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Update') . qq|">
-  |;
+  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS',
+                   'partsgroup'    => 'all_partsgroup',
+                   'vendors'       => 'ALL_VENDORS',);
 
-  unless ($form->{item} eq "service") {
-    print qq|
-      <input type=hidden name=makemodel_rows value=$form->{makemodel_rows}>
-    |;
-  }
 
-  print qq|
-     <input type=hidden name=price_rows value=$form->{price_rows}>|;
+  IC->retrieve_buchungsgruppen(\%myconfig, $form);
+  @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} };
 
-  print qq|
-      <input class=submit type=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
+  # use JavaScript Calendar or not (yes!)
+  $form->{jsscript} = 1;
 
-  if ($form->{id}) {
+  $units = AM->retrieve_units(\%myconfig, $form);
+  $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ];
 
-    if (!$form->{previousform}) {
-      print qq|
-      <input class=submit type=submit name=action value="|
-        . $locale->text('Save as new') . qq|">|;
-    }
+  $form->{defaults} = AM->get_defaults();
 
-    if ($form->{orphaned}) {
-      if (!$form->{previousform}) {
-        if ($form->{item} eq 'assembly') {
-          if (!$form->{onhand}) {
-            print qq|
-      <input class=submit type=submit name=action value="|
-              . $locale->text('Delete') . qq|">|;
-          }
-        } else {
-          print qq|
-      <input class=submit type=submit name=action value="|
-            . $locale->text('Delete') . qq|">|;
-        }
-      }
-    }
-  }
+  $form->{fokus} = "ic.partnumber";
 
-  if (!$form->{previousform}) {
-    if ($form->{menubar}) {
-      require "$form->{path}/menu.pl";
-      &menubar;
-    }
-  }
+  $form->header;
+  #print $form->parse_html_template('ic/form_header', { ALL_PRICE_FACTORS => $form->{ALL_PRICE_FACTORS},
+  #                                                     ALL_UNITS         => $form->{ALL_UNITS},
+  #                                                     BUCHUNGSGRUPPEN   => $form->{BUCHUNGSGRUPPEN},
+  #                                                     payment_terms     => $form->{payment_terms},
+  #                                                     all_partsgroup    => $form->{all_partsgroup}});
+  print $form->parse_html_template('ic/form_header');
+  $lxdebug->leave_sub();
+}
 
-  print qq|
+sub form_footer {
+  $lxdebug->enter_sub();
 
-</form>
-<script type="text/javascript" src="js/wz_tooltip.js"></script>
+  $auth->assert('part_service_assembly_edit');
 
-</body>
-</html>
-|;
+  print $form->parse_html_template('ic/form_footer');
 
   $lxdebug->leave_sub();
 }
@@ -2780,33 +1505,9 @@ sub makemodel_row {
   $lxdebug->enter_sub();
   my ($numrows) = @_;
 
-  $form->{"make_$i"}  =~ s/\"/&quot;/g;
-  $form->{"model_$i"} =~ s/\"/&quot;/g;
-
-  print qq|
-  <tr>
-    <td>
-      <table width=100%>
-	<tr>
-	  <th class="listheading">| . $locale->text('Make') . qq|</th>
-	  <th class="listheading">| . $locale->text('Model') . qq|</th>
-	</tr>
-|;
-
-  for $i (1 .. $numrows) {
-    print qq|
-	<tr>
-	  <td width=50%><input name="make_$i" size=30 value="$form->{"make_$i"}"></td>
-	  <td width=50%><input name="model_$i" size=30 value="$form->{"model_$i"}"></td>
-	</tr>
-|;
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-|;
+  my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 1 .. $numrows;
+  delete @{$form}{grep { m/^make_\d+/ || m/^model_\d+/ } keys %{ $form }};
+  print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 });
 
   $lxdebug->leave_sub();
 }
@@ -2814,9 +1515,13 @@ sub makemodel_row {
 sub assembly_row {
   $lxdebug->enter_sub();
   my ($numrows) = @_;
+  my (@column_index, %column_data, %column_header);
+  my ($nochange, $callback, $previousform, $linetotal, $href);
+
+  our ($deliverydate); # ToDO: cjeck if this indeed comes from global context
 
   @column_index =
-    qw(runningnumber qty unit bom partnumber description partsgroup total);
+    qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
 
   if ($form->{previousform}) {
     $nochange     = 1;
@@ -2834,7 +1539,8 @@ sub assembly_row {
     $previousform = "";
 
     # save form variables in a previousform variable
-    foreach $key (sort keys %$form) {
+    foreach my $key (sort keys %$form) {
+      next unless ref $form->{$key} eq '' && $form->{$key};
 
       # escape ampersands
       $form->{$key} =~ s/&/%26/g;
@@ -2845,6 +1551,7 @@ sub assembly_row {
     $form->{callback} = $callback;
 
     $form->{assemblytotal} = 0;
+    $form->{assembly_purchase_price_total} = 0;
     $form->{weight}        = 0;
 
   }
@@ -2860,6 +1567,8 @@ sub assembly_row {
     . qq|</th>|;
   $column_header{description} =
     qq|<th nowrap width=50%>| . $locale->text('Part Description') . qq|</th>|;
+  $column_header{lastcost} =
+    qq|<th nowrap width=50%>| . $locale->text('Purchase Price') . qq|</th>|;
   $column_header{total} =
     qq|<th align=right nowrap>| . $locale->text('Extended') . qq|</th>|;
   $column_header{bom}        = qq|<th>| . $locale->text('BOM') . qq|</th>|;
@@ -2881,16 +1590,20 @@ sub assembly_row {
         </tr>
 |;
 
-  for $i (1 .. $numrows) {
+  for my $i (1 .. $numrows) {
     $form->{"partnumber_$i"} =~ s/\"/&quot;/g;
 
     $linetotal =
-      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2);
+    $line_purchase_price  =
+      $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2); #lastcost == purchase_price | ungenaue datenbankfeld-übersetzung
     $form->{assemblytotal} += $linetotal;
+    $form->{assembly_purchase_price_total}  += $line_purchase_price;
 
     $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
 
     $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
+    $line_purchase_price = $form->format_amount(\%myconfig, $line_purchase_price, 2);
 
     if (($i >= 1) && ($i == $numrows)) {
 
@@ -2930,7 +1643,7 @@ sub assembly_row {
 
       } else {
         $href =
-          qq|$form->{script}?action=edit&id=$form->{"id_$i"}&path=$form->{path}&login=$form->{login}&password=$form->{password}&rowcount=$i&previousform=$previousform|;
+          qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|;
         $column_data{partnumber} =
           qq|<td><input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"><a href=$href>$form->{"partnumber_$i"}</a></td>|;
         $column_data{runningnumber} =
@@ -2952,6 +1665,7 @@ sub assembly_row {
         qq|<td><input type=hidden name="description_$i" value="$form->{"description_$i"}">$form->{"description_$i"}</td>|;
     }
 
+    $column_data{lastcost} = qq|<td align=right>$line_purchase_price</td>|;
     $column_data{total} = qq|<td align=right>$linetotal</td>|;
 
     $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
@@ -2966,6 +1680,8 @@ sub assembly_row {
   <input type=hidden name="id_$i" value=$form->{"id_$i"}>
   <input type=hidden name="sellprice_$i" value=$form->{"sellprice_$i"}>
   <input type=hidden name="weight_$i" value=$form->{"weight_$i"}>
+  <input type=hidden name="price_factor_id_$i" value=$form->{"price_factor_id_$i"}>
+  <input type=hidden name="price_factor_$i" value=$form->{"price_factor_$i"}>
 |;
   }
 
@@ -2982,7 +1698,7 @@ sub update {
   $lxdebug->enter_sub();
 
   if ($form->{item} eq "assembly") {
-    $i = $form->{assembly_rows};
+    my $i = $form->{assembly_rows};
 
     # if last row is empty check the form otherwise retrieve item
     if (   ($form->{"partnumber_$i"} eq "")
@@ -2995,7 +1711,7 @@ sub update {
 
       IC->assembly_item(\%myconfig, \%$form);
 
-      $rows = scalar @{ $form->{item_list} };
+      my $rows = scalar @{ $form->{item_list} };
 
       if ($rows) {
         $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
@@ -3025,26 +1741,21 @@ sub update {
 
       }
     }
-  }
 
-  if ($form->{item} eq "part") {
+  } elsif (($form->{item} eq 'part') || ($form->{item} eq 'service')) {
     &check_form;
   }
 
-  if ($form->{item} eq 'service') {
-    map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
-      qw(sellprice listprice);
-    &form_header;
-    &price_row;
-    &form_footer;
-  }
-
   $lxdebug->leave_sub();
 }
 
 sub save {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
+  my ($parts_id, %newform, $previousform, $amount, $callback);
+
   # check if there is a part number - commented out, cause there is an automatic allocation of numbers
   # $form->isblank("partnumber", $locale->text(ucfirst $form->{item}." Part Number missing!"));
 
@@ -3056,34 +1767,33 @@ sub save {
       $locale->text(
         "Inventory quantity must be zero before you can set this $form->{item} obsolete!"
       ))
-      if ($form->{onhand});
+      if ($form->{onhand} * 1);
   }
 
   if (!$form->{buchungsgruppen_id}) {
-    $form->error($locale->text("Parts must have an entry type.") . " " . 
-     $locale->text("If you see this message, you most likely just setup your LX-Office and haven't added any entry types. If this is the case, the option is accessible for administrators in the System menu.") 
+    $form->error($locale->text("Parts must have an entry type.") . " " .
+     $locale->text("If you see this message, you most likely just setup your LX-Office and haven't added any entry types. If this is the case, the option is accessible for administrators in the System menu.")
     );
   }
 
   $form->error($locale->text('Description must not be empty!')) unless $form->{description};
   $form->error($locale->text('Partnumber must not be set to empty!')) if $form->{id} && !$form->{partnumber};
 
-  # expand dynamic strings
-  # $locale->text('Inventory quantity must be zero before you can set this part obsolete!')
-  # $locale->text('Inventory quantity must be zero before you can set this assembly obsolete!')
-  # $locale->text('Part Number missing!')
-  # $locale->text('Service Number missing!')
-  # $locale->text('Assembly Number missing!')
-
   # save part
-  $lxdebug->message(LXDebug::DEBUG1,
-                    "ic.pl: sellprice in save = $form->{sellprice}\n");
-  $rc = IC->save(\%myconfig, \%$form);
-  if ($rc == 3) {
+  $lxdebug->message($LXDebug::DEBUG1, "ic.pl: sellprice in save = $form->{sellprice}\n");
+  if (IC->save(\%myconfig, \%$form) == 3) {
     $form->error($locale->text('Partnumber not unique!'));
   }
+  # saving the history
+  if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
+  	$form->{addition} = "SAVED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   $parts_id = $form->{id};
 
+  my $i;
   # load previous variables
   if ($form->{previousform}) {
 
@@ -3096,8 +1806,8 @@ sub save {
     map { delete $form->{$_} } keys %newform;
 
     # now take it apart and restore original values
-    foreach $item (split /&/, $previousform) {
-      ($key, $value) = split /=/, $item, 2;
+    foreach my $item (split /&/, $previousform) {
+      my ($key, $value) = split m/=/, $item, 2;
       $value =~ s/%26/&/g;
       $form->{$key} = $value;
     }
@@ -3117,8 +1827,7 @@ sub save {
       $form->{weight}    -= $form->{"weight_$i"} * $form->{"qty_$i"};
 
       # change/add values for assembly item
-      map { $form->{"${_}_$i"} = $newform{$_} }
-        qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno);
+      map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno price_factor_id);
 
       $form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"};
       $form->{weight}    += $form->{"weight_$i"} * $form->{"qty_$i"};
@@ -3129,44 +1838,48 @@ sub save {
       $i = $form->{rowcount};
       $form->{"qty_$i"} = 1 unless ($form->{"qty_$i"});
 
-      map { $form->{"${_}_$i"} = $newform{$_} }
-        qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice);
+      map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit listprice inventory_accno income_accno expense_accno sellprice lastcost price_factor_id);
+
+      $form->{"longdescription_$i"} = $newform{notes};
+
       $form->{"sellprice_$i"} = $newform{lastcost} if ($form->{vendor_id});
+
       if ($form->{exchangerate} != 0) {
         $form->{"sellprice_$i"} /= $form->{exchangerate};
       }
-      $lxdebug->message(LXDebug::DEBUG1,
-                        qq|sellprice_$i in previousform 2 = |
-                          . $form->{"sellprice_$i"} . qq|\n|);
-      map { $form->{"taxaccounts_$i"} .= "$_ " } split / /,
-        $newform{taxaccount};
+
+      $lxdebug->message($LXDebug::DEBUG1, qq|sellprice_$i in previousform 2 = | . $form->{"sellprice_$i"} . qq|\n|);
+
+      map { $form->{"taxaccounts_$i"} .= "$_ " } split / /, $newform{taxaccount};
       chop $form->{"taxaccounts_$i"};
-      foreach $item (qw(description rate taxnumber)) {
-        $index = $form->{"taxaccounts_$i"} . "_$item";
+      foreach my $item (qw(description rate taxnumber)) {
+        my $index = $form->{"taxaccounts_$i"} . "_$item";
         $form->{$index} = $newform{$index};
       }
 
       # credit remaining calculation
-      $amount =
-        $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) *
-        $form->{"qty_$i"};
-      map { $form->{"${_}_base"} += $amount }
-        (split / /, $form->{"taxaccounts_$i"});
-      map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) }
-        split / /, $form->{"taxaccounts_$i"}
-        if !$form->{taxincluded};
+      $amount = $form->{"sellprice_$i"} * (1 - $form->{"discount_$i"} / 100) * $form->{"qty_$i"};
+
+      map { $form->{"${_}_base"} += $amount } (split / /, $form->{"taxaccounts_$i"});
+      map { $amount += ($form->{"${_}_base"} * $form->{"${_}_rate"}) } split / /, $form->{"taxaccounts_$i"} if !$form->{taxincluded};
 
       $form->{creditremaining} -= $amount;
 
       # redo number formatting, because invoice parse them!
-      $i = $form->{rowcount};
-      map {
-        $form->{"${_}_$i"} =
-          $form->format_amount(\%myconfig, $form->{"${_}_$i"})
-      } qw(weight listprice sellprice rop);
+      map { $form->{"${_}_$i"} = $form->format_amount(\%myconfig, $form->{"${_}_$i"}) } qw(weight listprice sellprice rop);
     }
 
     $form->{"id_$i"} = $parts_id;
+
+    # Get the actual price factor (not just the ID) for the marge calculation.
+    $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS');
+    foreach my $pfac (@{ $form->{ALL_PRICE_FACTORS} }) {
+      next if ($pfac->{id} != $newform{price_factor_id});
+      $form->{"marge_price_factor_$i"} = $pfac->{factor};
+      last;
+    }
+    delete $form->{ALL_PRICE_FACTORS};
+
     delete $form->{action};
 
     # restore original callback
@@ -3177,17 +1890,15 @@ sub save {
     $form->{makemodel_rows}--;
 
     # put callback together
-    foreach $key (keys %$form) {
+    foreach my $key (keys %$form) {
 
       # do single escape for Apache 2.0
-      $value = $form->escape($form->{$key}, 1);
+      my $value = $form->escape($form->{$key}, 1);
       $callback .= qq|&$key=$value|;
     }
     $form->{callback} = $callback;
   }
-  $lxdebug->message(LXDebug::DEBUG1,
-                    qq|ic.pl: sellprice_$i nach sub save = |
-                      . $form->{"sellprice_$i"} . qq|\n|);
+  $lxdebug->message($LXDebug::DEBUG1, qq|ic.pl: sellprice_$i nach sub save = | . $form->{"sellprice_$i"} . qq|\n|);
 
   # redirect
   $form->redirect;
@@ -3198,16 +1909,37 @@ sub save {
 sub save_as_new {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
+  # saving the history
+  if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
+  	$form->{addition} = "SAVED AS NEW";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
   $form->{id} = 0;
+  if ($form->{"original_partnumber"} &&
+      ($form->{"partnumber"} eq $form->{"original_partnumber"})) {
+    $form->{partnumber} = "";
+  }
   &save;
-
   $lxdebug->leave_sub();
 }
 
 sub delete {
   $lxdebug->enter_sub();
 
-  $rc = IC->delete(\%myconfig, \%$form);
+  $auth->assert('part_service_assembly_edit');
+
+  # saving the history
+  if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
+  	$form->{addition} = "DELETED";
+  	$form->save_history($form->dbconnect(\%myconfig));
+  }
+  # /saving the history
+  my $rc = IC->delete(\%myconfig, \%$form);
 
   # redirect
   $form->redirect($locale->text('Item deleted!')) if ($rc > 0);
@@ -3216,225 +1948,46 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub stock_assembly {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text('Stock Assembly');
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width="100%">
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <td>
-      <table>
-        <tr>
-          <th align="right" nowrap="true">|
-    . $locale->text('Part Number') . qq|</th>
-          <td><input name=partnumber size=20></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <th align="right" nowrap="true">|
-    . $locale->text('Part Description') . qq|</th>
-          <td><input name=description size=40></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td><hr size=3 noshade></td></tr>
-</table>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input type=hidden name=nextsub value=list_assemblies>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_assemblies {
-  $lxdebug->enter_sub();
-
-  IC->retrieve_assemblies(\%myconfig, \%$form);
-
-  $column_header{partnumber} =
-    qq|<th class=listheading>| . $locale->text('Part Number') . qq|</th>|;
-  $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Part Description') . qq|</th>|;
-  $column_header{bin} =
-    qq|<th class=listheading>| . $locale->text('Bin') . qq|</th>|;
-  $column_header{onhand} =
-    qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
-  $column_header{rop} =
-    qq|<th class=listheading>| . $locale->text('ROP') . qq|</th>|;
-  $column_header{stock} =
-    qq|<th class=listheading>| . $locale->text('Add') . qq|</th>|;
-
-  @column_index = (qw(partnumber description bin onhand rop stock));
-
-  $form->{title} = $locale->text('Stock Assembly');
-
-  $form->{callback} =
-    "$form->{script}?action=stock_assembly&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $form->header;
-
-  $colspan = $#column_index + 1;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr size=5></tr>
-  <tr class=listheading>|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-  </tr>
-|;
-
-  $i = 1;
-  foreach $ref (@{ $form->{assembly_items} }) {
-
-    map { $ref->{$_} =~ s/\"/&quot;/g } qw(partnumber description);
-
-    $column_data{partnumber}  = qq|<td width=20%>$ref->{partnumber}</td>|;
-    $column_data{description} =
-      qq|<td width=50%>$ref->{description}&nbsp;</td>|;
-    $column_data{bin}    = qq|<td>$ref->{bin}&nbsp;</td>|;
-    $column_data{onhand} =
-        qq|<td align=right>|
-      . $form->format_amount(\%myconfig, $ref->{onhand}, '', "&nbsp;")
-      . qq|</td>|;
-    $column_data{rop} =
-        qq|<td align=right>|
-      . $form->format_amount(\%myconfig, $ref->{rop}, '', "&nbsp;")
-      . qq|</td>|;
-    $column_data{stock} = qq|<td width=10%><input name="qty_$i" size=10></td>|;
-
-    $j++;
-    $j %= 2;
-    print
-      qq|<tr class=listrow$j><input name="id_$i" type=hidden value=$ref->{id}>\n|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-    </tr>
-|;
-
-    $i++;
-
-  }
-
-  $i--;
-  print qq|
-  <tr>
-    <td colspan=6><hr size=3 noshade>
-  </tr>
-</table>
-<input name=rowcount type=hidden value="$i">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=nextsub value=restock_assemblies>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub restock_assemblies {
-  $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Assemblies restocked!'))
-    if (IC->restock_assemblies(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot stock assemblies!'));
-
-  $lxdebug->leave_sub();
-}
-
 sub price_row {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   my ($numrows) = @_;
 
-  print qq|
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-          <th class="listheading">| . $locale->text('Preisklasse') . qq|</th>
-          <th class="listheading">| . $locale->text('Preis') . qq|</th>
-        </tr>
-|;
-  for $i (1 .. $numrows) {
-    print qq|
-        <tr>
-          <td width=50%><input type=hidden name="pricegroup_$i" size=30  value="$form->{"pricegroup_$i"}">$form->{"pricegroup_$i"}</td>
-          <td width=50%><input name="price_$i" size=11 value="$form->{"price_$i"}"></td>
-          <input type=hidden name="pricegroup_id_$i" value="$form->{"pricegroup_id_$i"}">
-        </tr>
-|;
-  }
+  my @PRICES = map +{
+    pricegroup    => $form->{"pricegroup_$_"},
+    pricegroup_id => $form->{"pricegroup_id_$_"},
+    price         => $form->{"price_$_"},
+  }, 1 .. $numrows;
 
-  print qq|
-      </table>
-    </td>
-  </tr>
-|;
+  print $form->parse_html_template('ic/price_row', { PRICES => \@PRICES });
 
   $lxdebug->leave_sub();
 }
 
-
 sub parts_language_selection {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
+  our ($onload);
 
   my $languages = IC->retrieve_languages(\%myconfig, $form);
 
+  if ($form->{language_values} ne "") {
+    foreach $item (split(/---\+\+\+---/, $form->{language_values})) {
+      my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
 
-  my $callback = "$form->{script}?action=parts_language_selection&";
-  map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
-      (qw(login path password name input_name), grep({ /^[fl]_/ } keys %$form)));
+      foreach my $language (@{ $languages }) {
+        next unless ($language->{id} == $language_id);
+
+        $language->{translation}     = $translation;
+        $language->{longdescription} = $longdescription;
+        last;
+      }
+    }
+  }
 
   my @header_sort = qw(name longdescription);
   my %header_title = ( "name" => $locale->text("Name"),
@@ -3450,11 +2003,11 @@ sub parts_language_selection {
 
   $form->{"title"} = $locale->text("Language Values");
   $form->header();
-  print($form->parse_html_template("ic/parts_language_selection", { "HEADER" => \@header,
-                                                                   "LANGUAGES" => $languages,
-                                                                   "onload" => $onload }));
+  print $form->parse_html_template("ic/parts_language_selection", { "HEADER"    => \@header,
+                                                                    "LANGUAGES" => $languages,
+                                                                    "onload"    => $onload });
 
   $lxdebug->leave_sub();
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }