X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fic.pl;h=5b377b6391dfa576eee087295c3c051dfec5a1a8;hb=4ef168cbd0b5d2e6099b40d2528bda85e2066994;hp=49448bd61b004ef4fca489f6531521a251c0640e;hpb=c45efbbd93c9803d0933232157d71ec4ad288fba;p=kivitendo-erp.git

diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index 49448bd61..5b377b639 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -34,6 +34,7 @@
 use POSIX qw(strftime);
 use List::Util qw(max);
 
+use SL::AM;
 use SL::IC;
 use SL::ReportGenerator;
 
@@ -95,20 +96,18 @@ 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->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()
@@ -136,7 +135,7 @@ sub confirm_price_update {
   $form->header;
 
   map { delete $form->{$_} } qw(action header);
-  
+
   print $form->parse_html_template('ic/confirm_price_update', { HIDDENS => [ map { name => $_, value => $form->{$_} }, keys %$form ] });
 
   $lxdebug->leave_sub();
@@ -156,199 +155,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();
@@ -576,9 +575,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;
@@ -934,7 +930,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|">
@@ -971,7 +967,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 {
@@ -1004,10 +1000,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.
@@ -1070,7 +1066,7 @@ 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};
   }
@@ -1116,8 +1112,6 @@ sub generate_report {
     }
   }
 
-  $form->{l_lastcost} = "" if ($form->{searchitems} eq 'assembly' && !$form->{bom});
-
   IC->all_parts(\%myconfig, \%$form);
 
   my @columns =
@@ -1198,6 +1192,8 @@ sub generate_report {
   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} }) {
 
@@ -1230,6 +1226,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};
@@ -1241,7 +1239,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->{customer_id} ne '' ? 'sales_order' : 'purchase_order'), 'id=' . E($ref->{trans_id}), 'callback');
       $row->{ordnumber}{link} = $edit_oe_link;
       $row->{quonumber}{link} = $edit_oe_link if (!$ref->{ordnumber});
 
@@ -1297,7 +1295,7 @@ sub generate_report {
 
 sub parts_subtotal {
   $lxdebug->enter_sub();
-  
+
   $auth->assert('part_service_assembly_edit');
 
   # imports
@@ -1464,9 +1462,11 @@ sub form_header {
 
   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,14 +1477,17 @@ sub form_header {
   $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->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();
 }
 
@@ -1493,101 +1496,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();
 }
@@ -1595,33 +1504,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>
-|;
+  my @mm_data = grep { any { $_ ne '' } @$_{qw(make model)} } map +{ make => $form->{"make_$_"}, model => $form->{"model_$_"} }, 1 .. $numrows;
+  delete @{$form}{grep { m/^make_\d+/ || m/^model_\d+/ } keys %{ $form }};
+  print $form->parse_html_template('ic/makemodel', { MM_DATA => [ @mm_data, {} ], mm_rows => scalar @mm_data + 1 });
 
   $lxdebug->leave_sub();
 }
@@ -1635,7 +1521,7 @@ sub assembly_row {
   our ($deliverydate); # ToDO: cjeck if this indeed comes from global context
 
   @column_index =
-    qw(runningnumber qty unit bom partnumber description partsgroup total);
+    qw(runningnumber qty unit bom partnumber description partsgroup lastcost total);
 
   if ($form->{previousform}) {
     $nochange     = 1;
@@ -1654,6 +1540,8 @@ sub assembly_row {
 
     # save form variables in a previousform variable
     foreach my $key (sort keys %$form) {
+      next unless ref $form->{$key} eq '' && $form->{$key};
+      next if $key =~ /^select/; # get rid of these stupid select things
 
       # escape ampersands
       $form->{$key} =~ s/&/%26/g;
@@ -1664,6 +1552,7 @@ sub assembly_row {
     $form->{callback} = $callback;
 
     $form->{assemblytotal} = 0;
+    $form->{assembly_purchase_price_total} = 0;
     $form->{weight}        = 0;
 
   }
@@ -1679,6 +1568,8 @@ sub assembly_row {
     . qq|</th>|;
   $column_header{description} =
     qq|<th nowrap width=50%>| . $locale->text('Part Description') . qq|</th>|;
+  $column_header{lastcost} =
+    qq|<th nowrap width=50%>| . $locale->text('Purchase Price') . qq|</th>|;
   $column_header{total} =
     qq|<th align=right nowrap>| . $locale->text('Extended') . qq|</th>|;
   $column_header{bom}        = qq|<th>| . $locale->text('BOM') . qq|</th>|;
@@ -1704,12 +1595,16 @@ sub assembly_row {
     $form->{"partnumber_$i"} =~ s/\"/&quot;/g;
 
     $linetotal =
-      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"}, 2);
+      $form->round_amount($form->{"sellprice_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2);
+    $line_purchase_price  =
+      $form->round_amount($form->{"lastcost_$i"} * $form->{"qty_$i"} / ($form->{"price_factor_$i"} || 1), 2); #lastcost == purchase_price | ungenaue datenbankfeld-übersetzung
     $form->{assemblytotal} += $linetotal;
+    $form->{assembly_purchase_price_total}  += $line_purchase_price;
 
     $form->{"qty_$i"} = $form->format_amount(\%myconfig, $form->{"qty_$i"});
 
     $linetotal = $form->format_amount(\%myconfig, $linetotal, 2);
+    $line_purchase_price = $form->format_amount(\%myconfig, $line_purchase_price, 2);
 
     if (($i >= 1) && ($i == $numrows)) {
 
@@ -1771,6 +1666,7 @@ sub assembly_row {
         qq|<td><input type=hidden name="description_$i" value="$form->{"description_$i"}">$form->{"description_$i"}</td>|;
     }
 
+    $column_data{lastcost} = qq|<td align=right>$line_purchase_price</td>|;
     $column_data{total} = qq|<td align=right>$linetotal</td>|;
 
     $column_data{deliverydate} = qq|<td align=right>$deliverydate</td>|;
@@ -1785,6 +1681,8 @@ sub assembly_row {
   <input type=hidden name="id_$i" value=$form->{"id_$i"}>
   <input type=hidden name="sellprice_$i" value=$form->{"sellprice_$i"}>
   <input type=hidden name="weight_$i" value=$form->{"weight_$i"}>
+  <input type=hidden name="price_factor_id_$i" value=$form->{"price_factor_id_$i"}>
+  <input type=hidden name="price_factor_$i" value=$form->{"price_factor_$i"}>
 |;
   }
 
@@ -1874,8 +1772,8 @@ sub save {
   }
 
   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.")
     );
   }