Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4a19c3d4

Von Udo Spallek vor etwa 17 Jahren hinzugefügt

  • ID 4a19c3d4287ccc276008fd78e63db25930d68f41
  • Vorgänger 900dff5f
  • Nachfolger ee3ab257

Verkauf->Berichte: Auftrag und Angebot Suche nach Salesman implementiert.

Unterschiede anzeigen:

SL/OE.pm
72 72
    qq|  o.marge_total, o.marge_percent, | .
73 73
    qq|  ex.$rate AS exchangerate, | .
74 74
    qq|  pr.projectnumber AS globalprojectnumber, | .
75
    qq|  e.name AS employee | .
75
    qq|  e.name AS employee, s.name AS salesman | .
76 76
    qq|FROM oe o | .
77 77
    qq|JOIN $vc ct ON (o.${vc}_id = ct.id) | .
78 78
    qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .
79
    qq|LEFT JOIN employee s ON (o.salesman_id = s.id) | .
79 80
    qq|LEFT JOIN exchangerate ex ON (ex.curr = o.curr | .
80 81
    qq|  AND ex.transdate = o.transdate) | .
81 82
    qq|LEFT JOIN project pr ON (o.globalproject_id = pr.id) | .
......
109 110
    $query .= " AND o.employee_id = ?";
110 111
    push @values, conv_i($form->{employee_id});
111 112
  }
113
  
114
  if ($form->{salesman_id}) {
115
    $query .= " AND o.salesman_id = ?";
116
    push @values, conv_i($form->{salesman_id});
117
  }
112 118

  
113 119
  if (!$form->{open} && !$form->{closed}) {
114 120
    $query .= " AND o.id = 0";
......
151 157
     "quonumber" => "o.quonumber",
152 158
     "name" => "ct.name",
153 159
     "employee" => "e.name",
160
     "salesman" => "e.name",
154 161
     "shipvia" => "o.shipvia",
155 162
     "transaction_description" => "o.transaction_description");
156 163
  if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {

Auch abrufbar als: Unified diff