Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 3286128e

Von Jan Büren vor mehr als 13 Jahren hinzugefügt

  • ID 3286128e8253b38ae4e996b327beaf243661a5ef
  • Vorgänger 4000272e
  • Nachfolger b5c3b696

Zum commit von gerade noch entsprechend employee korrekt ausgelesen und gldate vom richtigen Datensatz

Unterschiede anzeigen:

SL/GL.pm
263 263
264 264 
  if ($form->{employee} =~ /--/) {
265 265 
    ($form->{employee_id},$form->{employee_name}) = split(/--/,$form->{employee});
266 
    $query .= " AND o.employee_id = ?";
267 
    push @values, conv_i($form->{employee_id});
268 266 
  #if ($form->{employee_id}) {
269 267 
    $glwhere .= " AND g.employee_id = ? ";
270 268 
    $arwhere .= " AND a.employee_id = ? ";
......
370 368 
        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
371 369 
        $project_columns
372 370 
        $columns_for_sorting{gl}
373 
      FROM gl g, acc_trans ac $project_join, chart c
371 
      FROM gl g
372 
      LEFT JOIN employee e ON (g.employee_id = e.id),
373 
      acc_trans ac $project_join, chart c
374 374 
      LEFT JOIN tax t ON (t.chart_id = c.id)
375 375 
      WHERE $glwhere
376 376 
        AND (ac.chart_id = c.id)
......
384 384 
        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
385 385 
        $project_columns
386 386 
        $columns_for_sorting{arap}
387 
      FROM ar a, acc_trans ac $project_join, customer ct, chart c
387 
      FROM ar a
388 
      LEFT JOIN employee e ON (a.employee_id = e.id),
389 
      acc_trans ac $project_join, customer ct, chart c
388 390 
      LEFT JOIN tax t ON (t.chart_id=c.id)
389 391 
      WHERE $arwhere
390 392 
        AND (ac.chart_id = c.id)
......
399 401 
        CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee
400 402 
        $project_columns
401 403 
        $columns_for_sorting{arap}
402 
      FROM ap a, acc_trans ac $project_join, vendor ct, chart c
404 
      FROM ap a
405 
      LEFT JOIN employee e ON (a.employee_id = e.id),
406 
      acc_trans ac $project_join, vendor ct, chart c
403 407 
      LEFT JOIN tax t ON (t.chart_id=c.id)
404 408 
      WHERE $apwhere
405 409 
        AND (ac.chart_id = c.id)

Auch abrufbar als: Unified diff