Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ce2e13e6

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID ce2e13e64bf9de995020cf18fd7ef36f199f018d
  • Vorgänger 690a3bac
  • Nachfolger db72c6eb

Fälschlicherweise gemergeten Code entfernt.

Unterschiede anzeigen:

bin/mozilla/do.pl
417 417 
  my @columns = qw(
418 418 
    transdate
419 419 
    id                      donumber
420 
    ordnumber               oreqnumber
420 
    ordnumber
421 421 
    name                    employee
422 422 
    shipvia                 globalprojectnumber
423 423 
    transaction_description
......
445 445 
    'id'                      => { 'text' => $locale->text('ID'), },
446 446 
    'donumber'                => { 'text' => $locale->text('Delivery Order'), },
447 447 
    'ordnumber'               => { 'text' => $locale->text('Order'), },
448 
    'oreqnumber'              => { 'text' => $locale->text('Order Request Number'), },
449 448 
    'name'                    => { 'text' => $form->{vc} eq 'customer' ? $locale->text('Customer') : $locale->text('Vendor'), },
450 449 
    'employee'                => { 'text' => $locale->text('Salesperson'), },
451 450 
    'shipvia'                 => { 'text' => $locale->text('Ship via'), },
......
455 454 
    'delivered'               => { 'text' => $locale->text('Delivered'), },
456 455 
  );
457 456 

  		




  458
  
  
    
  foreach my $name (qw(id transdate donumber ordnumber oreqnumber name employee shipvia)) {


  		




  
  457
  
    
  foreach my $name (qw(id transdate donumber ordnumber name employee shipvia)) {


  		




  459
  458
  
    
    $column_defs{$name}->{link} = $href . "&sort=$name";


  		




  460
  459
  
    
  }


  		




  461
  460
  
    

  		




  ......




  524
  523
  
    

  		




  525
  524
  
    
  my $edit_url       = build_std_url('action=edit', 'type', 'vc');


  		




  526
  525
  
    
  my $edit_order_url = build_std_url('script=oe.pl', 'type=' . ($form->{type} eq 'sales_delivery_order' ? 'sales_order' : 'purchase_order'), 'action=edit');


  		




  527
  
  
    
  my $edit_oreq_url  = build_std_url('script=pkoreq.pl', 'action=edit');


  		




  528
  526
  
    

  		




  529
  527
  
    
  foreach $dord (@{ $form->{DO} }) {


  		




  530
  528
  
    
    $dord->{open}      = $dord->{closed}    ? $locale->text('No')  : $locale->text('Yes');


  		




  ......




  532
  530
  
    

  		




  533
  531
  
    
    my $row = { map { $_ => { 'data' => $dord->{$_} } } @columns };


  		




  534
  532
  
    

  		




  535
  
  
    
    $row->{donumber}->{link}   = $edit_url       . "&id=" . E($dord->{id})      . "&callback=${callback}";


  		




  536
  
  
    
    $row->{ordnumber}->{link}  = $edit_order_url . "&id=" . E($dord->{oe_id})   . "&callback=${callback}";


  		




  537
  
  
    
    $row->{oreqnumber}->{link} = $edit_oreq_url  . "&id=" . E($dord->{oreq_id}) . "&callback=${callback}";


  		




  
  533
  
    
    $row->{donumber}->{link}  = $edit_url       . "&id=" . E($dord->{id})      . "&callback=${callback}";


  		




  
  534
  
    
    $row->{ordnumber}->{link} = $edit_order_url . "&id=" . E($dord->{oe_id})   . "&callback=${callback}";


  		




  538
  535
  
    

  		




  539
  536
  
    
    $report->add_data($row);


  		




  540
  537
  
    
  }


  		












Auch abrufbar als:  Unified diff