X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=dde593feb69454cebc6beef603f0604dbcbf51f6;hb=cd16e60235994b69cdff63da70f73eb284fdf4a7;hp=bccac308a16fbb2b3cef1ed5a872d78b4a30659f;hpb=d467f40de696218e7cde1b78704c32443fa5b986;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index bccac308a..dde593feb 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -30,9 +30,12 @@
 # Inventory Control module
 #
 #======================================================================
-#$locale->text('ea');
+
+use POSIX qw(strftime);
+use List::Util qw(max);
 
 use SL::IC;
+use SL::ReportGenerator;
 
 #use SL::PE;
 
@@ -43,19 +46,38 @@ use SL::IC;
 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();
 
+  $auth->assert('part_service_assembly_edit');
+
   $form->{title} = $locale->text('Add ' . ucfirst $form->{item});
 
-  $form->{callback} =
-    "$form->{script}?action=add&item=$form->{item}&login=$form->{login}&password=$form->{password}"
+  $form->{callback} = "$form->{script}?action=add&item=$form->{item}"
     unless $form->{callback};
 
   $form->{"unit_changeable"} = 1;
@@ -70,551 +92,55 @@ sub add {
 sub search {
   $lxdebug->enter_sub();
 
-  my ($button1, $button2, $onhand, $makemodel, $serialnumber, $l_serialnumber, $toplevel, $bought);
-
-  $form->{title} = (ucfirst $form->{searchitems}) . "s";
-  $form->{title} = $locale->text($form->{title});
+  $auth->assert('part_service_assembly_edit');
 
-  # switch for backward sorting
-  $form->{revers} = 0;
+  $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
 
-  # memory for which table was sort at last time
-  $form->{lastsort} = "";
+  my $is_service  = $form->{searchitems} eq 'service';
+  my $is_assembly = $form->{searchitems} eq 'assembly';
 
-  # counter for added entries to top100
-  $form->{ndxs_counter} = 0;
-
-  # $locale->text('Parts')
-  # $locale->text('Services')
+  $form->{title} = (ucfirst $form->{searchitems}) . "s";
+  $form->{title} = $locale->text($form->{title});
+  $form->{title} = $locale->text('Assemblies') if $is_assembly;
 
-  # use JavaScript Calendar or not
   $form->{jsscript} = 1;
-  my $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');
-
-    $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>
-|;
-
-    $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 (time)') . qq|</th>
-                $button2
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-|;
-
-  } else {
-
-    $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 (time)') . qq|</th>
-		      $button2
-		    </tr>
-		  </table>
-		</td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-|;
-  }
 
   $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>
-          <th align=right nowrap>| . $locale->text('EAN') . qq|</th>
-          <td><input name=ean 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 checked>&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>
+  print $form->parse_html_template('ic/search', { is_assembly => $is_assembly, 
+                                                  is_service  => $is_service, 
+                                                  dateformat  => $myconfig{dateformat}, });
 
-<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>
-
-</body>
-</html>
-|;
   $lxdebug->leave_sub();
 }    #end search()
 
 sub search_update_prices {
   $lxdebug->enter_sub();
 
-  my ($onhand, $makemodel, $serialnumber, $l_serialnumber, $toplevel, $bought);
-
-  $form->{title} = $locale->text('Update prices');
-  IC->get_pricegroups(\%myconfig, \%$form);
-
-  # use JavaScript Calendar or not
-#   $form->{jsscript} = 1;
-#   $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 my $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=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 my $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();
 }
@@ -622,6 +148,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 {
@@ -634,6 +162,8 @@ sub update_prices {
 sub choice {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   our ($j, $lastndx);
   my ($totop100);
 
@@ -641,122 +171,70 @@ sub choice {
 
   $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}">|;
-
-  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>|;
-
-  print qq|
-
-<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 type=hidden name=test value=item_selected>
-
-<input name=lastndx type=hidden value=$lastndx>
-
-<input name=ndxs_counter type=hidden value=$form->{ndxs_counter}>
-
-<input name=extras type=hidden value=$form->{extras}>|;
+  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; $i < $form->{ndxs_counter}; $i++) {
-
-      # 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"};
-
-      # insert data into top100
-      push @{ $form->{parts} },
-        { number      => "",
-          partnumber  => "$partnumber",
-          description => "$description",
-          unit        => "$unit",
-          sellprice   => "$sellprice",
-          soldtotal   => "$soldtotal" };
-    }    #rof
-  }    #fi
+#  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
-  if (($form->{ndxs_counter}) > 0) {
-    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"};
-      $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;
+  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 });
 
-  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();
 
+  $auth->assert('part_service_assembly_edit');
+
   our ($lastndx);
   our ($partnumber, $description, $unit, $sellprice, $soldtotal);
 
@@ -791,7 +269,7 @@ sub list {
   for ($j = 1; $j <= $i; $j++) {
 
     print qq|
-        <tr class=listrow1>|;
+        <tr class=listrow| . ($j % 2) . qq|>|;
     if ($j == 1) {
       print qq|
 	    <td><input name=ndx class=radio type=radio value=$j checked></td>|;
@@ -817,9 +295,6 @@ sub list {
 <br>
 
 
-<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}">
@@ -881,6 +356,8 @@ sub list {
 sub top100 {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   if ($form->{ndx}) {
     $form->{ndxs_counter}++;
 
@@ -902,6 +379,8 @@ sub top100 {
 sub addtop100 {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   my ($revers, $lastsort, $callback, $option, $description, $sameitem,
       $partnumber, $unit, $sellprice, $soldtotal, $totop100, $onhand, $align);
   my (@column_index, %column_header, %column_data);
@@ -909,7 +388,7 @@ sub addtop100 {
 
   $form->{top100}      = "top100";
   $form->{l_soldtotal} = "Y";
-  $form->{soldtotal}   = "soldtotal";
+#  $form->{soldtotal}   = "soldtotal";
   $form->{sort}        = "soldtotal";
   $form->{l_qty}       = "N";
   $form->{l_linetotal} = "";
@@ -931,7 +410,7 @@ sub addtop100 {
   }    #fi
 
   $callback =
-    "$form->{script}?action=top100&login=$form->{login}&password=$form->{password}&searchitems=$form->{searchitems}&itemstatus=$form->{itemstatus}&bom=$form->{bom}&l_linetotal=$form->{l_linetotal}&title="
+    "$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
@@ -1034,16 +513,13 @@ sub addtop100 {
   }
   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}";
@@ -1275,8 +751,8 @@ sub addtop100 {
     }    #rof
   }    #fi
        # build data for columns
+  my $i = 0;
   foreach my $ref (@{ $form->{parts} }) {
-    my $i = 0;
 
     if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) {
       if ($sameitem ne $ref->{ $form->{sort} }) {
@@ -1299,8 +775,7 @@ sub addtop100 {
       $onhand = 0 if ($form->{sold});
     }
 
-    $ref->{description} =~ s/
-/<br>/g;
+    $ref->{description} =~ s/\n/<br>/g;
 
     $column_data{number} =
         "<td align=right>"
@@ -1362,15 +837,15 @@ sub addtop100 {
 
     $column_data{invnumber} =
       ($ref->{module} ne 'oe')
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&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}&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}&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>";
@@ -1442,9 +917,6 @@ sub addtop100 {
 
 <form method=post action=$form->{script}>
 
-<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}">
@@ -1503,18 +975,20 @@ sub addtop100 {
 #  l_partsgroup l_subtotal l_soldtotal l_deliverydate
 #
 # hiddens: 
-#  nextsub login password revers lastsort sort ndxs_counter
+#  nextsub revers lastsort sort ndxs_counter
 #
 sub generate_report {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   my ($revers, $lastsort, $description);
-  my (@column_index, %column_header, %column_data, @columns, @options, @callbacks);
-  my ($totalsellprice, $totallastcost, $totallistprice, $subtotalonhand, $subtotalsellprice, $subtotallastcost, $subtotallistprice);
-  my ($colspan, $sameitem, $onhand, $align);
 
-  $revers   = $form->{revers};
-  $lastsort = $form->{lastsort};
+  $form->{title} = (ucfirst $form->{searchitems}) . "s";
+  $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
@@ -1545,7 +1019,7 @@ sub generate_report {
   $form->{ledgerchecks} = 'Y' if (   $form->{bought} || $form->{sold} || $form->{onorder}
                                   || $form->{ordered} || $form->{rfq} || $form->{quoted});
 
-  # if something should be aktivated if something else is active, enter it here
+  # if something should be activated if something else is active, enter it here
   my %dependencies = (
     onhand       => [ qw(l_onhand) ],
     short        => [ qw(l_onhand) ],
@@ -1586,36 +1060,22 @@ sub generate_report {
     l_soldtotal   => $locale->text('soldtotal'),
   );
 
-  # this local subfunction generates a callback token from the input key.
-  # easy to join into a callback later
-  sub callback_token { 
-    map { /\w+$/; return "&$&=$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);
-  my $callback           = "$form->{script}?action=generate_report";
-  map { $callback .= "&$_=" . $form->escape($form->{$_}) } qw(login password searchitems itemstatus bom l_linetotal title);
-    
+  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);
+
   # calculate dependencies
-  for (@itemstatus_keys, @callback_keys) { 
+  for (@itemstatus_keys, @callback_keys) {
     next if ($form->{itemstatus} ne $_ && !$form->{$_});
     map { $form->{$_} = 'Y' } @{ $dependencies{$_} } if $dependencies{$_};
   }
 
   # 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};
-    push @callbacks, callback_token($key) if grep { $_ eq $key } @callback_keys;;
   }
-  my $option    = $locale->text('Options') . ': ' . join(', ', grep $_, @options) . '<br>';
-  $callback .= join '', grep $_, @callbacks;
-
-  $lxdebug->message(0, $callback);
-
-  IC->all_parts(\%myconfig, \%$form);
 
   # special case for lastcost
   $form->{l_lastcost} = "" if $form->{ledgerchecks};
@@ -1625,11 +1085,6 @@ sub generate_report {
     $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};
@@ -1663,330 +1118,181 @@ sub generate_report {
     }
   }
 
-  $form->{l_lastcost} = ""
-    if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
-  foreach my $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>|;
+  $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
 
-  $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>|;
+  IC->all_parts(\%myconfig, \%$form);
 
-  $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>|;
+  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'), },
+  );
 
-  $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>|;
+  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);
 
-  $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>|;
+  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);
 
-  $form->header;
-  $colspan = $#column_index + 1;
+  my @sort_full        = qw(partnumber description onhand soldtotal deliverydate);
+  my @sort_no_revers   = qw(partsgroup bin priceupdate invnumber ordnumber quonumber name image drawing serialnumber);
 
-  print qq|
-<body>
+  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;
 
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
+  # add order to callback
+  $form->{callback} = join '&', ($callback, map { "${_}=" . E($form->{$_}) } qw(sort revers));
 
-  <tr><td colspan=$colspan>$option</td></tr>
+  my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
-  <tr class=listheading>
-|;
+  my %attachment_basenames = (
+    'part'     => $locale->text('part_list'),
+    'service'  => $locale->text('service_list'),
+    'assembly' => $locale->text('assembly_list'),
+  );
 
-  map { print "\n$column_header{$_}" } @column_index;
+  $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();
 
-  print qq|
-  </tr>
-  |;
+  $report->set_columns(%column_defs);
+  $report->set_column_order(@columns);
 
-  # add order to callback
-  $form->{callback} = $callback .= "&sort=$form->{sort}";
+  $report->set_export_options('generate_report', @hidden_variables, qw(sort revers));
 
-  # escape callback for href
-  $callback = $form->escape($callback);
+  $report->set_sort_indicator($form->{sort}, $form->{revers} ? 0 : 1);
 
-  if (@{ $form->{parts} }) {
-    $sameitem = $form->{parts}->[0]->{ $form->{sort} };
-  }
+  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} });
 
+  # postprocess parts
   foreach my $ref (@{ $form->{parts} }) {
-    my $i = 0;
 
-    if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) {
-      if ($sameitem ne $ref->{ $form->{sort} }) {
-        &parts_subtotal;
-        $sameitem = $ref->{ $form->{sort} };
-      }
-    }
+    # fresh row, for inserting later
+    my $row = { map { $_ => { 'data' => $ref->{$_} } } @columns };
 
-    $ref->{exchangerate} = 1 unless $ref->{exchangerate};
-    $ref->{sellprice} *= $ref->{exchangerate};
-    $ref->{listprice} *= $ref->{exchangerate};
-    $ref->{lastcost}  *= $ref->{exchangerate};
+    $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};
 
     # use this for assemblies
-    $onhand = $ref->{onhand};
+    my $onhand = $ref->{onhand};
 
-    $align = "left";
     if ($ref->{assemblyitem}) {
-      $align = "right";
-      $onhand = 0 if ($form->{sold});
+      $row->{partnumber}{align}   = 'right';
+      $row->{onhand}{data}        = 0;
+      $onhand                     = 0 if ($form->{sold});
     }
 
-    $ref->{description} =~ s/
-/<br>/g;
+    my $edit_link               = build_std_url('action=edit', 'id=' . E($ref->{id}), 'callback');
+    $row->{partnumber}->{link}  = $edit_link;
+    $row->{description}->{link} = $edit_link;
 
-    $column_data{partnumber} =
-      "<td align=$align><a href=$form->{script}?action=edit&id=$ref->{id}&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}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{description}&nbsp;</a></td>";
-    $column_data{partsgroup}  = "<td>$ref->{partsgroup}&nbsp;</td>";
-
-    $column_data{onhand} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand})
-      . "</td>";
-    $column_data{sellprice} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{sellprice}, -2)
-      . "</td>";
-    $column_data{listprice} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{listprice}, -2)
-      . "</td>";
-    $column_data{lastcost} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{lastcost}, -2)
-      . "</td>";
+    foreach (qw(sellprice listprice lastcost)) {
+      $row->{$_}{data}            = $form->format_amount(\%myconfig, $ref->{$_}, -2);
+      $row->{"linetotal$_"}{data} = $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{$_}, 2);
+    }
 
-    $column_data{linetotalsellprice} = "<td align=right>"
-      . $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)
-      . "</td>";
-    $column_data{linetotallistprice} = "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{onhand} * $ref->{listprice}, 2)
-      . "</td>";
+    map { $row->{$_}{data} = $form->format_amount(\%myconfig, $ref->{$_}); } qw(onhand rop weight soldtotal);
 
     if (!$ref->{assemblyitem}) {
-      $totalsellprice += $onhand * $ref->{sellprice};
-      $totallastcost  += $onhand * $ref->{lastcost};
-      $totallistprice += $onhand * $ref->{listprice};
+      foreach my $col (@subtotal_columns) {
+        $totals{$col}    += $onhand * $ref->{$col};
+        $subtotals{$col} += $onhand * $ref->{$col};
+      }
 
-      $subtotalonhand    += $onhand;
-      $subtotalsellprice += $onhand * $ref->{sellprice};
-      $subtotallastcost  += $onhand * $ref->{lastcost};
-      $subtotallistprice += $onhand * $ref->{listprice};
+      $subtotals{onhand} += $onhand;
     }
 
-    $column_data{rop} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{rop}) . "</td>";
-    $column_data{weight} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{weight})
-      . "</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>";
-
-    $column_data{invnumber} =
-      ($ref->{module} ne 'oe')
-      ? "<td><a href=$ref->{module}.pl?action=edit&type=invoice&id=$ref->{trans_id}&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}&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}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{quonumber}</a></td>"
-      : "<td>$ref->{quonumber}</td>";
+    # set module stuff
+    if ($ref->{module} eq 'oe') {
+      my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{type}), 'id=' . E($ref->{trans_id}), 'callback');
+      $row->{ordnumber}{link} = $edit_oe_link;
+      $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
 
-    $column_data{name} = "<td>$ref->{name}</td>";
+    } else {
+      $row->{invnumber}{link} = build_std_url("script=$ref->{module}.pl", 'action=edit', 'type=invoice', 'id=' . E($ref->{trans_id}), 'callback');
+    }
 
-    $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>";
+    # 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);
 
-    $column_data{serialnumber} = "<td>$ref->{serialnumber}</td>";
+    $report->add_data($row);
 
-    $column_data{soldtotal} =
-        "<td align=right>"
-      . $form->format_amount(\%myconfig, $ref->{soldtotal})
-      . "</td>";
+    my $next_ref = $form->{parts}[$idx + 1];
 
-    $column_data{deliverydate} = "<td>$ref->{deliverydate}</td>";
+    # 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 };
 
-    $i++;
-    $i %= 2;
-    print "<tr class=listrow$i>";
+      if (($form->{searchitems} ne 'assembly') || !$form->{bom}) {
+        $row->{onhand}->{data} = $form->format_amount(\%myconfig, $subtotals{onhand});
+      }
 
-    map { print "\n$column_data{$_}" } @column_index;
+      map { $row->{"linetotal$_"}->{data} = $form->format_amount(\%myconfig, $subtotals{$_}, 2) } @subtotal_columns;
+      map { $subtotals{$_} = 0 } ('onhand', @subtotal_columns);
 
-    print qq|
-    </tr>
-|;
+      $report->add_data($row);
 
-  }
+      $same_item = $next_ref->{ $form->{sort} };
+    }
 
-  if ($form->{l_subtotal} eq 'Y') {
-    &parts_subtotal;
+    $idx++;
   }
 
   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)
-      . "</th>";
-    $column_data{linetotallastcost} =
-        "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totallastcost, 2)
-      . "</th>";
-    $column_data{linetotallistprice} =
-        "<th class=listtotal align=right>"
-      . $form->format_amount(\%myconfig, $totallistprice, 2)
-      . "</th>";
+    my $row = { map { $_ => { 'class' => 'listtotal', } } @columns };
 
-    print "<tr class=listtotal>";
+    map { $row->{"linetotal$_"}->{data} = $form->format_amount(\%myconfig, $totals{$_}, 2) } @subtotal_columns;
 
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|</tr>
-    |;
+    $report->add_separator();
+    $report->add_data($row);
   }
 
-  print qq|
-  <tr><td colspan=$colspan><hr size=3 noshade></td></tr>
-</table>
-
-|;
-
-  print qq|
-
-<br>
-
-<form method=post action=$form->{script}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=item value=$form->{searchitems}>
-
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>|;
-
-  print qq|
-  <input class=submit type=submit name=action value="|
-    . $locale->text('Add') . qq|">
-
-  </form>
-
-</body>
-</html>
-|;
+  $report->generate_with_headers();
 
   $lxdebug->leave_sub();
 }    #end generate_report
@@ -1994,6 +1300,8 @@ 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);
@@ -2037,6 +1345,9 @@ 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
@@ -2055,6 +1366,8 @@ sub edit {
 sub link_part {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   IC->create_links("IC", \%myconfig, \%$form);
 
   # currencies
@@ -2074,7 +1387,7 @@ sub link_part {
 
       # 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}";
@@ -2116,10 +1429,7 @@ sub link_part {
 
   if (@{ $form->{all_partsgroup} }) {
     $form->{selectpartsgroup} = qq|<option>\n|;
-    map {
-      $form->{selectpartsgroup} .=
-        qq|<option value="$_->{partsgroup}--$_->{id}">$_->{partsgroup}\n|
-    } @{ $form->{all_partsgroup} };
+    map { $form->{selectpartsgroup} .= qq|<option value="$_->{partsgroup}--$_->{id}">$_->{partsgroup}\n| } @{ $form->{all_partsgroup} };
   }
 
   if ($form->{item} eq 'assembly') {
@@ -2147,487 +1457,44 @@ sub link_part {
 sub form_header {
   $lxdebug->enter_sub();
 
-  my ($payment, $rows, $notes, $description, $ean, $buchungsgruppe, $partsgroup, $group, $tax, $lastcost, $eur, $linkaccounts, $weight, $n, $rop, $bin, $vegv);
-  my ($notdiscountableok, $notdiscountable);
-  my ($formel, $imagelinks, $obsolete, $shopok, $shop);
-
-
-  map({ $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, -2) }
-      qw(sellprice listprice lastcost gv));
-
-  map { $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}) }
-    qw(weight rop stock);
-
-  foreach my $item (qw(partnumber description unit notes)) {
-    $form->{$item} =~ s/\"/&quot;/g;
-  }
-
-  $payment = qq|<option value=""></option>|;
-  foreach my $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>|;
-    }
-  }
-
+  $auth->assert('part_service_assembly_edit');
 
-  if (($rows = $form->numtextrows($form->{notes}, 40)) < 2) {
-    $rows = 4;
-  }
-
-  $notes =
-    qq|<textarea name=notes rows=$rows cols=45 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}">|;
-  }
+  $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);
 
-  $ean =  qq|<input name=ean size=40 value="$form->{ean}">|;
-
-  foreach my $item (split / /, $form->{taxaccounts}) {
-    $form->{"IC_tax_$item"} = ($form->{"IC_tax_$item"}) ? "checked" : "";
-  }
+  map { $form->{"is_$_"}  = ($form->{item} eq $_) } qw(part service assembly);
+  map { $form->{$_}       =~ s/"/&quot;/g;        } qw(unit);
+ 
+  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS', 
+                   'partsgroup'    => 'all_partsgroup');
 
   IC->retrieve_buchungsgruppen(\%myconfig, $form);
-  if (@{ $form->{BUCHUNGSGRUPPEN} }) {
-    foreach my $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 my $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 my $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>
-		    </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>
-		    </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>
-|;
-    }
+  @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} };
 
-    $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('Business Volume') . qq|</th>
-		<td><input name=gv size=10 value=$form->{gv}></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>') . qq|')"><textarea name=formel rows=4 cols=30 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
-  my ($jsscript, $button1);
+  # use JavaScript Calendar or not (yes!)
   $form->{jsscript} = 1;
-  $jsscript = "";
-  if ($form->{jsscript}) {
-
-    # 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>
-      |;
-
-    #write Trigger
-    $jsscript =
-      Form->write_trigger(\%myconfig, "1", "priceupdate", "BL", "trigger1");
-  } else {
 
-    # without JavaScript Calendar
-    $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
-  }
-
-  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"});
-  }
+  $units = AM->retrieve_units(\%myconfig, $form, $form->{"item"} eq "service" ? "service" : "dimension");
+  $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ];
 
   $form->{fokus} = "ic.partnumber";
-  $form->header;
-
-  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}">
-<input name="original_partnumber" type="hidden" value="| . $form->quote($form->{"original_partnumber"}) . qq|">
-
-<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>
-                <th align="left"></th>
-                <th align="left">| . $locale->text('EAN-Code') . qq|</th>
-              </tr>
-              <tr>
-                <td>
-                  <button type="button" onclick="parts_language_selection_window('language_values')">| . $locale->text('Set Language Values') . qq|</button>
-                </td>
-		<td>
-	 	  $ean	
-		</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
-	      $obsolete
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  $imagelinks
 
-$jsscript
-|;
+  $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}});
   $lxdebug->leave_sub();
 }
 
 sub form_footer {
   $lxdebug->enter_sub();
 
+  $auth->assert('part_service_assembly_edit');
+
   if ($form->{item} eq "assembly") {
 
     print qq|
@@ -2635,10 +1502,8 @@ sub form_footer {
 	  <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>
+                <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>
@@ -2648,8 +1513,6 @@ sub form_footer {
   }
 
   print qq|
-      <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}">
@@ -2888,7 +1751,7 @@ sub assembly_row {
 
       } else {
         $href =
-          qq|$form->{script}?action=edit&id=$form->{"id_$i"}&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} =
@@ -2983,26 +1846,19 @@ 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 lastcost));
-    &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
@@ -3028,13 +1884,6 @@ sub save {
   $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");
   if (IC->save(\%myconfig, \%$form) == 3) {
@@ -3063,7 +1912,7 @@ sub save {
 
     # now take it apart and restore original values
     foreach my $item (split /&/, $previousform) {
-      my ($key, $value) = split /=/, $item, 2;
+      my ($key, $value) = split m/=/, $item, 2;
       $value =~ s/%26/&/g;
       $form->{$key} = $value;
     }
@@ -3083,8 +1932,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"};
@@ -3095,15 +1943,19 @@ 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};
+
+      map { $form->{"taxaccounts_$i"} .= "$_ " } split / /, $newform{taxaccount};
       chop $form->{"taxaccounts_$i"};
       foreach my $item (qw(description rate taxnumber)) {
         my $index = $form->{"taxaccounts_$i"} . "_$item";
@@ -3111,26 +1963,28 @@ sub save {
       }
 
       # 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
@@ -3160,6 +2014,8 @@ 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};
@@ -3178,6 +2034,9 @@ sub save_as_new {
 
 sub delete {
   $lxdebug->enter_sub();
+
+  $auth->assert('part_service_assembly_edit');
+
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
@@ -3197,32 +2056,17 @@ sub delete {
 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 my $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();
 }
@@ -3230,14 +2074,25 @@ sub price_row {
 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);
+
+      foreach my $language (@{ $languages }) {
+        next unless ($language->{id} == $language_id);
 
-  my $callback = "$form->{script}?action=parts_language_selection&";
-  map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
-      (qw(login password name input_name), grep({ /^[fl]_/ } keys %$form)));
+        $language->{translation}     = $translation;
+        $language->{longdescription} = $longdescription;
+        last;
+      }
+    }
+  }
 
   my @header_sort = qw(name longdescription);
   my %header_title = ( "name" => $locale->text("Name"),
@@ -3253,9 +2108,9 @@ 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();
 }