Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a33ef0ec

Von Jan Büren vor fast 7 Jahren hinzugefügt

  • ID a33ef0ec2f31a94dd1e87384eaf41a2f7b25385f
  • Vorgänger a051b91b
  • Nachfolger 87d5463d

Artikelbericht (IC.pm): Standardlager und Standardlagerplatz optional anzeigen

Unterschiede anzeigen:

bin/mozilla/ic.pl
167 167
  $form->{title} = $locale->text('Articles');
168 168

  
169 169
  my %column_defs = (
170
    'bin'                => { 'text' => $locale->text('Bin'), },
171 170
    'deliverydate'       => { 'text' => $locale->text('deliverydate'), },
172 171
    'description'        => { 'text' => $locale->text('Part Description'), },
173 172
    'notes'              => { 'text' => $locale->text('Notes'), },
......
201 200
    'type_and_classific' => { 'text' => $locale->text('Type'), },
202 201
    'projectnumber'      => { 'text' => $locale->text('Project Number'), },
203 202
    'projectdescription' => { 'text' => $locale->text('Project Description'), },
203
    'warehouse'          => { 'text' => $locale->text('Default Warehouse'), },
204
    'bin'                => { 'text' => $locale->text('Default Bin'), },
204 205
  );
205 206

  
206 207
  $revers     = $form->{revers};
......
327 328

  
328 329
  if ($form->{l_service} && !$form->{l_assembly} && !$form->{l_part}) {
329 330

  
330
    # remove bin, weight and rop from list
331
    map { $form->{"l_$_"} = "" } qw(bin weight rop);
331
    # remove warehouse, bin, weight and rop from list
332
    map { $form->{"l_$_"} = "" } qw(bin weight rop warehouse);
332 333

  
333 334
    $form->{l_onhand} = "";
334 335

  
......
364 365

  
365 366
    flash('warning', $::locale->text('Soldtotal does not make sense without any bsooqr options'));
366 367
  }
368
  if ($form->{l_soldtotal} && ($form->{l_warehouse} || $form->{l_bin})) {
369
    delete $form->{"l_$_"} for  qw(bin warehouse);
370
    flash('warning', $::locale->text('Sorry, I am too stupid to figure out the default warehouse/bin and the sold qty. I drop the default warehouse/bin option.'));
371
  }
367 372
  if ($form->{l_name} && !$bsooqr_mode) {
368 373
    delete $form->{l_name};
369 374

  
......
372 377
  IC->all_parts(\%myconfig, \%$form);
373 378

  
374 379
  my @columns = qw(
375
    partnumber type_and_classific description notes partsgroup bin onhand rop soldtotal unit listprice
380
    partnumber type_and_classific description notes partsgroup warehouse bin
381
    onhand rop soldtotal unit listprice
376 382
    linetotallistprice sellprice linetotalsellprice lastcost linetotallastcost
377 383
    priceupdate weight image drawing microfiche invnumber ordnumber quonumber
378 384
    transdate name serialnumber deliverydate ean projectnumber projectdescription
......
416 422
  my $callback         = build_std_url('action=generate_report', grep { $form->{$_} } @hidden_variables);
417 423

  
418 424
  my @sort_full        = qw(partnumber description onhand soldtotal deliverydate insertdate shop);
419
  my @sort_no_revers   = qw(partsgroup bin priceupdate invnumber ordnumber quonumber name image drawing serialnumber);
425
  my @sort_no_revers   = qw(partsgroup priceupdate invnumber ordnumber quonumber name image drawing serialnumber);
420 426

  
421 427
  foreach my $col (@sort_full) {
422 428
    $column_defs{$col}->{link} = join '&', $callback, "sort=$col", map { "$_=" . E($form->{$_}) } qw(revers lastsort);

Auch abrufbar als: Unified diff