X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fwh.pl;h=06d5f8b2325136c187d1e471b05dce0a2c3fbfbe;hb=8453789b;hp=8c5e5f2d22a7831d1dc627b95618e33db98842e5;hpb=989d69a85d92cbea4a81d4564adc36cd98a4dfe0;p=kivitendo-erp.git diff --git a/bin/mozilla/wh.pl b/bin/mozilla/wh.pl index 8c5e5f2d2..06d5f8b23 100644 --- a/bin/mozilla/wh.pl +++ b/bin/mozilla/wh.pl @@ -39,12 +39,16 @@ use SL::Form; use SL::User; use SL::AM; +use SL::CVar; use SL::CT; +use SL::Helper::Flash qw(flash_later); use SL::IC; use SL::WH; use SL::OE; +# use SL::Helper::Inventory qw(produce_assembly); use SL::Locale::String qw(t8); use SL::ReportGenerator; +use SL::Presenter::Tag qw(checkbox_tag); use SL::Presenter::Part; use SL::DB::Part; @@ -546,6 +550,31 @@ sub remove_parts { $main::lxdebug->leave_sub(); } +sub disassemble_assembly { + $main::lxdebug->enter_sub(); + + $main::auth->assert('warehouse_management'); + + my $form = $main::form; + + croak("No assembly ids") unless scalar @{ $form->{ids}} > 0; + + # everything in one transaction + my $db = SL::DB::Inventory->new->db; + $db->with_transaction(sub { + + foreach my $trans_id (@{ $::form->{ids}} ) { + SL::DB::Manager::Inventory->delete_all(where => [ trans_id => $trans_id ]); + flash_later('info', t8("Disassembly successful for trans_id #1", $trans_id)); + } + + 1; + }) || die t8('error while disassembling for trans_ids #1 : #2', $form->{ids}) . $db->error . "\n"; + + $main::lxdebug->leave_sub(); + $form->redirect; +} + # -------------------------------------------------------------------- # Journal # -------------------------------------------------------------------- @@ -582,13 +611,14 @@ sub generate_journal { my %myconfig = %main::myconfig; my $locale = $main::locale; + setup_wh_journal_list_all_action_bar(); $form->{title} = $locale->text("WHJournal"); $form->{sort} ||= 'date'; $form->{report_generator_output_format} = 'HTML' if !$form->{report_generator_output_format}; my %filter; - 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); + my @columns = qw(ids 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 transtype_id transtype_ids comment projectnumber); @@ -620,7 +650,10 @@ sub generate_journal { $last_nr = $pages->{per_page}; } + my $old_l_trans_id = $form->{l_trans_id}; my @contents = WH->get_warehouse_journal(%filter); + $form->{l_trans_id} = $old_l_trans_id; + # get maxcount if (!$form->{maxrows}) { $form->{maxrows} = scalar @contents ; @@ -633,6 +666,7 @@ sub generate_journal { push @hidden_variables, qw(classification_id); my %column_defs = ( + 'ids' => { raw_header_data => checkbox_tag("", id => "check_all", checkall => "[data-checkall=1]") }, 'date' => { 'text' => $locale->text('Date'), }, 'trans_id' => { 'text' => $locale->text('Trans Id'), }, 'trans_type' => { 'text' => $locale->text('Trans Type'), }, @@ -673,6 +707,7 @@ sub generate_journal { $column_defs{partunit}->{visible} = 1; $column_defs{type_and_classific}->{visible} = 1; $column_defs{type_and_classific}->{link} =''; + $column_defs{ids}->{visible} = 1; $report->set_columns(%column_defs); $report->set_column_order(@columns); @@ -700,13 +735,13 @@ sub generate_journal { ); my $idx = 0; - + my $undo_date = DateTime->today->subtract(days => $::instance_conf->get_undo_transfer_interval); foreach my $entry (@contents) { $entry->{type_and_classific} = SL::Presenter::Part::type_abbreviation($entry->{part_type}) . SL::Presenter::Part::classification_abbreviation($entry->{classification_id}); $entry->{qty} = $form->format_amount(\%myconfig, $entry->{qty}); + $entry->{assembled} = $entry->{trans_type} eq 'assembled' ? 1 : ''; $entry->{trans_type} = $locale->text($entry->{trans_type}); - my $row = { }; foreach my $column (@columns) { @@ -716,8 +751,14 @@ sub generate_journal { }; } + if ($entry->{assembled}) { + my $insertdate = DateTime->from_kivitendo($entry->{shippingdate}); + if (ref $undo_date eq 'DateTime' && ref $insertdate eq 'DateTime') { + my $undo_assembly = DateTime->compare($insertdate, $undo_date) == 1 ? 1 : 0; + $row->{ids}->{raw_data} = checkbox_tag("ids[]", value => $entry->{trans_id}, "data-checkall" => 1) if $undo_assembly; + } + } $row->{trans_type}->{raw_data} = $entry->{trans_type}; - if ($form->{l_oe_id}) { $row->{oe_id}->{data} = ''; my $info = $entry->{oe_id_info}; @@ -734,12 +775,17 @@ sub generate_journal { $idx++; } + + $report->set_options( + raw_top_info_text => $form->parse_html_template('wh/report_top'), + raw_bottom_info_text => $form->parse_html_template('wh/report_bottom', { callback => $href }), + ); 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', + $report->set_options('raw_bottom_info_text' => $form->parse_html_template('wh/report_bottom', { callback => $href }) . $form->parse_html_template('common/paginate', { 'pages' => $pages , 'base_url' => $href.'&sort='.$form->{sort}.'&order='.$form->{order}}) ); } $report->generate_with_headers(); @@ -765,6 +811,9 @@ sub report { show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} }); + my $CVAR_CONFIGS = SL::DB::Manager::CustomVariableConfig->get_all_sorted(where => [ module => 'IC' ]); + my $INCLUDABLE_CVAR_CONFIGS = [ grep { $_->includeable } @{ $CVAR_CONFIGS } ]; + $form->{title} = $locale->text("Report about warehouse contents"); setup_wh_report_action_bar(); @@ -772,7 +821,10 @@ sub report { $form->header(); print $form->parse_html_template("wh/report_filter", { "WAREHOUSES" => $form->{WAREHOUSES}, - "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) }); + "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)), + # "CVAR_CONFIGS" => $CVAR_CONFIGS, # nyi searchable cvars + "INCLUDABLE_CVAR_CONFIGS" => $INCLUDABLE_CVAR_CONFIGS, + }); $main::lxdebug->leave_sub(); } @@ -786,6 +838,8 @@ sub generate_report { my %myconfig = %main::myconfig; my $locale = $main::locale; + my $cvar_configs = CVar->get_configs('module' => 'IC'); + $form->{title} = $locale->text("Report about warehouse contents"); $form->{sort} ||= 'partnumber'; my $sort_col = $form->{sort}; @@ -861,6 +915,9 @@ sub generate_report { my $report = SL::ReportGenerator->new(\%myconfig, $form); + my @includeable_custom_variables = grep { $_->{includeable} } @{ $cvar_configs }; + push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables; + my @hidden_variables = map { "l_${_}" } @columns; push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description chargenumber bestbefore qty_op qty qty_unit partunit l_warehousedescription l_bindescription); push @hidden_variables, qw(include_empty_bins subtotal include_invalid_warehouses date); @@ -883,6 +940,8 @@ sub generate_report { my $href = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables); $href .= "&maxrows=".$form->{maxrows}; + my %column_defs_cvars = map { +"cvar_$_->{name}" => { 'text' => $_->{description} } } @includeable_custom_variables; + %column_defs = (%column_defs, %column_defs_cvars); map { $column_defs{$_}->{link} = $href . "&page=".$page."&sort=${_}&order=" . Q($_ eq $sort_col ? 1 - $form->{order} : $form->{order}) } @columns; @@ -907,6 +966,11 @@ sub generate_report { 'attachment_basename' => strftime($locale->text('warehouse_report_list') . '_%Y%m%d', localtime time)); $report->set_options_from_form(); $locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv'; + CVar->add_custom_variables_to_report('module' => 'IC', + 'trans_id_field' => 'parts_id', + 'configs' => $cvar_configs, + 'column_defs' => \%column_defs, + 'data' => \@contents); my $all_units = AM->retrieve_units(\%myconfig, $form); my $idx = 0; @@ -1171,6 +1235,22 @@ sub setup_wh_journal_action_bar { ); } } +sub setup_wh_journal_list_all_action_bar { + my ($action) = @_; + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + combobox => [ + action => [ t8('Actions') ], + action => [ + t8('Disassemble Assembly'), + submit => [ '#form', { action => 'disassemble_assembly' } ], + checks => [ [ 'kivi.check_if_entries_selected', '[name="ids[]"]' ] ], + ], + ], + ); + } +} + 1;