X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Finvoice_io.pl;h=b4290feb246d29964bafd4d09a5d8382030e62cf;hb=fe73e0d261229f181e8133283b530509773d2151;hp=229927220fb4ca803cf991c31da7ef7a9854b7bd;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git

diff --git a/bin/mozilla/invoice_io.pl b/bin/mozilla/invoice_io.pl
index 229927220..b4290feb2 100644
--- a/bin/mozilla/invoice_io.pl
+++ b/bin/mozilla/invoice_io.pl
@@ -43,12 +43,14 @@ use SL::IC;
 
 require "bin/mozilla/common.pl";
 
+use strict;
+
 # any custom scripts for this one
 if (-f "bin/mozilla/custom_invoice_io.pl") {
   eval { require "bin/mozilla/custom_ivvoice_io.pl"; };
 }
-if (-f "bin/mozilla/$form->{login}_invoice_io.pl") {
-  eval { require "bin/mozilla/$form->{login}_invoice_io.pl"; };
+if (-f "bin/mozilla/$main::form->{login}_invoice_io.pl") {
+  eval { require "bin/mozilla/$main::form->{login}_invoice_io.pl"; };
 }
 
 1;
@@ -91,7 +93,7 @@ use Data::Dumper;
 # neue Optik im Rechnungsformular      #
 ########################################
 #sub display_row {
-#  $lxdebug->enter_sub();
+#  $main::lxdebug->enter_sub();
 #  my $numrows = shift;
 #
 #  my $is_sales =
@@ -117,9 +119,9 @@ use Data::Dumper;
 #  }
 ############### ENDE Neueintrag ##################
 #
-#  my $dimension_units = AM->retrieve_units(\%myconfig, $form, "dimension");
-#  my $service_units = AM->retrieve_units(\%myconfig, $form, "service");
 #  my $all_units = AM->retrieve_units(\%myconfig, $form);
+#  my $dimension_units = $all_units;
+#  my $service_units = $all_units;
 #
 #  my %price_factors = map { $_->{id} => $_->{factor} } @{ $form->{ALL_PRICE_FACTORS} };
 #
@@ -323,7 +325,7 @@ use Data::Dumper;
 #    $qty_dec = length $qty_dec;
 #
 #    $column_data{qty} =
-#        qq|<td align="right"><input name="qty_$i" size="5" value="|
+#        qq|<td align="right" nowrap><input name="qty_$i" size="5" value="|
 #      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec) .qq|">|;
 #    if ($form->{"formel_$i"}) {
 #      $column_data{qty} .= qq|<button type="button" onclick="calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)">| . $locale->text('*/') . qq|</button>|
@@ -400,7 +402,7 @@ use Data::Dumper;
 #        # for last row
 #        $column_data{sellprice_pg} = qq|<td align="right">&nbsp;</td>|;
 #        }
-#        
+#
 #      $column_data{sellprice} =
 #      qq|<td><input name="sellprice_$i" size="10" onBlur=\"check_right_number_format(this)\" value="|
 #        . $form->format_amount(\%myconfig, $form->{"sellprice_$i"},
@@ -546,25 +548,30 @@ use Data::Dumper;
 #    $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
 #  }
 #
-#  $lxdebug->leave_sub();
+#  $main::lxdebug->leave_sub();
 #}
 
 sub set_pricegroup {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
   my $rowcount = shift;
-  for $j (1 .. $rowcount) {
-    my $pricegroup_old = $form->{"pricegroup_old_$i"};
+  for my $j (1 .. $rowcount) {
+    my $pricegroup_old = $form->{"pricegroup_old_$j"};
     if ($form->{PRICES}{$j}) {
-      $len    = 0;
-      $prices = '<option value="--">' . $locale->text("none (pricegroup)") . '</option>';
-      $price  = 0;
-      foreach $item (@{ $form->{PRICES}{$j} }) {
+      my $len    = 0;
+      my $prices = '<option value="--">' . $locale->text("none (pricegroup)") . '</option>';
+      my $price  = 0;
+      foreach my $item (@{ $form->{PRICES}{$j} }) {
 
         #$price = $form->round_amount($myconfig,  $item->{price}, 5);
         #$price = $form->format_amount($myconfig, $item->{price}, 2);
-        $price         = $item->{price};
-        $pricegroup_id = $item->{pricegroup_id};
-        $pricegroup    = $item->{pricegroup};
+        my $price         = $item->{price};
+        my $pricegroup_id = $item->{pricegroup_id};
+        my $pricegroup    = $item->{pricegroup};
 
         # build drop down list for pricegroups
         $prices .=
@@ -590,14 +597,18 @@ sub set_pricegroup {
       $form->{"prices_$j"} = $prices;
     }
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub display_form {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
 
-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $main::auth->assert('part_service_assembly_edit   | vendor_invoice_edit       | sales_order_edit    | invoice_edit |' .
+                'request_quotation_edit       | sales_quotation_edit      | purchase_order_edit | '.
+                'purchase_delivery_order_edit | sales_delivery_order_edit');
 
   relink_accounts();
   retrieve_partunits() if ($form->{type} =~ /_delivery_order$/);
@@ -613,7 +624,7 @@ sub display_form {
     exit;
   }
 
-  Common::webdav_folder($form) if ($webdav);
+  Common::webdav_folder($form) if ($main::webdav);
 
   #   if (   $form->{print_and_post}
   #       && $form->{second_run}
@@ -650,47 +661,52 @@ sub display_form {
   #   }
   &form_header;
 
-  $numrows    = ++$form->{rowcount};
-  $subroutine = "display_row";
+  {
+    no strict 'refs';
 
-  if ($form->{item} eq 'part') {
+    my $numrows    = ++$form->{rowcount};
+    my $subroutine = "display_row";
 
-    #set preisgruppenanzahl
-    $numrows    = $form->{price_rows};
-    $subroutine = "price_row";
+    if ($form->{item} eq 'part') {
 
-    &{$subroutine}($numrows);
+      #set preisgruppenanzahl
+      $numrows    = $form->{price_rows};
+      $subroutine = "price_row";
 
-    $numrows    = 0;
-  }
-  if ($form->{item} eq 'assembly') {
-    $numrows    = $form->{price_rows};
-    $subroutine = "price_row";
+      &{$subroutine}($numrows);
 
-    &{$subroutine}($numrows);
+      $numrows    = ++$form->{makemodel_rows};
+      $subroutine = "makemodel_row";
+    }
+    if ($form->{item} eq 'assembly') {
+      $numrows    = $form->{price_rows};
+      $subroutine = "price_row";
 
-    $numrows    = ++$form->{makemodel_rows};
-    $subroutine = "makemodel_row";
+      &{$subroutine}($numrows);
 
-    # create makemodel rows
-    &{$subroutine}($numrows);
+      $numrows    = ++$form->{makemodel_rows};
+      $subroutine = "makemodel_row";
 
-    $numrows    = ++$form->{assembly_rows};
-    $subroutine = "assembly_row";
-  }
-  if ($form->{item} eq 'service') {
-    $numrows    = $form->{price_rows};
-    $subroutine = "price_row";
+      # create makemodel rows
+      &{$subroutine}($numrows);
 
-    &{$subroutine}($numrows);
+      $numrows    = ++$form->{assembly_rows};
+      $subroutine = "assembly_row";
+    }
+    if ($form->{item} eq 'service') {
+      $numrows    = $form->{price_rows};
+      $subroutine = "price_row";
 
-    $numrows = 0;
-  }
+      &{$subroutine}($numrows);
 
-  # create rows
-  &{$subroutine}($numrows) if $numrows;
+      $numrows = 0;
+    }
+
+    # create rows
+    &{$subroutine}($numrows) if $numrows;
+  }
 
   &form_footer;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }