Revision 6416b3bb
Von Martin Helmling martin.helmling@octosoft.eu vor fast 8 Jahren hinzugefügt
| bin/mozilla/ic.pl | ||
|---|---|---|
| 84 | 84 |
$form->{lastsort} = ""; # memory for which table was sort at last time
|
| 85 | 85 |
$form->{ndxs_counter} = 0; # counter for added entries to top100
|
| 86 | 86 |
|
| 87 |
my %is_xyz = map { +"is_$_" => ($form->{searchitems} eq $_) } qw(part service assembly assortment);
|
|
| 87 |
# for seach all possibibilities, is_service only used as UNLESS so == 0 |
|
| 88 |
my %is_xyz = ("is_part" => 1, "is_service" => 0, "is_assembly" =>1 );
|
|
| 88 | 89 |
|
| 89 | 90 |
$form->{title} = (ucfirst $form->{searchitems}) . "s";
|
| 90 | 91 |
$form->{title} =~ s/ys$/ies/;
|
| 91 | 92 |
$form->{title} = $locale->text($form->{title});
|
| 92 |
$form->{title} = $locale->text('Assemblies') if ($is_xyz{is_assembly});
|
|
| 93 | 93 |
|
| 94 | 94 |
$form->{CUSTOM_VARIABLES} = CVar->get_configs('module' => 'IC');
|
| 95 | 95 |
($form->{CUSTOM_VARIABLES_FILTER_CODE},
|
| ... | ... | |
| 412 | 412 |
} |
| 413 | 413 |
$form->{"l_type_and_classific"} = "Y";
|
| 414 | 414 |
|
| 415 |
if ($form->{searchitems} eq 'service') {
|
|
| 415 |
if ($form->{l_service} && !$form->{l_assembly} && !$form->{l_part}) {
|
|
| 416 | 416 |
|
| 417 | 417 |
# remove bin, weight and rop from list |
| 418 | 418 |
map { $form->{"l_$_"} = "" } qw(bin weight rop);
|
| ... | ... | |
| 527 | 527 |
{ PART_CLASSIFICATIONS => SL::DB::Manager::PartClassification->get_all_sorted }),
|
| 528 | 528 |
'output_format' => 'HTML', |
| 529 | 529 |
'title' => $form->{title},
|
| 530 |
'attachment_basename' => $attachment_basenames{$form->{searchitems}} . strftime('_%Y%m%d', localtime time),
|
|
| 530 |
'attachment_basename' => 'article_list' . strftime('_%Y%m%d', localtime time),
|
|
| 531 | 531 |
); |
| 532 | 532 |
$report->set_options_from_form(); |
| 533 | 533 |
$locale->set_numberformat_wo_thousands_separator(\%myconfig) if lc($report->{options}->{output_format}) eq 'csv';
|
| ... | ... | |
| 650 | 650 |
(!$next_ref->{assemblyitem} && ($same_item ne $next_ref->{ $form->{sort} })))) {
|
| 651 | 651 |
my $row = { map { $_ => { 'class' => 'listsubtotal', } } @columns };
|
| 652 | 652 |
|
| 653 |
if (($form->{searchitems} ne 'assembly') || !$form->{bom}) {
|
|
| 653 |
if ( !$form->{l_assembly} || !$form->{bom}) {
|
|
| 654 | 654 |
$row->{soldtotal}->{data} = $form->format_amount(\%myconfig, $subtotals{soldtotal});
|
| 655 | 655 |
} |
| 656 | 656 |
|
Auch abrufbar als: Unified diff
Zusammengefasstes Listen von Ware,Erzeugnis,Dienstleistung und Sortimenten
Die Suchmaske für Ware,Erzeugnis,Dienstleistung und Sortiment gilt nun einheitlich für alle Artikeltypen,
deshalb wird nur noch eine Menueauswahl dazu angeboten