X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=28bc105e258b06038a0efb638a9d591e37e4eeb5;hb=cb253140;hp=3501adc5b6d9ac2e592fab1070bf448d6262df62;hpb=07948c344b0f699314c1b05b4e9c41b8babc3981;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 3501adc5b..28bc105e2 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -33,17 +33,20 @@
 
 use POSIX qw(strftime);
 use List::Util qw(max);
+use List::MoreUtils qw(any);
 
+use SL::AM;
+use SL::CVar;
 use SL::IC;
 use SL::ReportGenerator;
 
 #use SL::PE;
 
-# use strict;
+use strict;
 #use warnings;
 
 # global imports
-our ($form, $locale, %myconfig, $lxdebug);
+our ($form, $locale, %myconfig, $lxdebug, $auth);
 
 require "bin/mozilla/io.pl";
 require "bin/mozilla/invoice_io.pl";
@@ -75,12 +78,10 @@ sub add {
 
   $auth->assert('part_service_assembly_edit');
 
-  $form->{title} = $locale->text('Add ' . ucfirst $form->{item});
-
-  $form->{callback} = "$form->{script}?action=add&item=$form->{item}"
-    unless $form->{callback};
-
-  $form->{"unit_changeable"} = 1;
+  my $title                = 'Add ' . ucfirst $form->{item};
+  $form->{title}           = $locale->text($title);
+  $form->{callback}        = "$form->{script}?action=add&item=$form->{item}" unless $form->{callback};
+  $form->{unit_changeable} = 1;
 
   IC->get_pricegroups(\%myconfig, \%$form);
   &link_part;
@@ -98,20 +99,24 @@ sub search {
   $form->{lastsort}     = ""; # memory for which table was sort at last time
   $form->{ndxs_counter} = 0;  # counter for added entries to top100
 
-  my $is_service  = $form->{searchitems} eq 'service';
-  my $is_assembly = $form->{searchitems} eq 'assembly';
+  my %is_xyz     = map { +"is_$_" => ($form->{searchitems} eq $_) } qw(part service assembly);
 
   $form->{title} = (ucfirst $form->{searchitems}) . "s";
   $form->{title} = $locale->text($form->{title});
-  $form->{title} = $locale->text('Assemblies') if $is_assembly;
+  $form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly});
 
   $form->{jsscript} = 1;
 
+  $form->{CUSTOM_VARIABLES}                  = CVar->get_configs('module' => 'IC');
+  ($form->{CUSTOM_VARIABLES_FILTER_CODE},
+   $form->{CUSTOM_VARIABLES_INCLUSION_CODE}) = CVar->render_search_options('variables'      => $form->{CUSTOM_VARIABLES},
+                                                                           'include_prefix' => 'l_',
+                                                                           'include_value'  => 'Y');
+
   $form->header;
 
-  print $form->parse_html_template('ic/search', { is_assembly => $is_assembly, 
-                                                  is_service  => $is_service, 
-                                                  dateformat  => $myconfig{dateformat}, });
+  print $form->parse_html_template('ic/search', { %is_xyz,
+                                                  dateformat => $myconfig{dateformat}, });
 
   $lxdebug->leave_sub();
 }    #end search()
@@ -123,6 +128,8 @@ sub search_update_prices {
 
   my $pricegroups = IC->get_pricegroups(\%myconfig, \%$form);
 
+  $form->{title} = $locale->text('Update Prices');
+
   $form->header;
 
   print $form->parse_html_template('ic/search_update_prices', { PRICE_ROWS => $pricegroups });
@@ -135,12 +142,42 @@ sub confirm_price_update {
 
   $auth->assert('part_service_assembly_edit');
 
+  my @errors      = ();
+  my $value_found = undef;
+
+  foreach my $idx (qw(sellprice listprice), (1..$form->{price_rows})) {
+    my $name      = $idx =~ m/\d/ ? $form->{"pricegroup_${idx}"}      : $idx eq 'sellprice' ? $locale->text('Sell Price') : $locale->text('List Price');
+    my $type      = $idx =~ m/\d/ ? $form->{"pricegroup_type_${idx}"} : $form->{"${idx}_type"};
+    my $value_idx = $idx =~ m/\d/ ? "price_${idx}" : $idx;
+    my $value     = $form->parse_amount(\%myconfig, $form->{$value_idx});
+
+    if ((0 > $value) && ($type eq 'percent')) {
+      push @errors, $locale->text('You cannot adjust the price for pricegroup "#1" by a negative percentage.', $name);
+
+    } elsif (!$value && ($form->{$value_idx} ne '')) {
+      push @errors, $locale->text('No valid number entered for pricegroup "#1".', $name);
+
+    } elsif (0 < $value) {
+      $value_found = 1;
+    }
+  }
+
+  push @errors, $locale->text('No prices will be updated because no prices have been entered.') if (!$value_found);
+
+  my $num_matches = IC->get_num_matches_for_priceupdate();
+
+  $form->header();
+
+  if (@errors) {
+    $form->show_generic_error(join('<br>', @errors), 'back_button' => 1);
+  }
+
   $form->{nextsub} = "update_prices";
-  $form->header;
 
   map { delete $form->{$_} } qw(action header);
-  
-  print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ] });
+
+  print $form->parse_html_template('ic/confirm_price_update', { HIDDENS     => [ map { name => $_, value => $form->{$_} }, keys %$form ],
+                                                                num_matches => $num_matches });
 
   $lxdebug->leave_sub();
 }
@@ -150,8 +187,10 @@ sub update_prices {
 
   $auth->assert('part_service_assembly_edit');
 
-  if (IC->update_prices(\%myconfig, \%$form)) {
-    $form->redirect($form->{update_count} . $locale->text('prices updated!'));
+  my $num_updated = IC->update_prices(\%myconfig, \%$form);
+
+  if (-1 != $num_updated) {
+    $form->redirect($locale->text('#1 prices were updated.', $num_updated));
   } else {
     $form->error($locale->text('Could not update prices!'));
   }
@@ -159,199 +198,199 @@ sub update_prices {
   $lxdebug->leave_sub();
 }
 
-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}) {
+#sub choice {
+#  $lxdebug->enter_sub();
 #
-#      # 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"},
-  }
+#  $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
 
-#    $totop100 .= qq|
+#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
-
-  print $form->parse_html_template('ic/choice', +{ HIDDENS => \@HIDDENS, PARTS => \@PARTS });
-
-  $lxdebug->leave_sub();
-}    #end choice
-
-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()
+#      |;
+#    }    #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();
@@ -579,9 +618,6 @@ sub addtop100 {
     }
   }
 
-  $form->{l_lastcost} = ""
-    if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
   foreach my $item (@columns) {
     if ($form->{"l_$item"} eq "Y") {
       push @column_index, $item;
@@ -756,7 +792,7 @@ sub addtop100 {
 
     if ($form->{l_subtotal} eq 'Y' && !$ref->{assemblyitem}) {
       if ($sameitem ne $ref->{ $form->{sort} }) {
-        &parts_subtotal;
+        parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice);
         $sameitem = $ref->{ $form->{sort} };
       }
     }
@@ -879,7 +915,7 @@ sub addtop100 {
   }
 
   if ($form->{l_subtotal} eq 'Y') {
-    &parts_subtotal;
+    parts_subtotal(\@column_index, \$subtotalonhand, \$subtotalsellprice, \$subtotallastcost, \$subtotallistprice);
   }    #fi
 
   if ($form->{"l_linetotal"}) {
@@ -937,7 +973,7 @@ 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|">
@@ -974,7 +1010,7 @@ sub addtop100 {
 #  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: 
+# hiddens:
 #  nextsub revers lastsort sort ndxs_counter
 #
 sub generate_report {
@@ -984,12 +1020,44 @@ sub generate_report {
 
   my ($revers, $lastsort, $description);
 
+  my $cvar_configs = CVar->get_configs('module' => 'IC');
+
   $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};
+  my %column_defs = (
+    'bin'                => { 'text' => $locale->text('Bin'), },
+    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
+    'description'        => { 'text' => $locale->text('Part Description'), },
+    'drawing'            => { 'text' => $locale->text('Drawing'), },
+    'ean'                => { 'text' => $locale->text('EAN'), },
+    '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'), },
+    'transdate'          => { 'text' => $locale->text('Transdate'), },
+    'unit'               => { 'text' => $locale->text('Unit'), },
+    'weight'             => { 'text' => $locale->text('Weight'), },
+  );
+
+  $revers     = $form->{revers};
+  $lastsort   = $form->{lastsort};
 
   # sorting and direction of sorting
   # ToDO: change this to the simpler field+direction method
@@ -1007,10 +1075,10 @@ sub generate_report {
   }    #fi
 
   # special case if we have a serialnumber limit search
-  # serialnumbers are only given in invoices and orders, 
+  # 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->{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.
@@ -1059,6 +1127,7 @@ sub generate_report {
     drawing       => $locale->text('Drawing')          . ": '$form->{drawing}'",
     microfiche    => $locale->text('Microfiche')       . ": '$form->{microfiche}'",
     l_soldtotal   => $locale->text('soldtotal'),
+    ean           => $locale->text('EAN')              . ": '$form->{ean}'",
   );
 
   my @itemstatus_keys = qw(active obsolete orphaned onhand short);
@@ -1073,13 +1142,18 @@ sub generate_report {
 
   # generate callback and optionstrings
   my @options;
-  for my  $key (@itemstatus_keys, @callback_keys) { 
+  for my  $key (@itemstatus_keys, @callback_keys) {
     next if ($form->{itemstatus} ne $key && !$form->{$key});
     push @options, $optiontexts{$key};
   }
 
   # special case for lastcost
-  $form->{l_lastcost} = "" if $form->{ledgerchecks};
+  if ($form->{ledgerchecks}){
+    # ledgerchecks don't know about sellprice or lastcost. they just return a
+    # price. so rename sellprice to price, and drop lastcost.
+    $column_defs{sellprice}{text} = $locale->text('Price');
+    $form->{l_lastcost} = ""
+  }
 
   if ($form->{description}) {
     $description = $form->{description};
@@ -1089,12 +1163,7 @@ sub generate_report {
   if ($form->{l_linetotal}) {
     $form->{l_onhand} = "Y";
     $form->{l_linetotalsellprice} = "Y" if $form->{l_sellprice};
-    if ($form->{l_lastcost}) {
-      $form->{l_linetotallastcost} = "Y";
-      if (($form->{searchitems} eq 'assembly') && !$form->{bom}) {
-        $form->{l_linetotallastcost} = "";
-      }
-    }
+    $form->{l_linetotallastcost}  = $form->{searchitems} eq 'assembly' && !$form->{bom} ? "" : 'Y' if  $form->{l_lastcost};
     $form->{l_linetotallistprice} = "Y" if $form->{l_listprice};
   }
 
@@ -1119,46 +1188,27 @@ sub generate_report {
     }
   }
 
-  $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
   IC->all_parts(\%myconfig, \%$form);
 
-  my @columns =
-    qw(partnumber description partsgroup bin onhand rop unit listprice linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
-       priceupdate weight image drawing microfiche invnumber ordnumber quonumber name serialnumber soldtotal deliverydate);
-
-  my %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'), },
+  my @columns = qw(
+    partnumber description partsgroup bin onhand rop unit listprice
+    linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
+    priceupdate weight image drawing microfiche invnumber ordnumber quonumber
+    transdate name serialnumber soldtotal deliverydate ean
   );
 
-  map { $column_defs{$_}->{visible} = $form->{"l_$_"} ? 1 : 0 } @columns;
+  my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs };
+  my @searchable_custom_variables  = grep { $_->{searchable} }  @{ $cvar_configs };
+  my %column_defs_cvars            = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables;
+
+  push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
+
+  %column_defs = (%column_defs,%column_defs_cvars); # nochmal die cvars als überschrift hinzufügen
+    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);
 
-  my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys, map { "l_$_" } @columns);
+  my @hidden_variables = (qw(l_subtotal l_linetotal searchitems itemstatus bom), @itemstatus_keys, @callback_keys,
+                              map({ "cvar_$_->{name}" } @searchable_custom_variables), map { "l_$_" } @columns);
   my $callback         = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
 
   my @sort_full        = qw(partnumber description onhand soldtotal deliverydate);
@@ -1187,6 +1237,7 @@ sub generate_report {
                        'attachment_basename'   => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time),
   );
   $report->set_options_from_form();
+  $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   $report->set_columns(%column_defs);
   $report->set_column_order(@columns);
@@ -1195,12 +1246,27 @@ sub generate_report {
 
   $report->set_sort_indicator($form->{sort}, $form->{revers} ? 0 : 1);
 
+  CVar->add_custom_variables_to_report('module'         => 'IC',
+                                       'trans_id_field' => 'id',
+                                       'configs'        => $cvar_configs,
+                                       'column_defs'    => \%column_defs,
+                                       'data'           => $form->{parts});
+
+  CVar->add_custom_variables_to_report('module'         => 'IC',
+                                       'sub_module'     => sub { $_[0]->{ioi} },
+                                       'trans_id_field' => 'ioi_id',
+                                       'configs'        => $cvar_configs,
+                                       'column_defs'    => \%column_defs,
+                                       'data'           => $form->{parts});
+
   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} });
 
+  my $defaults  = AM->get_defaults();
+
   # postprocess parts
   foreach my $ref (@{ $form->{parts} }) {
 
@@ -1233,6 +1299,8 @@ sub generate_report {
 
     map { $row->{$_}{data} = $form->format_amount(\%myconfig, $ref->{$_}); } qw(onhand rop weight soldtotal);
 
+    $row->{weight}->{data} .= ' ' . $defaults->{weightunit};
+
     if (!$ref->{assemblyitem}) {
       foreach my $col (@subtotal_columns) {
         $totals{$col}    += $onhand * $ref->{$col};
@@ -1244,7 +1312,7 @@ sub generate_report {
 
     # 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');
+      my $edit_oe_link = build_std_url("script=oe.pl", 'action=edit', 'type=' . E($ref->{cv} eq 'vendor' ? 'purchase_order' : 'sales_order'), 'id=' . E($ref->{trans_id}), 'callback');
       $row->{ordnumber}{link} = $edit_oe_link;
       $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
 
@@ -1300,42 +1368,41 @@ 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);
+  my (%column_data);
+  my ($column_index, $subtotalonhand, $subtotalsellprice, $subtotallastcost, $subtotallistprice) = @_;
 
-  map { $column_data{$_} = "<td>&nbsp;</td>" } @column_index;
-  $subtotalonhand = 0 if ($form->{searchitems} eq 'assembly' && $form->{bom});
+  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)
+    . $form->format_amount(\%myconfig, $$subtotalonhand)
     . "</th>";
 
   $column_data{linetotalsellprice} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotalsellprice, 2)
+    . $form->format_amount(\%myconfig, $$subtotalsellprice, 2)
     . "</th>";
   $column_data{linetotallistprice} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotallistprice, 2)
+    . $form->format_amount(\%myconfig, $$subtotallistprice, 2)
     . "</th>";
   $column_data{linetotallastcost} =
       "<th class=listsubtotal align=right>"
-    . $form->format_amount(\%myconfig, $subtotallastcost, 2)
+    . $form->format_amount(\%myconfig, $$subtotallastcost, 2)
     . "</th>";
 
-  $subtotalonhand    = 0;
-  $subtotalsellprice = 0;
-  $subtotallistprice = 0;
-  $subtotallastcost  = 0;
+  $$subtotalonhand    = 0;
+  $$subtotalsellprice = 0;
+  $$subtotallistprice = 0;
+  $$subtotallastcost  = 0;
 
   print "<tr class=listsubtotal>";
 
-  map { print "\n$column_data{$_}" } @column_index;
+  map { print "\n$column_data{$_}" } @{ $column_index };
 
   print qq|
   </tr>
@@ -1356,7 +1423,8 @@ sub edit {
 
   $form->{"original_partnumber"} = $form->{"partnumber"};
 
-  $form->{title} = $locale->text('Edit ' . ucfirst $form->{item});
+  my $title      = 'Edit ' . ucfirst $form->{item};
+  $form->{title} = $locale->text($title);
 
   &link_part;
   &display_form;
@@ -1460,16 +1528,18 @@ sub form_header {
 
   $auth->assert('part_service_assembly_edit');
 
-  $form->{eur}              = $eur; # config dumps into namespace - yuck
+  $form->{eur}              = $::lx_office_conf{system}->{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);
 
   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');
+
+  $form->get_lists('price_factors' => 'ALL_PRICE_FACTORS',
+                   'partsgroup'    => 'all_partsgroup',
+                   'vendors'       => 'ALL_VENDORS',);
+
 
   IC->retrieve_buchungsgruppen(\%myconfig, $form);
   @{ $form->{BUCHUNGSGRUPPEN} } = grep { $_->{id} eq $form->{buchungsgruppen_id} || ($form->{id} && $form->{orphaned}) || !$form->{id} } @{ $form->{BUCHUNGSGRUPPEN} };
@@ -1477,17 +1547,25 @@ sub form_header {
   # use JavaScript Calendar or not (yes!)
   $form->{jsscript} = 1;
 
-  $units = AM->retrieve_units(\%myconfig, $form);
+  my $units = AM->retrieve_units(\%myconfig, $form);
   $form->{ALL_UNITS} = [ map +{ name => $_ }, sort { $units->{$a}{sortkey} <=> $units->{$b}{sortkey} } keys %$units ];
 
+  $form->{defaults} = AM->get_defaults();
+
   $form->{fokus} = "ic.partnumber";
 
+  $form->{CUSTOM_VARIABLES} = CVar->get_custom_variables('module' => 'IC', 'trans_id' => $form->{id});
+
+  CVar->render_inputs('variables' => $form->{CUSTOM_VARIABLES}, show_disabled_message => 1)
+    if (scalar @{ $form->{CUSTOM_VARIABLES} });
+
   $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', { 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();
 }
 
@@ -1496,101 +1574,7 @@ sub form_footer {
 
   $auth->assert('part_service_assembly_edit');
 
-  if ($form->{item} eq "assembly") {
-
-    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}>
-|;
-  }
-
-  print qq|
-      <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>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Update') . qq|">
-  |;
-
-  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}>|;
-
-  print qq|
-      <input class=submit type=submit name=action value="|
-    . $locale->text('Save') . qq|">|;
-
-  if ($form->{id}) {
-
-    if (!$form->{previousform}) {
-      print qq|
-      <input class=submit type=submit name=action value="|
-        . $locale->text('Save as new') . qq|">|;
-    }
-
-    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|">|;
-        }
-      }
-    }
-  }
-
-  if (!$form->{previousform}) {
-    if ($form->{menubar}) {
-      require "bin/mozilla/menu.pl";
-      &menubar;
-    }
-  }
-# button for saving history
-  if($form->{id} ne "") {
-  	print qq|
-  		<input type=button class=submit onclick=set_history_window(|
-  		. $form->{id} 
-  		. qq|); name=history id=history value=|
-  		. $locale->text('history') 
-  		. qq|>|;
-  }
-# /button for saving history
-  print qq|
-
-</form>
-
-<script type="text/javascript" src="js/wz_tooltip.js"></script>
-
-</body>
-</html>
-|;
+  print $form->parse_html_template('ic/form_footer');
 
   $lxdebug->leave_sub();
 }
@@ -1598,33 +1582,10 @@ sub form_footer {
 sub makemodel_row {
   $lxdebug->enter_sub();
   my ($numrows) = @_;
-  
-  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 my $i (1 .. $numrows) {
-    $form->{"make_$i"}  =~ s/\"/&quot;/g;
-    $form->{"model_$i"} =~ s/\"/&quot;/g;
-    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>
-|;
+  #hli
+  my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"}, lastcost => $form->{"lastcost_$_"}, lastupdate => $form->{"lastupdate_$_"}, sortorder => $form->{"sortorder_$_"} }, 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();
 }
@@ -1632,13 +1593,10 @@ 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
+  my (@column_index);
+  my ($nochange, $callback, $previousform, $linetotal, $line_purchase_price, $href);
 
-  @column_index =
-    qw(runningnumber qty unit bom partnumber description partsgroup total);
+  @column_index = qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
 
   if ($form->{previousform}) {
     $nochange     = 1;
@@ -1653,149 +1611,89 @@ sub assembly_row {
     # delete action
     map { delete $form->{$_} } qw(action header);
 
-    $previousform = "";
-
     # save form variables in a previousform variable
-    foreach my $key (sort keys %$form) {
+    my %form_to_save = map   { ($_ => m/^ (?: listprice | sellprice | lastcost ) $/x ? $form->format_amount(\%myconfig, $form->{$_}) : $form->{$_}) }
+                       keys %{ $form };
+    $previousform    = $::auth->save_form_in_session(form => \%form_to_save);
 
-      # escape ampersands
-      $form->{$key} =~ s/&/%26/g;
-      $previousform .= qq|$key=$form->{$key}&|;
-    }
-    chop $previousform;
-    $previousform = $form->escape($form->escape($previousform, 1));
     $form->{callback} = $callback;
-
     $form->{assemblytotal} = 0;
+    $form->{assembly_purchase_price_total} = 0;
     $form->{weight}        = 0;
-
   }
-  $column_header{runningnumber} =
-    qq|<th nowrap width=5%>| . $locale->text('No.') . qq|</th>|;
-  $column_header{qty} =
-    qq|<th align=left nowrap width=10%>| . $locale->text('Qty') . qq|</th>|;
-  $column_header{unit} =
-    qq|<th align=left nowrap width=5%>| . $locale->text('Unit') . qq|</th>|;
-  $column_header{partnumber} =
-      qq|<th align=left nowrap width=20%>|
-    . $locale->text('Part Number')
-    . qq|</th>|;
-  $column_header{description} =
-    qq|<th nowrap width=50%>| . $locale->text('Part Description') . 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>|;
-  $column_header{partsgroup} = qq|<th>| . $locale->text('Group') . qq|</th>|;
-
-  print qq|
-  <tr class=listheading>
-    <th class=listheading>| . $locale->text('Individual Items') . qq|</th>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-        <tr>
-|;
 
-  map { print "\n$column_header{$_}" } @column_index;
+  my %header = (
+   runningnumber => { text =>  $locale->text('No.'),              nowrap => 1, width => '5%'  },
+   qty           => { text =>  $locale->text('Qty'),              nowrap => 1, width => '10%' },
+   unit          => { text =>  $locale->text('Unit'),             nowrap => 1, width => '5%'  },
+   partnumber    => { text =>  $locale->text('Part Number'),      nowrap => 1, width => '20%' },
+   description   => { text =>  $locale->text('Part Description'), nowrap => 1, width => '50%' },
+   lastcost      => { text =>  $locale->text('Purchase Prices'),  nowrap => 1, width => '50%' },
+   total         => { text =>  $locale->text('Sale Prices'),      nowrap => 1,                },
+   bom           => { text =>  $locale->text('BOM'),                                          },
+   partsgroup    => { text =>  $locale->text('Group'),                                        },
+  );
 
-  print qq|
-        </tr>
-|;
+  my @ROWS;
 
   for my $i (1 .. $numrows) {
-    $form->{"partnumber_$i"} =~ s/\"/&quot;/g;
-
-    $linetotal =
-      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
-    $form->{assemblytotal} += $linetotal;
+    my (%row, @row_hiddens);
 
-    $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
-
-    $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
+    $form->{"partnumber_$i"} =~ s/\"/&quot;/g;
 
+    $linetotal           = $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4);
+    $line_purchase_price = $form->round_amount($form->{"lastcost_$i"} *  $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 4);
+    $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);
+    $href                = qq|$form->{script}?action=edit&id=$form->{"id_$i"}&rowcount=$i&previousform=$previousform|;
+    map { $row{$_}{data} = "" } qw(qty unit partnumber description bom partsgroup runningnumber);
+
+    # last row
     if (($i >= 1) && ($i == $numrows)) {
-
-      if ($nochange) {
-        map { $column_data{$_} = qq|<td></td>| }
-          qw(qty unit partnumber description bom partsgroup);
-      } else {
-
-        map { $column_data{$_} = qq|<td></td>| } qw(runningnumber unit bom);
-
-        $column_data{qty} =
-          qq|<td><input name="qty_$i" size=5 value="$form->{"qty_$i"}"></td>|;
-        $column_data{partnumber} =
-          qq|<td><input name="partnumber_$i" size=15 value="$form->{"partnumber_$i"}"></td>|;
-        $column_data{description} =
-          qq|<td><input name="description_$i" size=40 value="$form->{"description_$i"}"></td>|;
-        $column_data{partsgroup} =
-          qq|<td><input name="partsgroup_$i" size=10 value="$form->{"partsgroup_$i"}"></td>|;
-
+      if (!$form->{previousform}) {
+        $row{partnumber}{data}  = qq|<input name="partnumber_$i" size=15 value="$form->{"partnumber_$i"}">|;
+        $row{qty}{data}         = qq|<input name="qty_$i" size=5 value="$form->{"qty_$i"}">|;
+        $row{description}{data} = qq|<input name="description_$i" size=40 value="$form->{"description_$i"}">|;
+        $row{partsgroup}{data}  = qq|<input name="partsgroup_$i" size=10 value="$form->{"partsgroup_$i"}">|;
       }
-
+    # other rows
     } else {
-
       if ($form->{previousform}) {
-        $column_data{partnumber} =
-          qq|<td><input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}">$form->{"partnumber_$i"}</td>|;
-        $column_data{qty} =
-          qq|<td align=right><input type=hidden name="qty_$i" value="$form->{"qty_$i"}">$form->{"qty_$i"}</td>|;
-
-        $column_data{bom} =
-          qq|<td align=center><input type=hidden name="bom_$i" value=$form->{"bom_$i"}>|;
-        $column_data{bom} .= ($form->{"bom_$i"}) ? "x" : "&nbsp;";
-        $column_data{bom} .= qq|</td>|;
-
-        $column_data{partsgroup} =
-          qq|<td><input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">$form->{"partsgroup_$i"}</td>|;
-
+        push @row_hiddens,          qw(qty bom);
+        $row{partnumber}{data}    = $form->{"partnumber_$i"};
+        $row{qty}{data}           = $form->{"qty_$i"};
+        $row{bom}{data}           = $form->{"bom_$i"} ? "x" : "&nbsp;";
+        $row{qty}{align}          = 'right';
       } else {
-        $href =
-          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} =
-          qq|<td><input name="runningnumber_$i" size=3 value="$i"></td>|;
-        $column_data{qty} =
-          qq|<td><input name="qty_$i" size=5 value="$form->{"qty_$i"}"></td>|;
-
-        $form->{"bom_$i"} = ($form->{"bom_$i"}) ? "checked" : "";
-        $column_data{bom} =
-          qq|<td align=center><input name="bom_$i" type=checkbox class=checkbox value=1 $form->{"bom_$i"}></td>|;
-
-        $column_data{partsgroup} =
-          qq|<td><input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">$form->{"partsgroup_$i"}</td>|;
+        $row{partnumber}{data}    = qq|<a href=$href>$form->{"partnumber_$i"}</a>|;
+        $row{qty}{data}           = qq|<input name="qty_$i" size=5 value="$form->{"qty_$i"}">|;
+        $row{runningnumber}{data} = qq|<input name="runningnumber_$i" size=3 value="$i">|;
+        $row{bom}{data}   = sprintf qq|<input name="bom_$i" type=checkbox class=checkbox value=1 %s>|,
+                                       $form->{"bom_$i"} ? 'checked' : '';
       }
-
-      $column_data{unit} =
-        qq|<td><input type=hidden name="unit_$i" value="$form->{"unit_$i"}">$form->{"unit_$i"}</td>|;
-      $column_data{description} =
-        qq|<td><input type=hidden name="description_$i" value="$form->{"description_$i"}">$form->{"description_$i"}</td>|;
+      push @row_hiddens,        qw(unit description partnumber partsgroup);
+      $row{unit}{data}        = $form->{"unit_$i"};
+      $row{description}{data} = $form->{"description_$i"};
+      $row{partsgroup}{data}  = $form->{"partsgroup_$i"};
+      $row{bom}{align}        = 'center';
     }
 
-    $column_data{total} = qq|<td align=right>$linetotal</td>|;
+    $row{lastcost}{data}      = $line_purchase_price;
+    $row{total}{data}         = $linetotal;
+    $row{lastcost}{align}     = 'right';
+    $row{total}{align}        = 'right';
+    $row{deliverydate}{align} = 'right';
 
-    $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
-
-    print qq|
-        <tr>|;
+    push @row_hiddens, qw(id sellprice lastcost weight price_factor_id price_factor);
+    $row{hiddens} = [ map +{ name => "${_}_$i", value => $form->{"${_}_$i"} }, @row_hiddens ];
 
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-        </tr>
-  <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"}>
-|;
+    push @ROWS, \%row;
   }
 
-  print qq|
-      </table>
-    </td>
-  </tr>
-|;
+  print $form->parse_html_template('ic/assembly_row', { COLUMNS => \@column_index, ROWS => \@ROWS, HEADER => \%header });
 
   $lxdebug->leave_sub();
 }
@@ -1803,6 +1701,12 @@ sub assembly_row {
 sub update {
   $lxdebug->enter_sub();
 
+  # parse pricegroups. and no, don't rely on check_form for this...
+  map { $form->{"price_$_"} = $form->parse_amount(\%myconfig, $form->{"price_$_"}) } 1 .. $form->{price_rows};
+
+  # same for lastcosts
+  map { $form->{"lastcost_$_"} = $form->parse_amount(\%myconfig, $form->{"lastcost_$_"}) } 1 .. $form->{"makemodel_rows"};
+
   if ($form->{item} eq "assembly") {
     my $i = $form->{assembly_rows};
 
@@ -1824,8 +1728,8 @@ sub update {
 
         if ($rows > 1) {
           $form->{makemodel_rows}--;
-          &select_item;
-          exit;
+          select_item(mode => 'IC');
+          ::end_of_request();
         } else {
           map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g }
             qw(partnumber description unit partsgroup);
@@ -1860,7 +1764,7 @@ sub save {
 
   $auth->assert('part_service_assembly_edit');
 
-  my ($parts_id, %newform, $previousform, $amount, $callback);
+  my ($parts_id, %newform, $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!"));
@@ -1868,17 +1772,12 @@ sub save {
   # check if there is a description
   $form->isblank("description", $locale->text("Part Description missing!"));
 
-  if ($form->{obsolete}) {
-    $form->error(
-      $locale->text(
-        "Inventory quantity must be zero before you can set this $form->{item} obsolete!"
-      ))
-      if ($form->{onhand} * 1);
-  }
+  $form->error($locale->text("Inventory quantity must be zero before you can set this $form->{item} obsolete!"))
+    if $form->{obsolete} && $form->{onhand} * 1 && $form->{item} ne 'service';
 
   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.")
     );
   }
 
@@ -1893,8 +1792,8 @@ sub save {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-  	$form->{addition} = "SAVED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED";
+    $form->save_history;
   }
   # /saving the history
   $parts_id = $form->{id};
@@ -1906,17 +1805,14 @@ sub save {
     # save the new form variables before splitting previousform
     map { $newform{$_} = $form->{$_} } keys %$form;
 
-    $previousform = $form->unescape($form->{previousform});
-
     # don't trample on previous variables
     map { delete $form->{$_} } keys %newform;
 
-    # now take it apart and restore original values
-    foreach my $item (split /&/, $previousform) {
-      my ($key, $value) = split m/=/, $item, 2;
-      $value =~ s/%26/&/g;
-      $form->{$key} = $value;
-    }
+    my $ic_cvar_configs = CVar->get_configs(module => 'IC');
+    my @ic_cvar_fields  = map { "cvar_$_->{name}" } @{ $ic_cvar_configs };
+
+    # restore original values
+    $::auth->restore_form_from_session($newform{previousform}, form => $form);
     $form->{taxaccounts} = $newform{taxaccount2};
 
     if ($form->{item} eq 'assembly') {
@@ -1934,8 +1830,10 @@ sub save {
 
       # change/add values for assembly item
       map { $form->{"${_}_$i"} = $newform{$_} } qw(partnumber description bin unit weight listprice sellprice inventory_accno income_accno expense_accno price_factor_id);
+      map { $form->{"ic_${_}_$i"} = $newform{$_} } @ic_cvar_fields;
 
-      $form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"};
+      # das ist __voll__ bekloppt, dass so auszurechnen jb 22.5.09
+      #$form->{sellprice} += $form->{"sellprice_$i"} * $form->{"qty_$i"};
       $form->{weight}    += $form->{"weight_$i"} * $form->{"qty_$i"};
 
     } else {
@@ -1945,6 +1843,7 @@ sub save {
       $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 lastcost price_factor_id);
+      map { $form->{"ic_${_}_$i"} = $newform{$_} } @ic_cvar_fields;
 
       $form->{"longdescription_$i"} = $newform{notes};
 
@@ -1972,7 +1871,7 @@ sub save {
       $form->{creditremaining} -= $amount;
 
       # redo number formatting, because invoice parse them!
-      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 lastcost rop);
     }
 
     $form->{"id_$i"} = $parts_id;
@@ -2020,8 +1919,8 @@ sub save_as_new {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-  	$form->{addition} = "SAVED AS NEW";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "SAVED AS NEW";
+    $form->save_history;
   }
   # /saving the history
   $form->{id} = 0;
@@ -2041,8 +1940,8 @@ sub delete {
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|partnumber_| . $form->{partnumber};
-  	$form->{addition} = "DELETED";
-  	$form->save_history($form->dbconnect(\%myconfig));
+    $form->{addition} = "DELETED";
+    $form->save_history;
   }
   # /saving the history
   my $rc = IC->delete(\%myconfig, \%$form);
@@ -2077,12 +1976,10 @@ sub parts_language_selection {
 
   $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})) {
+    foreach my $item (split(/---\+\+\+---/, $form->{language_values})) {
       my ($language_id, $translation, $longdescription) = split(/--\+\+--/, $item);
 
       foreach my $language (@{ $languages }) {
@@ -2103,17 +2000,34 @@ sub parts_language_selection {
   my @header =
     map(+{ "column_title" => $header_title{$_},
            "column" => $_,
-           "callback" => $callback,
          },
         @header_sort);
 
   $form->{"title"} = $locale->text("Language Values");
   $form->header();
   print $form->parse_html_template("ic/parts_language_selection", { "HEADER"    => \@header,
-                                                                    "LANGUAGES" => $languages,
-                                                                    "onload"    => $onload });
+                                                                    "LANGUAGES" => $languages, });
 
   $lxdebug->leave_sub();
 }
 
+sub ajax_autocomplete {
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $form->{column}          = 'description'     unless $form->{column} =~ /^partnumber|description$/;
+  $form->{$form->{column}} = $form->{q}           || '';
+  $form->{limit}           = ($form->{limit} * 1) || 10;
+  $form->{searchitems}   ||= '';
+
+  my @results = IC->all_parts(\%myconfig, $form);
+
+  print $form->ajax_response_header(),
+        $form->parse_html_template('ic/ajax_autocomplete');
+
+  $main::lxdebug->leave_sub();
+}
+
 sub continue { call_sub($form->{"nextsub"}); }