X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fir.pl;h=f4345c1fe1cf3dc549a6531fee8638aae2b47e7b;hb=ab1df08bfae3ef3361c7b5e4e16d91ae3cb34961;hp=9cdb6d7d995ad581acfa6baa876991a13ca0f2f9;hpb=52983c089cf1b4f1a4451e57ffa76f846c4791ba;p=kivitendo-erp.git

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index 9cdb6d7d9..f4345c1fe 100644
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -37,6 +37,7 @@ use SL::PE;
 use List::Util qw(max);
 
 require "bin/mozilla/io.pl";
+require "bin/mozilla/invoice_io.pl";
 require "bin/mozilla/arap.pl";
 require "bin/mozilla/common.pl";
 require "bin/mozilla/drafts.pl";
@@ -61,7 +62,7 @@ sub add {
 
 sub edit {
   $lxdebug->enter_sub();
-  
+
   # show history button
   $form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
   #/show hhistory button
@@ -243,14 +244,15 @@ sub form_header {
   my @old_project_ids = ($form->{"globalproject_id"});
   map { push @old_project_ids, $form->{"project_id_$_"} if $form->{"project_id_$_"}; } 1..$form->{"rowcount"};
 
-  $form->get_lists("contacts"   => "ALL_CONTACTS",
-                   "projects"   => { "key"  => "ALL_PROJECTS",
-                                     "all"    => 0,
-                                     "old_id" => \@old_project_ids },
-                   "taxzones"   => "ALL_TAXZONES",
-                   "employees"  => "ALL_SALESMEN",
-                   "currencies" => "ALL_CURRENCIES",
-                   "vendors"    => "ALL_VENDORS");
+  $form->get_lists("contacts"      => "ALL_CONTACTS",
+                   "projects"      => { "key"  => "ALL_PROJECTS",
+                                      "all"    => 0,
+                                      "old_id" => \@old_project_ids },
+                   "taxzones"      => "ALL_TAXZONES",
+                   "employees"     => "ALL_SALESMEN",
+                   "currencies"    => "ALL_CURRENCIES",
+                   "vendors"       => "ALL_VENDORS",
+                   "price_factors" => "ALL_PRICE_FACTORS");
 
   my %labels;
   my @values = (undef);
@@ -890,6 +892,8 @@ sub update {
         map { $form->{item_list}[$i]{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
         map { $form->{"${_}_$i"} = $form->{item_list}[0]{$_} } keys %{ $form->{item_list}[0] };
 
+        $form->{"marge_price_factor_$i"} = $form->{item_list}->[0]->{price_factor};
+
         ($sellprice || $form->{"sellprice_$i"}) =~ /\.(\d+)/;
         $decimalplaces = max 2, length $1;