X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fdo.pl;h=1ce1c4694124b941f0028436f95a588d96fff50b;hb=3e17e2b64326dc5b21ccc9874792d475022d3109;hp=4ae7f455113ffb8794472bbac0865e1960475704;hpb=fe1c480088bea771423891bc5f5b4d45f7fed67c;p=kivitendo-erp.git

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index 4ae7f4551..1ce1c4694 100644
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -183,6 +183,8 @@ sub order_links {
     IR->get_vendor(\%myconfig, \%$form);
   } else {
     IS->get_customer(\%myconfig, \%$form);
+    # OFFEN tritt bug 1284 auch bei vendor auf?
+    $form->{discount} = $form->{customer_discount};
   }
 
   $form->restore_vars(qw(payment_id language_id taxzone_id intnotes cp_id));
@@ -628,14 +630,9 @@ sub save {
   # wird die Maske mit dem falschen Rabatt wieder aufgebaut.
   # Wie immer: backup_vars verwenden um nichts anderes kaputt zu
   # machen. jan 03.03.2010
-  for my $i (1 .. $form->{rowcount}) {
-    $form->{"backup_discount_$i"} = $form->{"discount_$i"};
-  };
+  # nicht mehr notwendig da für bug 1284 der backend aufruf entsprechend
+  # geändert wurde
   DO->save();
-  for my $i (1 .. $form->{rowcount}) {
-    $form->{"discount_$i"} = $form->{"backup_discount_$i"};
-    delete $form->{"backup_discount_$i"};
-  };
   # saving the history
   if(!exists $form->{addition}) {
     $form->{snumbers} = qq|donumber_| . $form->{donumber};
@@ -734,6 +731,11 @@ sub invoice {
   }
 
   for my $i (1 .. $form->{rowcount}) {
+    # für bug 1284
+    if ($form->{discount}){ # Falls wir einen Kundenrabatt haben 
+      # und keinen anderen discount wert an $i ...
+      $form->{"discount_$i"} ||= $form->{discount}*100; # ... nehmen wir den kundenrabatt
+    }
     map { $form->{"${_}_${i}"} = $form->parse_amount(\%myconfig, $form->{"${_}_${i}"}) if $form->{"${_}_${i}"} } qw(ship qty sellprice listprice basefactor);
   }
 
@@ -1002,7 +1004,7 @@ sub update_stock_in {
 
   foreach my $i (1..$form->{rowcount}) {
     $form->{"qty_$i"} = $form->parse_amount(\%myconfig, $form->{"qty_$i"});
-    push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) };
+    push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber bestbefore qty unit) };
   }
 
   display_stock_in_form($stock_info);
@@ -1031,6 +1033,8 @@ sub display_stock_in_form {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
+  $form->{jsscript} = 1;
+
   $form->{title} = $locale->text('Stock');
 
   my $part_info  = IC->get_basic_part_info('id' => $form->{parts_id});
@@ -1066,7 +1070,7 @@ sub set_stock_in {
 
     next if ($form->{"qty_$i"} <= 0);
 
-    push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber qty unit) };
+    push @{ $stock_info }, { map { $_ => $form->{"${_}_${i}"} } qw(warehouse_id bin_id chargenumber bestbefore qty unit) };
   }
 
   $form->{stock} = YAML::Dump($stock_info);
@@ -1105,7 +1109,8 @@ sub stock_out_form {
       foreach my $sinfo (@{ $stock_info }) {
         next if (($row->{bin_id}       != $sinfo->{bin_id}) ||
                  ($row->{warehouse_id} != $sinfo->{warehouse_id}) ||
-                 ($row->{chargenumber} ne $sinfo->{chargenumber}));
+                 ($row->{chargenumber} ne $sinfo->{chargenumber}) ||
+                 ($row->{bestbefore}   ne $sinfo->{bestbefore}));
 
         map { $row->{"stock_$_"} = $sinfo->{$_} } qw(qty unit error);
       }
@@ -1145,6 +1150,7 @@ sub set_stock_out {
       'warehouse_id' => $form->{"warehouse_id_$i"},
       'bin_id'       => $form->{"bin_id_$i"},
       'chargenumber' => $form->{"chargenumber_$i"},
+      'bestbefore'   => $form->{"bestbefore_$i"},
       'qty'          => $form->{"qty_$i"},
       'unit'         => $form->{"unit_$i"},
       'row'          => $i,
@@ -1264,7 +1270,7 @@ sub transfer_out {
         $request->{parts_id} = $form->{"id_$i"};
         $request->{base_qty} = $request->{qty} * $units->{$request->{unit}}->{factor} / $base_unit_factor;
 
-        my $map_key          = join '--', ($form->{"id_$i"}, @{$request}{qw(warehouse_id bin_id chargenumber)});
+        my $map_key          = join '--', ($form->{"id_$i"}, @{$request}{qw(warehouse_id bin_id chargenumber bestbefore)});
 
         $request_map{$map_key}                 ||= $request;
         $request_map{$map_key}->{sum_base_qty} ||= 0;
@@ -1290,7 +1296,7 @@ sub transfer_out {
       my @contents     = DO->get_item_availability('parts_id' => \@part_ids);
 
       foreach my $inv (@contents) {
-        my $map_key = join '--', @{$inv}{qw(parts_id warehouse_id bin_id chargenumber)};
+        my $map_key = join '--', @{$inv}{qw(parts_id warehouse_id bin_id chargenumber bestbefore)};
 
         next unless ($request_map{$map_key});
 
@@ -1304,12 +1310,26 @@ sub transfer_out {
         my $pinfo = $part_info_map{$request->{parts_id}};
         my $binfo = $bin_info_map{$request->{bin_id}};
 
-        push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, for the transfer of #5.",
-                                                 $pinfo->{description}, $binfo->{warehouse_description}, $binfo->{bin_description},
-                                                 $request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
-                                                 $form->format_amount_units('amount'      => $request->{sum_base_qty},
-                                                                            'part_unit'   => $pinfo->{unit},
-                                                                            'conv_units'  => 'convertible_not_smaller'));
+        if ($main::show_best_before) {
+            push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, #5, for the transfer of #6.",
+                                                     $pinfo->{description},
+                                                     $binfo->{warehouse_description},
+                                                     $binfo->{bin_description},
+                                                     $request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
+                                                     $request->{bestbefore} ? $locale->text('bestbefore #1', $request->{bestbefore}) : $locale->text('no bestbefore'),
+                                                     $form->format_amount_units('amount'      => $request->{sum_base_qty},
+                                                                                'part_unit'   => $pinfo->{unit},
+                                                                                'conv_units'  => 'convertible_not_smaller'));
+        } else {
+            push @{ $form->{ERRORS} }, $locale->text("There is not enough available of '#1' at warehouse '#2', bin '#3', #4, for the transfer of #5.",
+                                                     $pinfo->{description},
+                                                     $binfo->{warehouse_description},
+                                                     $binfo->{bin_description},
+                                                     $request->{chargenumber} ? $locale->text('chargenumber #1', $request->{chargenumber}) : $locale->text('no chargenumber'),
+                                                     $form->format_amount_units('amount'      => $request->{sum_base_qty},
+                                                                                'part_unit'   => $pinfo->{unit},
+                                                                                'conv_units'  => 'convertible_not_smaller'));
+        }
       }
     }