Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fac049a0

Von Bernd Bleßmann vor etwa 11 Jahren hinzugefügt

  • ID fac049a07ca0a2e5dacf31f297766e3517893a40
  • Vorgänger 11dd30f1
  • Nachfolger af6756b8

Filtern nach Kunden-/Lieferantentyp bei Angeboten u. Aufträgen

Unterschiede anzeigen:

SL/OE.pm
87 87
    qq|  ex.$rate AS exchangerate, | .
88 88
    qq|  pr.projectnumber AS globalprojectnumber, | .
89 89
    qq|  e.name AS employee, s.name AS salesman, | .
90
    qq|  ct.${vc}number AS vcnumber, ct.country, ct.ustid  | .
90
    qq|  ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id  | .
91 91
    $periodic_invoices_columns .
92 92
    qq|FROM oe o | .
93 93
    qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
......
126 126
    push @values, "%" . $form->{"projectnumber"} . "%", "%" . $form->{"projectnumber"} . "%" ;
127 127
  }
128 128

  
129
  if ($form->{"business_id"}) {
130
    $query .= " AND ct.business_id = ?";
131
    push(@values, $form->{"business_id"});
132
  }
133

  
129 134
  if ($form->{"${vc}_id"}) {
130 135
    $query .= " AND o.${vc}_id = ?";
131 136
    push(@values, $form->{"${vc}_id"});
bin/mozilla/oe.pl
721 721
  $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
722 722
  $form->get_lists("projects"     => { "key" => "ALL_PROJECTS", "all" => 1 },
723 723
                   "departments"  => "ALL_DEPARTMENTS",
724
                   "$form->{vc}s" => "ALL_VC");
724
                   "$form->{vc}s" => "ALL_VC",
725
                   "business_types" => "ALL_BUSINESS_TYPES");
725 726
  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);
726 727

  
727 728
  # constants and subs for template
......
829 830
  my @hidden_variables = map { "l_${_}" } @columns;
830 831
  push @hidden_variables, "l_subtotal", $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered ordnumber quonumber
831 832
                                                        transaction_description transdatefrom transdateto type vc employee_id salesman_id
832
                                                        reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive);
833
                                                        reqdatefrom reqdateto projectnumber project_id periodic_invoices_active periodic_invoices_inactive
834
                                                        business_id);
833 835

  
834 836
  my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
835 837

  
......
902 904
  push @options, $locale->text('Not delivered')                                                           if $form->{notdelivered};
903 905
  push @options, $locale->text('Periodic invoices active')                                                if $form->{periodic_invoices_actibe};
904 906

  
907
  if ($form->{business_id}) {
908
    my $vc_type_label = $form->{vc} eq 'customer' ? $locale->text('Customer type') : $locale->text('Vendor type');
909
    push @options, $vc_type_label . " : " . SL::DB::Business->new(id => $form->{business_id})->load->description;
910
  }
911

  
905 912
  $report->set_options('top_info_text'        => join("\n", @options),
906 913
                       'raw_top_info_text'    => $form->parse_html_template('oe/orders_top'),
907 914
                       'raw_bottom_info_text' => $form->parse_html_template('oe/orders_bottom', { 'SHOW_CONTINUE_BUTTON' => $allow_multiple_orders }),
templates/webpages/oe/search.html
4 4
[%- USE L %]
5 5
[%- SET vclabel = vc == 'customer' ? LxERP.t8('Customer') : LxERP.t8('Vendor') %]
6 6
[%- SET vcnumberlabel = vc == 'customer' ? LxERP.t8('Customer Number') : LxERP.t8('Vendor Number') %]
7
[%- SET vctypelabel = vc == 'customer' ? LxERP.t8('Customer type') : LxERP.t8('Vendor type') %]
7 8

  
8 9
<form method="post" action="oe.pl">
9 10

  
......
79 80
            -%]
80 81
     </td>
81 82
    </tr>
83
    [%- UNLESS ALL_BUSINESS_TYPES.size == 0 %]
84
    <tr>
85
     <th align="right" nowrap>[% vctypelabel %]</th>
86
     <td colspan="3">
87
      [% L.select_tag('business_id', ALL_BUSINESS_TYPES, title_key = 'description', with_empty = 1, style='width:250px') %]
88
     </td>
89
    </tr>
90
    [%- END %]
82 91
    <tr>
83 92
     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
84 93
     <td>

Auch abrufbar als: Unified diff