X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fwh.pl;h=50bed75ce99928cc178b51ea083479e0c3fde2e1;hb=baf226d0b65e64f9475dea46b35d88d52fed1cc6;hp=8b69306bb5e8690867779fed15b1038a03da8ff0;hpb=a8459f498a58bdabcd87bcdf1cd08e9f5726abe4;p=kivitendo-erp.git

diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl
index 8b69306bb..50bed75ce 100644
--- a/bin/mozilla/wh.pl
+++ b/bin/mozilla/wh.pl
@@ -112,10 +112,6 @@ sub transfer_warehouse_selection {
     $form->{title}   = $locale->text('Removal from Warehouse');
     $content         = $form->parse_html_template('wh/warehouse_selection');
 
-  } elsif ($form->{trans_type} eq 'stock') {
-    $form->{title} = $locale->text('Stock');
-    $content       = $form->parse_html_template('wh/warehouse_selection_stock');
-
   } elsif (!$form->{trans_type} || ($form->{trans_type} eq 'transfer')) {
     $form->{nextsub} = "transfer_parts_selection";
     $form->{title}   = $locale->text('Transfer');
@@ -182,9 +178,8 @@ sub transfer_or_removal_prepare_contents {
                                            "bin_id"       => $form->{bin_id},
                                            "chargenumber" => $form->{chargenumber},
                                            "bestbefore"   => $form->{bestbefore},
-                                           "partnumber"   => $form->{partnumber},
-                                           "ean"          => $form->{ean},
-                                           "description"  => $form->{description});
+                                           "partsid"      => $form->{part_id},
+                                           "ean"          => $form->{ean});
 
   if (0 == scalar(@contents)) {
     $form->show_generic_error($locale->text("The selected warehouse is empty, or no stocked items where found that match the filter settings."));
@@ -308,46 +303,6 @@ sub transfer_parts {
 # Transfer: stock
 # --------------------------------------------------------------------
 
-sub transfer_stock_update_part {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{trans_type} = 'stock';
-  $form->{qty}        = $form->parse_amount(\%myconfig, $form->{qty});
-
-  if (!$form->{partnumber} && !$form->{description} && !$form->{ean}) {
-    delete @{$form}{qw(parts_id partunit ean)};
-    transfer_warehouse_selection();
-
-  } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description} || $form->{ean}) {
-
-#    $form->{no_services}   = 1; # services may now be transfered. fix for Bug 1383.
-    $form->{no_assemblies} = 0; # assemblies duerfen eingelagert werden (z.B. bei retouren)
-
-    my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
-
-    if (!scalar @{ $parts }) {
-      new_item(action => "transfer_stock_update_part");
-    } elsif (scalar @{ $parts } == 1) {
-      @{$form}{qw(parts_id partnumber description ean warehouse_id bin_id)} = @{$parts->[0]}{qw(id partnumber description ean warehouse_id bin_id)};
-      transfer_stock_get_partunit();
-      transfer_warehouse_selection();
-
-    } else {
-      select_part('transfer_stock_part_selected', @{ $parts });
-    }
-
-  } else {
-    transfer_stock_get_partunit();
-    transfer_warehouse_selection();
-  }
-
-  $main::lxdebug->leave_sub();
-}
-
 # --------------------------------------------------------------------
 # Transfer: assemblies
 # Dies ist die Auswahlmaske für ein assembly.
@@ -357,8 +312,6 @@ sub transfer_stock_update_part {
 # --------------------------------------------------------------------
 
 sub transfer_assembly_update_part {
-  $main::lxdebug->enter_sub();
-
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
@@ -366,30 +319,18 @@ sub transfer_assembly_update_part {
   $form->{trans_type} = 'assembly';
   $form->{qty}        = $form->parse_amount(\%myconfig, $form->{qty});
 
-  if (!$form->{partnumber} && !$form->{description}) {
-    delete @{$form}{qw(parts_id partunit)};
+  if (!$form->{parts_id}) {
+    delete $form->{partunit};
     transfer_warehouse_selection();
+    return;
 
-  } elsif (($form->{partnumber} && ($form->{partnumber} ne $form->{old_partnumber})) || $form->{description}) {
-    $form->{assemblies} = 1;
-    $form->{no_assemblies} = 0;
-    my $parts = Common->retrieve_parts(\%myconfig, $form, 'description', 1);
-    if (scalar @{ $parts } == 1) {
-      @{$form}{qw(parts_id partnumber description)} = @{$parts->[0]}{qw(id partnumber description)};
-      transfer_stock_get_partunit();
-      transfer_warehouse_selection();
-    } else {
-      select_part('transfer_stock_part_selected', @{ $parts });
-    }
-
-  } else {
-    transfer_stock_get_partunit();
-    transfer_warehouse_selection();
   }
 
-# hier die oben benannte idee
-#    my $maxcreate = Common->check_assembly_max_create(assembly_id => $form->{parts_id}, dbh => $my_dbh);
-  $main::lxdebug->leave_sub();
+  my $part = SL::DB::Part->new(id => $::form->{parts_id})->load;
+  @{$form}{qw(parts_id partnumber description)} = ($part->id, $part->partnumber, $part->description);
+
+  transfer_stock_get_partunit();
+  transfer_warehouse_selection();
 }
 
 sub transfer_stock_part_selected {
@@ -486,47 +427,6 @@ sub create_assembly {
   $main::lxdebug->leave_sub();
 }
 
-sub transfer_stock {
-  $main::lxdebug->enter_sub();
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-
-  $form->{qty} = $form->parse_amount(\%myconfig, $form->{qty});
-
-  if ($form->{qty} <= 0) {
-    $form->show_generic_error($locale->text('Invalid quantity.'));
-  }
-
-  if (!$form->{warehouse_id} || !$form->{bin_id}) {
-    $form->error($locale->text('The warehouse or the bin is missing.'));
-  }
-
-  my $transfer = {
-    'transfer_type'    => 'stock',
-    'dst_warehouse_id' => $form->{warehouse_id},
-    'dst_bin_id'       => $form->{bin_id},
-    'chargenumber'     => $form->{chargenumber},
-    'bestbefore'       => $form->{bestbefore},
-    'parts_id'         => $form->{parts_id},
-    'qty'              => $form->{qty},
-    'unit'             => $form->{unit},
-    'comment'          => $form->{comment},
-  };
-
-  WH->transfer($transfer);
-
-  delete @{$form}{qw(parts_id partnumber description qty unit chargenumber bestbefore comment ean)};
-
-  $form->{saved_message} = $locale->text('The parts have been stocked.');
-  $form->{trans_type}    = 'stock';
-
-  transfer_warehouse_selection();
-
-  $main::lxdebug->leave_sub();
-}
-
 # --------------------------------------------------------------------
 # Transfer: removal
 # --------------------------------------------------------------------
@@ -681,7 +581,7 @@ sub generate_journal {
   my @columns = qw(trans_id date warehouse_from bin_from warehouse_to bin_to partnumber type_and_classific partdescription chargenumber bestbefore trans_type comment qty unit partunit employee oe_id projectnumber);
 
   # filter stuff
-  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id classification_id partnumber description chargenumber bestbefore);
+  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id classification_id partnumber description chargenumber bestbefore transtype_id transtype_ids comment projectnumber);
 
   $filter{qty_op} = WH->convert_qty_op($form->{qty_op});
   if ($filter{qty_op}) {
@@ -693,10 +593,33 @@ sub generate_journal {
   }
   # /filter stuff
 
+  my $allrows        = !!($form->{report_generator_output_format} ne 'HTML') ;
+
+  # manual paginating
+  my $pages          = {};
+  my $page           = $::form->{page} || 1;
+  $pages->{per_page} = $::form->{per_page} || 15;
+  my $first_nr       = ($page - 1) * $pages->{per_page};
+  my $last_nr        = $first_nr + $pages->{per_page};
+
+  # no optimisation if qty op
+  if ( !$allrows && $form->{maxrows} && !$filter{qty_op}) {
+    $filter{limit}  = $pages->{per_page};
+    $filter{offset} = ($page - 1) * $pages->{per_page};
+    $first_nr       = 0;
+    $last_nr        = $pages->{per_page};
+  }
+
+  my @contents  = WH->get_warehouse_journal(%filter);
+  # get maxcount
+  if (!$form->{maxrows}) {
+    $form->{maxrows} = scalar @contents ;
+  }
+
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;
-  push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit fromdate todate);
+  push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit unit partunit fromdate todate transtype_ids comment projectnumber);
   push @hidden_variables, qw(classification_id);
 
   my %column_defs = (
@@ -722,13 +645,22 @@ sub generate_journal {
     'oe_id'           => { 'text' => $locale->text('Document'), },
   );
 
+  if ($form->{transtype_ids} && 'ARRAY' eq ref $form->{transtype_ids}) {
+    for (my $i = 0; $i < scalar(@{ $form->{transtype_ids} }); $i++) {
+      delete $form->{transtype_ids}[$i] if $form->{transtype_ids}[$i] eq '';
+    }
+    $form->{transtype_ids} = join(",", @{ $form->{transtype_ids} });
+  }
+
   my $href = build_std_url('action=generate_journal', grep { $form->{$_} } @hidden_variables);
-  my $page = $::form->{page} || 1;
+  $href .= "&maxrows=".$form->{maxrows};
+
   map { $column_defs{$_}->{link} = $href ."&page=".$page. "&sort=${_}&order=" . Q($_ eq $form->{sort} ? 1 - $form->{order} : $form->{order}) } @columns;
 
   my %column_alignment = map { $_ => 'right' } qw(qty);
 
   map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
+  $column_defs{partunit}->{visible} = 1;
   $column_defs{type_and_classific}->{visible} = 1;
   $column_defs{type_and_classific}->{link} ='';
 
@@ -746,7 +678,6 @@ sub generate_journal {
   $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);
-  my @contents  = WH->get_warehouse_journal(%filter);
 
   my %doc_types = ( 'sales_quotation'         => { script => 'oe', title => $locale->text('Sales quotation') },
                     'sales_order'             => { script => 'oe', title => $locale->text('Sales Order') },
@@ -758,22 +689,12 @@ sub generate_journal {
                     'purchase_invoice'        => { script => 'ir', title => $locale->text('Purchase Invoice') },
                   );
 
-  my $allrows = 0;
-  $allrows = 1 if $form->{report_generator_output_format} ne 'HTML' ;
-
-  # manual paginating
-  my $pages = {};
-  $pages->{per_page}        = $::form->{per_page} || 15;
-  my $first_nr = ($page - 1) * $pages->{per_page};
-  my $last_nr  = $first_nr + $pages->{per_page};
   my $idx       = 0;
 
   foreach my $entry (@contents) {
     $entry->{type_and_classific} = $::request->presenter->type_abbreviation($entry->{part_type}).
                                    $::request->presenter->classification_abbreviation($entry->{classification_id});
-    $entry->{qty}        = $form->format_amount_units('amount'     => $entry->{qty},
-                                                      'part_unit'  => $entry->{partunit},
-                                                      'conv_units' => 'convertible');
+    $entry->{qty}        = $form->format_amount(\%myconfig, $entry->{qty});
     $entry->{trans_type} = $locale->text($entry->{trans_type});
 
     my $row = { };
@@ -798,18 +719,18 @@ sub generate_journal {
     }
 
     if ( $allrows || ($idx >= $first_nr && $idx < $last_nr )) {
-       $report->add_data($row);
+      $report->add_data($row);
     }
     $idx++;
   }
 
   if ( ! $allrows ) {
-      $pages->{max}  = SL::DB::Helper::Paginated::ceil($idx, $pages->{per_page}) || 1;
+      $pages->{max}  = SL::DB::Helper::Paginated::ceil($form->{maxrows}, $pages->{per_page}) || 1;
       $pages->{page} = $page < 1 ? 1: $page > $pages->{max} ? $pages->{max}: $page;
       $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{page}, $pages->{max}) } ];
 
       $report->set_options('raw_bottom_info_text' => $form->parse_html_template('common/paginate',
-                                                            { 'pages' => $pages , 'base_url' => $href}) );
+                                                            { 'pages' => $pages , 'base_url' => $href.'&sort='.$form->{sort}.'&order='.$form->{order}}) );
   }
   $report->generate_with_headers();
 
@@ -856,11 +777,10 @@ sub generate_report {
 
   $form->{title}   = $locale->text("Report about warehouse contents");
   $form->{sort}  ||= 'partnumber';
-  $form->{sort}  ||= 'partunit';
   my $sort_col     = $form->{sort};
 
   my %filter;
-  my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit stock_value);
+  my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit  purchase_price stock_value);
 
   # filter stuff
   map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id classification_id partnumber description chargenumber bestbefore date include_invalid_warehouses);
@@ -901,9 +821,33 @@ sub generate_report {
   }
   # /filter stuff
 
+  $form->{report_generator_output_format} = 'HTML' if !$form->{report_generator_output_format};
+
+  # manual paginating
+  my $allrows        = !!($form->{report_generator_output_format} ne 'HTML') ;
+  my $page           = $::form->{page} || 1;
+  my $pages          = {};
+  $pages->{per_page} = $::form->{per_page} || 20;
+  my $first_nr       = ($page - 1) * $pages->{per_page};
+  my $last_nr        = $first_nr + $pages->{per_page};
+
+  # no optimisation if qty op
+  if ( !$allrows && $form->{maxrows} && !$filter{qty_op}) {
+    $filter{limit}  = $pages->{per_page};
+    $filter{offset} = ($page - 1) * $pages->{per_page};
+    $first_nr       = 0;
+    $last_nr        = $pages->{per_page};
+  }
+
+  my @contents  = WH->get_warehouse_report(%filter);
+
+  # get maxcount
+  if (!$form->{maxrows}) {
+    $form->{maxrows} = scalar @contents ;
+  }
+
   $form->{subtotal} = '' if (!first { $_ eq $sort_col } qw(partnumber partdescription));
 
-  $form->{report_generator_output_format} = 'HTML' if !$form->{report_generator_output_format};
   my $report = SL::ReportGenerator->new(\%myconfig, $form);
 
   my @hidden_variables = map { "l_${_}" } @columns;
@@ -922,16 +866,19 @@ sub generate_report {
     'qty'                  => { 'text' => $locale->text('Qty'), },
     'partunit'             => { 'text' => $locale->text('Unit'), },
     'stock_value'          => { 'text' => $locale->text('Stock value'), },
+    'purchase_price'       => { 'text' => $locale->text('Purchase Price'), },
   );
 
   my $href = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
-  my $page = $::form->{page} || 1;
+  $href .= "&maxrows=".$form->{maxrows};
+
   map { $column_defs{$_}->{link} = $href . "&page=".$page."&sort=${_}&order=" . Q($_ eq $sort_col ? 1 - $form->{order} : $form->{order}) } @columns;
 
-  my %column_alignment = map { $_ => 'right' } qw(qty stock_value);
+  my %column_alignment = map { $_ => 'right' } qw(qty purchase_price stock_value);
 
   map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
 
+  $column_defs{partunit}->{visible}           = 1;
   $column_defs{type_and_classific}->{visible} = 1;
   $column_defs{type_and_classific}->{link} ='';
 
@@ -950,8 +897,6 @@ sub generate_report {
   $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
 
   my $all_units = AM->retrieve_units(\%myconfig, $form);
-  my @contents  = WH->get_warehouse_report(%filter);
-
   my $idx       = 0;
 
   my @subtotals_columns = qw(qty stock_value);
@@ -959,15 +904,6 @@ sub generate_report {
 
   my $total_stock_value = 0;
 
-  my $allrows = 0;
-  $allrows = 1 if $form->{report_generator_output_format} ne 'HTML' ;
-
-  # manual paginating
-  my $pages = {};
-  $pages->{per_page}        = $::form->{per_page} || 20;
-  my $first_nr = ($page - 1) * $pages->{per_page};
-  my $last_nr  = $first_nr + $pages->{per_page};
-
   foreach my $entry (@contents) {
 
     $entry->{type_and_classific} = $::request->presenter->type_abbreviation($entry->{part_type}).
@@ -979,6 +915,7 @@ sub generate_report {
 #                                                       'part_unit'  => $entry->{partunit},
 #                                                       'conv_units' => 'convertible');
     $entry->{stock_value} = $form->format_amount(\%myconfig, $entry->{stock_value} * 1, 2);
+    $entry->{purchase_price} = $form->format_amount(\%myconfig, $entry->{purchase_price} * 1, 2);
 
     my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
 
@@ -992,6 +929,7 @@ sub generate_report {
 #                                                               'part_unit'  => $entry->{partunit},
 #                                                               'conv_units' => 'convertible');
       $row->{stock_value}->{data} = $form->format_amount(\%myconfig, $subtotals{stock_value} * 1, 2);
+      $row->{purchase_price}->{data} = $form->format_amount(\%myconfig, $subtotals{purchase_price} * 1, 2);
 
       %subtotals                  = map { $_ => 0 } @subtotals_columns;
 
@@ -999,7 +937,7 @@ sub generate_report {
     }
 
     if ( $allrows || ($idx >= $first_nr && $idx < $last_nr )) {
-      $report->add_data($row_set);
+        $report->add_data($row_set);
     }
     $idx++;
   }
@@ -1017,6 +955,14 @@ sub generate_report {
 
     $report->add_data($row);
   }
+  if ( ! $allrows ) {
+    $pages->{max}  = SL::DB::Helper::Paginated::ceil($form->{maxrows}, $pages->{per_page}) || 1;
+    $pages->{page} = $page < 1 ? 1: $page > $pages->{max} ? $pages->{max}: $page;
+    $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{page}, $pages->{max}) } ];
+
+    $report->set_options('raw_bottom_info_text' => $form->parse_html_template('common/paginate',
+                                                                              {'pages' => $pages , 'base_url' => $href}) );
+  }
 
   $report->generate_with_headers();