projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
wh.pl
diff --git
a/bin/mozilla/wh.pl
b/bin/mozilla/wh.pl
index
e33c2c2
..
0315bb9
100644
(file)
--- a/
bin/mozilla/wh.pl
+++ b/
bin/mozilla/wh.pl
@@
-86,7
+86,7
@@
sub transfer_warehouse_selection {
my $units = AM->retrieve_units(\%myconfig, $form);
# der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
my $units = AM->retrieve_units(\%myconfig, $form);
# der zweite Parameter von unit_select_data gibt den default-Namen (selected) vor
- $form->{UNITS} = AM->unit_select_data($units, $form->{
partunit}, 0, $form->{part
unit});
+ $form->{UNITS} = AM->unit_select_data($units, $form->{
unit}, 0, $form->{
unit});
if (scalar @{ $form->{WAREHOUSES} }) {
$form->{warehouse_id} ||= $form->{WAREHOUSES}->[0]->{id};
if (scalar @{ $form->{WAREHOUSES} }) {
$form->{warehouse_id} ||= $form->{WAREHOUSES}->[0]->{id};
@@
-176,7
+176,9
@@
sub transfer_or_removal_prepare_contents {
"ean" => $form->{ean},
"description" => $form->{description});
"ean" => $form->{ean},
"description" => $form->{description});
- $form->show_generic_error($locale->text("The selected warehouse is empty.")) if (0 == scalar(@contents));
+ 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."));
+ }
my $all_units = AM->retrieve_units(\%myconfig, $form);
my $all_units = AM->retrieve_units(\%myconfig, $form);
@@
-436,7
+438,7
@@
sub create_assembly {
$form->error($locale->text('The warehouse or the bin is missing.'));
}
$form->error($locale->text('The warehouse or the bin is missing.'));
}
- if (!$::
lx_office_conf{system}->{show_best_before}
) {
+ if (!$::
instance_conf->get_show_bestbefore
) {
$form->{bestbefore} = '';
}
$form->{bestbefore} = '';
}
@@
-792,8
+794,6
@@
sub report {
$form->{jsscript} = 1;
$form->{jsscript} = 1;
-# $form->{fokus} = "partnumber";
-# $form->{onload} .= "focus();";
$form->{title} = $locale->text("Report about warehouse contents");
$form->header();
$form->{title} = $locale->text("Report about warehouse contents");
$form->header();
@@
-822,7
+822,7
@@
sub generate_report {
my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value);
# filter stuff
my @columns = qw(warehousedescription bindescription partnumber partdescription chargenumber bestbefore qty stock_value);
# filter stuff
- map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore);
+ map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id partnumber description chargenumber bestbefore
date include_invalid_warehouses
);
$filter{qty_op} = WH->convert_qty_op($form->{qty_op});
if ($filter{qty_op}) {
$filter{qty_op} = WH->convert_qty_op($form->{qty_op});
if ($filter{qty_op}) {
@@
-840,7
+840,7
@@
sub generate_report {
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit l_warehousedescription l_bindescription);
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, qw(warehouse_id bin_id partnumber description chargenumber bestbefore qty_op qty qty_unit l_warehousedescription l_bindescription);
- push @hidden_variables, qw(include_empty_bins subtotal);
+ push @hidden_variables, qw(include_empty_bins subtotal
include_invalid_warehouses
);
my %column_defs = (
'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
my %column_defs = (
'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
@@
-894,7
+894,7
@@
sub generate_report {
my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
my $row_set = [ { map { $_ => { 'data' => $entry->{$_}, 'align' => $column_alignment{$_} } } @columns } ];
- if (
($form->{subtotal} eq 'Y'
)
+ if (
($form->{subtotal} eq 'Y' && !$form->{report_generator_csv_options_for_import}
)
&& (($idx == (scalar @contents - 1))
|| ($entry->{$sort_col} ne $contents[$idx + 1]->{$sort_col}))) {
&& (($idx == (scalar @contents - 1))
|| ($entry->{$sort_col} ne $contents[$idx + 1]->{$sort_col}))) {
@@
-914,7
+914,7
@@
sub generate_report {
$idx++;
}
$idx++;
}
- if (
$column_defs{stock_value}->{visible}
) {
+ if (
$column_defs{stock_value}->{visible} && !$form->{report_generator_csv_options_for_import}
) {
$report->add_separator();
my $row = { map { $_ => { 'data' => '', 'class' => 'listsubtotal', } } @columns };
$report->add_separator();
my $row = { map { $_ => { 'data' => '', 'class' => 'listsubtotal', } } @columns };