use SL::User;
use SL::AM;
+use SL::CVar;
use SL::CT;
use SL::IC;
use SL::WH;
use SL::OE;
+use SL::Locale::String qw(t8);
use SL::ReportGenerator;
+use SL::Presenter::Part;
use SL::DB::Part;
# $locale->text('return_material')
# $locale->text('release_material')
# $locale->text('assembled')
+# $locale->text('stocktaking')
# --------------------------------------------------------------------
# Transfer
my $content;
if ($form->{trans_type} eq 'removal') {
- $form->{nextsub} = "removal_parts_selection";
+ setup_wh_transfer_warehouse_selection_action_bar("removal_parts_selection");
$form->{title} = $locale->text('Removal from Warehouse');
$content = $form->parse_html_template('wh/warehouse_selection');
} elsif (!$form->{trans_type} || ($form->{trans_type} eq 'transfer')) {
- $form->{nextsub} = "transfer_parts_selection";
+ setup_wh_transfer_warehouse_selection_action_bar("transfer_parts_selection");
$form->{title} = $locale->text('Transfer');
$content = $form->parse_html_template('wh/warehouse_selection');
} elsif ($form->{trans_type} eq 'assembly') {
+ setup_wh_transfer_warehouse_selection_assembly_action_bar();
$form->{title} = $locale->text('Produce Assembly');
$content = $form->parse_html_template('wh/warehouse_selection_assembly');
}
transfer_or_removal_prepare_contents('direction' => 'transfer');
+ setup_wh_transfer_parts_action_bar();
+
$form->{title} = $locale->text('Transfer');
$form->header();
print $form->parse_html_template("wh/transfer_parts_selection");
transfer_or_removal_prepare_contents('direction' => 'out');
+ setup_wh_removal_parts_selection_action_bar();
+
$form->{title} = $locale->text('Removal');
$form->header();
print $form->parse_html_template("wh/removal_parts_selection");
show_no_warehouses_error() if (!scalar @{ $form->{WAREHOUSES} });
+ setup_wh_journal_action_bar();
+
$form->header();
print $form->parse_html_template("wh/journal_filter", { "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) });
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->{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->{trans_type} = $locale->text($entry->{trans_type});
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();
+
$form->header();
print $form->parse_html_template("wh/report_filter",
- { "nextsub" => "generate_report",
- "WAREHOUSES" => $form->{WAREHOUSES},
- "UNITS" => AM->unit_select_data(AM->retrieve_units(\%myconfig, $form)) });
+ { "WAREHOUSES" => $form->{WAREHOUSES},
+ "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();
}
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};
my %filter;
- my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit purchase_price stock_value);
+ my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price 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);
$form->{report_generator_output_format} = 'HTML' if !$form->{report_generator_output_format};
# manual paginating
- my $allrows = !!($form->{report_generator_output_format} ne 'HTML') ;
+ my $allrows = $form->{report_generator_output_format} eq 'HTML' ? $form->{allrows} : 1;
my $page = $::form->{page} || 1;
my $pages = {};
$pages->{per_page} = $::form->{per_page} || 20;
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);
- push @hidden_variables, qw(classification_id);
+ push @hidden_variables, qw(classification_id stock_value_basis allrows);
my %column_defs = (
'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
'qty' => { 'text' => $locale->text('Qty'), },
'partunit' => { 'text' => $locale->text('Unit'), },
'stock_value' => { 'text' => $locale->text('Stock value'), },
- 'purchase_price' => { 'text' => $locale->text('Purchase Price'), },
+ 'purchase_price' => { 'text' => $locale->text('Purchase price'), },
+ 'list_price' => { 'text' => $locale->text('List Price'), },
);
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;
- my %column_alignment = map { $_ => 'right' } qw(qty purchase_price stock_value);
+ my %column_alignment = map { $_ => 'right' } qw(qty list_price purchase_price stock_value);
map { $column_defs{$_}->{visible} = $form->{"l_${_}"} ? 1 : 0 } @columns;
'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;
foreach my $entry (@contents) {
- $entry->{type_and_classific} = $::request->presenter->type_abbreviation($entry->{part_type}).
- $::request->presenter->classification_abbreviation($entry->{classification_id});
+ $entry->{type_and_classific} = SL::Presenter::Part::type_abbreviation($entry->{part_type}).
+ SL::Presenter::Part::classification_abbreviation($entry->{classification_id});
map { $subtotals{$_} += $entry->{$_} } @subtotals_columns;
$total_stock_value += $entry->{stock_value} * 1;
$entry->{qty} = $form->format_amount(\%myconfig, $entry->{qty});
# '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);
+ $entry->{list_price} = $form->format_amount(\%myconfig, $entry->{list_price} * 1, 2);
my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
# '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);
+ $row->{list_price}->{data} = $form->format_amount(\%myconfig, $subtotals{list_price} * 1, 2);
%subtotals = map { $_ => 0 } @subtotals_columns;
call_sub($form->{stock_nextsub} || $form->{nextsub});
}
+sub setup_wh_transfer_warehouse_selection_action_bar {
+ my ($action) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Update'),
+ submit => [ '#form', { action => $action } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_wh_transfer_warehouse_selection_assembly_action_bar {
+ my ($action) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Update'),
+ submit => [ '#form', { action => 'transfer_assembly_update_part' } ],
+ accesskey => 'enter',
+ ],
+ action => [
+ t8('Produce'),
+ submit => [ '#form', { action => 'create_assembly' } ],
+ disabled => $::form->{parts_id} ? undef : $::locale->text('No assembly has been selected yet.'),
+ ],
+ );
+ }
+}
+
+sub setup_wh_transfer_parts_action_bar {
+ my ($action) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Transfer'),
+ submit => [ '#form', { action => 'transfer_parts' } ],
+ accesskey => 'enter',
+ ],
+ action => [
+ t8('Back'),
+ call => [ 'kivi.history_back' ],
+ ],
+ );
+ }
+}
+
+sub setup_wh_removal_parts_selection_action_bar {
+ my ($action) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Transfer out'),
+ submit => [ '#form', { action => 'remove_parts' } ],
+ accesskey => 'enter',
+ ],
+ action => [
+ t8('Back'),
+ call => [ 'kivi.history_back' ],
+ ],
+ );
+ }
+}
+
+sub setup_wh_report_action_bar {
+ my ($action) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Show'),
+ submit => [ '#form', { action => 'generate_report' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
+sub setup_wh_journal_action_bar {
+ my ($action) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Show'),
+ submit => [ '#form', { action => 'generate_journal' } ],
+ accesskey => 'enter',
+ ],
+ );
+ }
+}
+
1;
__END__
projects / kivitendo-erp.git / blobdiff