Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fa51a82e

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

  • ID fa51a82ea786778381336cb2b45921eb595df78a
  • Vorgänger 7968fc16
  • Nachfolger d641058f

Angebot/Auftrag Status: Im Bericht anzeigen und danach filtern können.

Unterschiede anzeigen:

SL/OE.pm
131 131
    qq|  o.marge_total, o.marge_percent, | .
132 132
    qq|  o.exchangerate, | .
133 133
    qq|  o.itime::DATE AS insertdate, | .
134
    qq|  o.intnotes, | .
134
    qq|  o.intnotes,| .
135 135
    qq|  department.description as department, | .
136 136
    qq|  ex.$rate AS daily_exchangerate, | .
137 137
    qq|  pt.description AS payment_terms, | .
138 138
    qq|  pr.projectnumber AS globalprojectnumber, | .
139 139
    qq|  e.name AS employee, s.name AS salesman, | .
140 140
    qq|  ct.${vc}number AS vcnumber, ct.country, ct.ustid, ct.business_id,  | .
141
    qq|  tz.description AS taxzone | .
141
    qq|  tz.description AS taxzone, | .
142
    qq|  order_statuses.name AS order_status | .
142 143
    $periodic_invoices_columns .
143 144
    $phone_notes_columns .
144 145
    qq|  , o.order_probability, o.expected_billing_date, (o.netamount * o.order_probability / 100) AS expected_netamount | .
......
153 154
    qq|LEFT JOIN payment_terms pt ON (pt.id = o.payment_id)| .
154 155
    qq|LEFT JOIN tax_zones tz ON (o.taxzone_id = tz.id) | .
155 156
    qq|LEFT JOIN department   ON (o.department_id = department.id) | .
157
    qq|LEFT JOIN order_statuses ON (o.order_status_id = order_statuses.id) | .
156 158
    qq|$periodic_invoices_joins | .
157 159
    $phone_notes_join .
158 160
    qq|WHERE (o.quotation = ?) |;
......
313 315
    push(@values, like($form->{intnotes}));
314 316
  }
315 317

  
318
  if ($form->{order_status_id}) {
319
    $query .= qq| AND o.order_status_id = ?|;
320
    push(@values, $form->{order_status_id});
321
  }
322

  
316 323
  if ($form->{phone_notes}) {
317 324
    $query .= qq| AND (phone_notes.subject ILIKE ? OR regexp_replace(phone_notes.body, '<[^>]*>', '', 'g') ILIKE ?)|;
318 325
    push(@values, like($form->{phone_notes}), like($form->{phone_notes}));
......
429 436
    "payment_terms"           => "pt.description",
430 437
    "department"              => "department.description",
431 438
    "intnotes"                => "o.intnotes",
439
    "order_status"            => "order_statuses.name",
432 440
  );
433 441
  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
434 442
    $sortorder = $allowed_sort_columns{$form->{sort}} . " ${sortdir}"  . ", o.itime ${sortdir}";

Auch abrufbar als: Unified diff