Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision d93709bd

Von Bernd Bleßmann vor mehr als 9 Jahren hinzugefügt

  • ID d93709bdf3f56b275ae120d8a0205e666bc62b9c
  • Vorgänger 0e4da157
  • Nachfolger 32e816b5

Filtern nach Kunden-/Lieferantentyp bei Lieferschein-Berichten.

Conflicts:

bin/mozilla/do.pl

Unterschiede anzeigen:

SL/DO.pm
67 67 
  my $query =
68 68 
    qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.cusordnumber,
69 69 
         dord.transdate, dord.reqdate,
70 
         ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id,
70 
         ct.${vc}number, ct.name, ct.business_id,
71 
         dord.${vc}_id, dord.globalproject_id,
71 72 
         dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
72 73 
         dord.transaction_description, dord.itime::DATE AS insertdate,
73 74 
         pr.projectnumber AS globalprojectnumber,
......
98 99 
    push @values, conv_i($form->{project_id}), conv_i($form->{project_id});
99 100 
  }
100 101 

  		




  
  102
  
    
  if ($form->{"business_id"}) {


  		




  
  103
  
    
    push @where,  qq|ct.business_id = ?|;


  		




  
  104
  
    
    push @values, conv_i($form->{"business_id"});


  		




  
  105
  
    
  }


  		




  
  106
  
    

  		




  101
  107
  
    
  if ($form->{"${vc}_id"}) {


  		




  102
  108
  
    
    push @where,  qq|dord.${vc}_id = ?|;


  		




  103
  109
  
    
    push @values, $form->{"${vc}_id"};


  		












  

    
      bin/mozilla/do.pl
    
  





  492
  492
  
    

  		




  493
  493
  
    
  $form->{vc} = $form->{type} eq 'purchase_delivery_order' ? 'vendor' : 'customer';


  		




  494
  494
  
    

  		




  495
  
  
    
  $form->get_lists("projects"     => { "key" => "ALL_PROJECTS",


  		




  496
  
  
    
                                       "all" => 1 },


  		




  497
  
  
    
                   "departments"  => "ALL_DEPARTMENTS",


  		




  498
  
  
    
                   "$form->{vc}s" => "ALL_VC");


  		




  
  495
  
    
  $form->get_lists("projects"       => { "key" => "ALL_PROJECTS",


  		




  
  496
  
    
                                         "all" => 1 },


  		




  
  497
  
    
                   "departments"    => "ALL_DEPARTMENTS",


  		




  
  498
  
    
                   "$form->{vc}s"   => "ALL_VC",


  		




  
  499
  
    
                   "business_types" => "ALL_BUSINESS_TYPES");


  		




  499
  500
  
    
  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted(query => [ deleted => 0 ]);


  		




  500
  501
  
    

  		




  501
  502
  
    
  $form->{SHOW_VC_DROP_DOWN} =  $myconfig{vclimit} > scalar @{ $form->{ALL_VC} };


  		




  ......




  551
  552
  
    
  push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber cusordnumber


  		




  552
  553
  
    
                                          transaction_description transdatefrom transdateto reqdatefrom reqdateto


  		




  553
  554
  
    
                                          type vc employee_id salesman_id project_id


  		




  554
  
  
    
                                          insertdatefrom insertdateto);


  		




  
  555
  
    
                                          insertdatefrom insertdateto business_id);


  		




  555
  556
  
    

  		




  556
  557
  
    
  my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);


  		




  557
  558
  
    

  		




  ......




  614
  615
  
    
    push @options, $locale->text('Order Number') . " : $form->{ordnumber}";


  		




  615
  616
  
    
  }


  		




  616
  617
  
    
  push @options, $locale->text('Serial Number') . " : $form->{serialnumber}" if $form->{serialnumber};


  		




  
  618
  
    
  if ($form->{business_id}) {


  		




  
  619
  
    
    my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type');


  		




  
  620
  
    
    push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description;


  		




  
  621
  
    
  }


  		




  617
  622
  
    
  if ($form->{transaction_description}) {


  		




  618
  623
  
    
    push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";


  		




  619
  624
  
    
  }


  		












  

    
      templates/webpages/do/search.html
    
  





  9
  9
  
    
 [%- SET is_customer = '0' %]


  		




  10
  10
  
    
 [%- END %]


  		




  11
  11
  
    

  		




  
  12
  
    
 [%- SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]


  		




  
  13
  
    

  		




  12
  14
  
    
 <script type="text/javascript">


  		




  13
  15
  
    
   $(function(){ document.Form.donumber.focus(); });


  		




  14
  16
  
    
 </script>


  		




  ......




  108
  110
  
    
     <td colspan="3"><input name="serialnumber" class="fixed_width"></td>


  		




  109
  111
  
    
    </tr>


  		




  110
  112
  
    

  		




  
  113
  
    
    [%- IF ALL_BUSINESS_TYPES.size %]


  		




  
  114
  
    
    <tr>


  		




  
  115
  
    
     <th align="right" nowrap>[% vctypelabel %]</th>


  		




  
  116
  
    
     <td colspan="3">


  		




  
  117
  
    
      [% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key = 'description', with_empty = 1, style='width:250px') %]


  		




  
  118
  
    
     </td>


  		




  
  119
  
    
    </tr>


  		




  
  120
  
    
    [%- END %]


  		




  
  121
  
    

  		




  111
  122
  
    
    <tr>


  		




  112
  123
  
    
     <th align="right">[% 'Delivery Order Date' | $T8 %] [% 'From' | $T8 %]</th>


  		




  113
  124
  
    
     <td>


  		












Auch abrufbar als:  Unified diff