Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 30913a9b

Von Bernd Bleßmann vor 12 Monaten hinzugefügt

  • ID 30913a9b47374eea2826667afe3276bf37ee9893
  • Vorgänger 7d40c44b
  • Nachfolger 2ff19b1e

Auftrags-Eingang: Bericht

Unterschiede anzeigen:

SL/OE.pm
69 69
  my $query;
70 70
  my $ordnumber = 'ordnumber';
71 71
  my $quotation = '0';
72
  my $intake    = '0';
72 73

  
73 74
  my @values;
74 75
  my $where;
......
81 82
    $quotation = '1';
82 83
    $ordnumber = 'quonumber';
83 84

  
85
  } elsif ($form->{type} =~ /_order_intake$/) {
86
    $intake = '1';
87

  
84 88
  } elsif ($form->{type} eq 'sales_order') {
85 89
    $periodic_invoices_columns = qq| , COALESCE(pcfg.active, 'f') AS periodic_invoices |;
86 90
    $periodic_invoices_joins   = qq| LEFT JOIN periodic_invoices_configs pcfg ON (o.id = pcfg.oe_id) |;
......
157 161
    qq|LEFT JOIN order_statuses ON (o.order_status_id = order_statuses.id) | .
158 162
    qq|$periodic_invoices_joins | .
159 163
    $phone_notes_join .
160
    qq|WHERE (o.quotation = ?) |;
164
    qq|WHERE (o.quotation = ?) | .
165
    qq|  AND (o.intake = ?) |;
161 166
  push(@values, $quotation);
167
  push(@values, $intake);
162 168

  
163 169
  if ($form->{department_id}) {
164 170
    $query .= qq| AND o.department_id = ?|;

Auch abrufbar als: Unified diff