X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=22acf9710aa8d3f1feba7119649e7cea25252cbe;hb=30175d8928a88a8b7f224a4515e192e66fa37656;hp=8cbe24456b01ed759d01cfd565466397b70ee880;hpb=a8d9f325b9a5d7b7336b8c6f16f12080a5bdba39;p=kivitendo-erp.git

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 8cbe24456..22acf9710 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -82,7 +82,6 @@ use Data::Dumper;
 sub display_row {
   $lxdebug->enter_sub();
   my $numrows = shift;
-print STDERR "io.pl-display_row\n";
   if ($lizenzen && $form->{vc} eq "customer") {
     if ($form->{type} =~ /sales_order/) {
       @column_index = (runningnumber, partnumber, description, ship, qty);
@@ -104,7 +103,10 @@ print STDERR "io.pl-display_row\n";
   push @column_index, qw(unit);
 
   #for pricegroups column
-  if ($form->{type} =~ (/sales_quotation/) or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) or ($form->{type} =~ /sales_order/)) {
+  if (   $form->{type} =~ (/sales_quotation/)
+      or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
+      or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
+      or ($form->{type} =~ /sales_order/)) {
     push @column_index, qw(sellprice_drag);
   }
 
@@ -252,8 +254,13 @@ print STDERR "io.pl-display_row\n";
         qq|<td><input name="description_$i" size=30 value="$form->{"description_$i"}"></td>|;
     }
 
+    (my $qty_dec) = ($form->{"qty_$i"} =~ /\.(\d+)/);
+    $qty_dec = length $qty_dec;
+
     $column_data{qty} =
-        qq|<td align=right><input name="qty_$i" size=5 value=|.$form->format_amount(\%myconfig, $form->{"qty_$i"},0).qq|></td>|;
+        qq|<td align=right><input name="qty_$i" size=5 value=|
+      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec)
+      . qq|></td>|;
     $column_data{ship} =
         qq|<td align=right><input name="ship_$i" size=5 value=|
       . $form->format_amount(\%myconfig, $form->{"ship_$i"})
@@ -261,41 +268,37 @@ print STDERR "io.pl-display_row\n";
     $column_data{unit} =
       qq|<td><input name="unit_$i" size=5 value="$form->{"unit_$i"}"></td>|;
 
-
-
- #print (STDERR "io.pl---111-i-$i", Dumper($form->{PRICES}));
     # build in dragdrop for pricesgroups
     if ($form->{"prices_$i"}) {
- print STDERR " YES  prices\n";
-      $price_tmp = $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
+      $price_tmp =
+        $form->format_amount(\%myconfig, $form->{"price_new_$i"}, 2);
 
       $column_data{sellprice_drag} =
         qq|<td align=right><select name="sellprice_drag_$i">$form->{"prices_$i"}</select></td>|;
       $column_data{sellprice} =
         qq|<td><input name="sellprice_$i" size=5 value=$price_tmp></td>|;
     } else {
-      print STDERR " NO prices\n";
+
       # for last row and report
       # set pricegroup dragdrop from report menu
       if ($form->{"sellprice_$i"} != 0) {
-print STDERR "   HIER NOCH FÜR RECHNUNGSAUFRUFE\n";
-print (STDERR "sellprice_$i   ", Dumper($form->{"sellprice_$i"}), " pricegroup_id_$i ", Dumper($form->{"pricegroup_id_$i"}));
         $prices =
-             qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
+          qq|<option value="$form->{"sellprice_$i"}--$form->{"pricegroup_id_$i"}" selected>$form->{"pricegroup_$i"}</option>\n|;
 
         $form->{"pricegroup_old_$i"} = $form->{"pricegroup_id_$i"};
 
         $column_data{sellprice_drag} =
           qq|<td align=right><select name="sellprice_drag_$i">$prices</select></td>|;
 
-        }else {
-          # for last row
-          $column_data{sellprice_drag} =
-            qq|<td align=right><input name="sellprice_$i" size=9 value=|
-              . $form->format_amount(\%myconfig, $form->{"prices_$i"},
-                               $decimalplaces)
-            . qq|></td>|;
-          }
+      } else {
+
+        # for last row
+        $column_data{sellprice_drag} =
+          qq|<td align=right><input name="sellprice_$i" size=9 value=|
+          . $form->format_amount(\%myconfig, $form->{"prices_$i"},
+                                 $decimalplaces)
+          . qq|></td>|;
+      }
 
       $column_data{sellprice} =
         qq|<td><input name="sellprice_$i" size=5 value=|
@@ -303,7 +306,6 @@ print (STDERR "sellprice_$i   ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
                                $decimalplaces)
         . qq|></td>|;
     }
-#print (STDERR "io.pl---555-i-$i", Dumper($form->{"price_old_$i"}));
     $column_data{discount} =
         qq|<td align=right><input name="discount_$i" size=3 value=|
       . $form->format_amount(\%myconfig, $form->{"discount_$i"})
@@ -342,7 +344,8 @@ print (STDERR "sellprice_$i   ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
 
 <input type=hidden name="pricegroup_old_$i" value=$form->{"pricegroup_old_$i"}>
 <input type=hidden name="price_old_$i" value=$form->{"price_old_$i"}>
-<input type=hidden name="price_new_$i" value=|.$form->format_amount(\%myconfig,$form->{"price_new_$i"}).qq|>
+<input type=hidden name="price_new_$i" value=|
+      . $form->format_amount(\%myconfig, $form->{"price_new_$i"}) . qq|>
 
 <input type=hidden name="id_$i" value=$form->{"id_$i"}>
 <input type=hidden name="inventory_accno_$i" value=$form->{"inventory_accno_$i"}>
@@ -354,6 +357,9 @@ print (STDERR "sellprice_$i   ", Dumper($form->{"sellprice_$i"}), " pricegroup_i
 <input type=hidden name="listprice_$i" value="$form->{"listprice_$i"}">
 <input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
 <input type=hidden name="taxaccounts_$i" value="$form->{"taxaccounts_$i"}">
+<input type=hidden name="ordnumber_$i" value="$form->{"ordnumber_$i"}">
+<input type=hidden name="transdate_$i" value="$form->{"transdate_$i"}">
+<input type=hidden name="cusordnumber_$i" value="$form->{"cusordnumber_$i"}">
 
 |;
 
@@ -419,33 +425,38 @@ sub set_pricegroup {
   my $rowcount = shift;
   $lxdebug->enter_sub();
   for $j (1 .. $rowcount) {
-
     my $pricegroup_old = $form->{"pricegroup_old_$i"};
-    if ($form->{PRICES}{ $j }) {
+    if ($form->{PRICES}{$j}) {
       $len    = 0;
       $prices = '';
-      $price = 0;
-      foreach $item (@{ $form->{PRICES}{ $j } }) {
-# print STDERR "-VOR   PREIS--$item->{price}--PREISGRUOP-$item->{pricegroup_id}\n";
-        $price         = $form->round_amount($myconfig, $item->{price},5);
-        $price         = $form->format_amount($myconfig, $item->{price},2);
-        $price         = $item->{price};
-# print STDERR "-NACH PREIS--$price--PREISGRUOP-$item->{pricegroup_id}\n";
+      $price  = 0;
+      foreach $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};
+
         # build dragdrop for pricegroups
         $prices .=
-             qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
+          qq|<option value="$price--$pricegroup_id"$item->{selected}>$pricegroup</option>\n|;
 
         $len += 1;
-# print STDERR "prices---$prices\n";
+#        map {
+#               $form->{"${_}_$j"} =
+#               $form->format_amount(\%myconfig, $form->{"${_}_$j"})
+#              } qw(sellprice price_new price_old);
+
         # set new selectedpricegroup_id and prices for "Preis"
-        if ($item->{selected}) {
+        if ($item->{selected} && ($pricegroup_id != 0)) {
           $form->{"pricegroup_old_$j"} = $pricegroup_id;
-          $form->{"price_new_$j"} = $price;
-           $form->{"sellprice_$j"} = $price;
+          $form->{"price_new_$j"}      = $price;
+          $form->{"sellprice_$j"}      = $price;
         }
-        if ($len >= 1) {
+        if ($pricegroup_id == 0) {
+          $form->{"price_new_$j"} = $form->{"sellprice_$j"};
+        }
+        if ($len > 1) {
           $form->{"prices_$j"} = $prices;
         }
       }
@@ -456,7 +467,6 @@ sub set_pricegroup {
 
 sub select_item {
   $lxdebug->enter_sub();
-print STDERR "io.pl-select_item\n";
   @column_index = qw(ndx partnumber description onhand sellprice);
 
   $column_data{ndx}        = qq|<th>&nbsp;</th>|;
@@ -508,11 +518,10 @@ print STDERR "io.pl-select_item\n";
     }
 
     map { $ref->{$_} =~ s/\"/&quot;/g } qw(partnumber description unit);
-#sk tradediscount
-print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
+
+    #sk tradediscount
     $ref->{sellprice} =
       $form->round_amount($ref->{sellprice} * (1 - $form->{tradediscount}), 2);
-print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
     $column_data{ndx} =
       qq|<td><input name=ndx class=radio type=radio value=$i $checked></td>|;
     $column_data{partnumber} =
@@ -594,7 +603,7 @@ print STDERR "TRADEDISCOUNT $ref->{sellprice}\n";
 
 sub item_selected {
   $lxdebug->enter_sub();
-print STDERR "io.pl-item_selected\n";
+
   # replace the last row with the checked row
   $i = $form->{rowcount};
   $i = $form->{assembly_rows} if ($form->{item} eq 'assembly');
@@ -669,7 +678,7 @@ print STDERR "io.pl-item_selected\n";
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
   # build up html code for prices_$i
-  set_pricegroup();
+  set_pricegroup($form->{rowcount});
 
   &display_form;
 
@@ -774,12 +783,13 @@ sub display_form {
     $form->{second_run} = 1;
     $form->{action}     = "display_form";
     $form->{rowcount}--;
-    my $rowcount =  $form->{rowcount};
+    my $rowcount = $form->{rowcount};
+
     # get pricegroups for parts
-    IS->get_pricegroups_for_parts(\%myconfig, \%$form, "new");
+    IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
     # build up html code for prices_$i
     set_pricegroup($rowcount);
-  
 
     $form->{resubmit} = 1;
 
@@ -790,6 +800,7 @@ sub display_form {
   $subroutine = "display_row";
 
   if ($form->{item} eq 'part') {
+
     #set preisgruppenanzahl
     $numrows    = $form->{price_rows};
     $subroutine = "price_row";
@@ -833,7 +844,6 @@ sub display_form {
 
 sub check_form {
   $lxdebug->enter_sub();
-print STDERR "io.pl-check_form\n";
   my @a     = ();
   my $count = 0;
   my @flds  = (
@@ -936,17 +946,20 @@ print STDERR "io.pl-check_form\n";
 
     }
   }
-  
-  #sk 
+
+  #sk
   # if pricegroups
-  if ($form->{type} =~ (/sales_quotation/) or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/)) or (($form->{level} eq undef) and ($form->{type} =~ /invoice/)) or ($form->{type} =~ /sales_order/)) {
-  
-  # get pricegroups for parts
-  IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+  if (   $form->{type} =~ (/sales_quotation/)
+      or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
+      or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
+      or ($form->{type} =~ /sales_order/)) {
+
+    # get pricegroups for parts
+    IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+    # build up html code for prices_$i
+    set_pricegroup($form->{rowcount});
 
-  # build up html code for prices_$i
-  set_pricegroup();
- 
   }
 
   &display_form;
@@ -994,7 +1007,7 @@ sub invoicetotal {
 
 sub validate_items {
   $lxdebug->enter_sub();
-print STDERR "io.pl-validate_items\n";
+
   # check if items are valid
   if ($form->{rowcount} == 1) {
     &update;
@@ -1017,7 +1030,6 @@ sub order {
   $form->{ordnumber} = $form->{invnumber};
 
   map { delete $form->{$_} } qw(id printed emailed queued);
-
   if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') {
     $form->{title} = $locale->text('Add Purchase Order');
     $form->{vc}    = 'vendor';
@@ -1122,7 +1134,7 @@ sub e_mail {
   $lxdebug->enter_sub();
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
-    $form->{resubmit} = 0;
+    $form->{resubmit}       = 0;
   }
   if ($myconfig{role} eq 'admin') {
     $bcc = qq|
@@ -1235,7 +1247,6 @@ sub send_email {
 
 sub print_options {
   $lxdebug->enter_sub();
-print STDERR "io.pl-print_options\n";
   $form->{sendmode} = "attachment";
   $form->{copies}   = 3 unless $form->{copies};
 
@@ -1395,6 +1406,7 @@ sub print {
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
   }
+
   # if this goes to the printer pass through
   if ($form->{media} eq 'printer' || $form->{media} eq 'queue') {
     $form->error($locale->text('Select postscript or PDF!'))
@@ -1413,8 +1425,8 @@ sub print_form {
   $lxdebug->enter_sub();
   my ($old_form) = @_;
 
-  $inv = "inv";
-  $due = "due";
+  $inv       = "inv";
+  $due       = "due";
   $numberfld = "invnumber";
 
   $display_form =
@@ -1506,13 +1518,12 @@ sub print_form {
   if (!$form->{"${inv}number"} && !$form->{preview}) {
     $form->{"${inv}number"} = $form->update_defaults(\%myconfig, $numberfld);
     if ($form->{media} ne 'email') {
- 
-        $i = $form->{rowcount};
-        # get pricegroups for parts
-        IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
-        # build up html code for prices_$i
-        set_pricegroup();
+      # get pricegroups for parts
+      IS->get_pricegroups_for_parts(\%myconfig, \%$form);
+
+      # build up html code for prices_$i
+      set_pricegroup($form->{rowcount});
 
       $form->{rowcount}--;
 
@@ -1540,7 +1551,8 @@ sub print_form {
     push @a,
       ("partnumber_$i", "description_$i",
        "partsgroup_$i", "serialnumber_$i",
-       "bin_$i",        "unit_$i");
+       "bin_$i",        "unit_$i",
+       "transdate_$i",  "ordnumber_$i");
   }
   map { push @a, "${_}_description" } split / /, $form->{taxaccounts};
 
@@ -1594,7 +1606,7 @@ sub print_form {
 
   # some of the stuff could have umlauts so we translate them
   push @a,
-    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact);
+    qw(shiptoname shiptostreet shiptozipcode shiptocity shiptocountry shiptoemail shippingpoint shipvia company address signature employee contact department_1 department_2);
 
   push @a, ("${inv}date", "${due}date", email, cc, bcc);
 
@@ -1711,7 +1723,6 @@ sub print_form {
 
 sub customer_details {
   $lxdebug->enter_sub();
-print STDERR "io.pl-customer_details\n";
   IS->customer_details(\%myconfig, \%$form);
   $lxdebug->leave_sub();
 }
@@ -1747,7 +1758,6 @@ sub ship_to {
   map { $form->{$_} = $form->parse_amount(\%myconfig, $form->{$_}) }
     qw(exchangerate creditlimit creditremaining);
 
-
   # get details for name
   &{"$form->{vc}_details"};
 
@@ -1756,12 +1766,11 @@ sub ship_to {
     ? $locale->text('Customer Number')
     : $locale->text('Vendor Number');
 
-  $i = $form->{rowcount};
   # get pricegroups for parts
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
 
   # build up html code for prices_$i
-  set_pricegroup();
+  set_pricegroup($form->{rowcount});
 
   $nextsub = ($form->{display_form}) ? $form->{display_form} : "display_form";