Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision f0747a2f

Von Kivitendo Admin vor mehr als 7 Jahren hinzugefügt

  • ID f0747a2f9c8d7a9d261c20b0d2a9d5911a6ad9b5
  • Vorgänger 359506e5
  • Nachfolger 40cfb5ee

Dialogbuchen - Abteilung nutzt immer L.select_tag als Dropdown

Unterschiede anzeigen:

SL/GL.pm
113 113
    do_query($form, $dbh, $query, @values);
114 114
  }
115 115

  
116
  my ($null, $department_id) = split(/--/, $form->{department});
117

  
118 116
  $form->{ob_transaction} *= 1;
119 117
  $form->{cb_transaction} *= 1;
120 118

  
......
126 124
       WHERE id = ?|;
127 125

  
128 126
  @values = ($form->{reference}, $form->{description}, $form->{notes},
129
             conv_date($form->{transdate}), conv_i($department_id), $form->{taxincluded} ? 't' : 'f',
127
             conv_date($form->{transdate}), conv_i($form->{department_id}), $form->{taxincluded} ? 't' : 'f',
130 128
             $form->{storno} ? 't' : 'f', conv_i($form->{storno_id}), $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f',
131 129
             conv_i($form->{id}));
132 130
  do_query($form, $dbh, $query, @values);
......
233 231
    push(@apvalues, like($form->{reference}));
234 232
  }
235 233

  
236
  if ($form->{department}) {
237
    my ($null, $department) = split /--/, $form->{department};
234
  if ($form->{department_id}) {
238 235
    $glwhere .= qq| AND g.department_id = ?|;
239 236
    $arwhere .= qq| AND a.department_id = ?|;
240 237
    $apwhere .= qq| AND a.department_id = ?|;
241
    push(@glvalues, $department);
242
    push(@arvalues, $department);
243
    push(@apvalues, $department);
238
    push(@glvalues, $form->{department_id});
239
    push(@arvalues, $form->{department_id});
240
    push(@apvalues, $form->{department_id});
244 241
  }
245 242

  
246 243
  if ($form->{source}) {
......
639 636
  if ($form->{id}) {
640 637
    $query =
641 638
      qq|SELECT g.reference, g.description, g.notes, g.transdate, g.storno, g.storno_id,
642
           d.description AS department, e.name AS employee, g.taxincluded, g.gldate,
639
           g.department_id, d.description AS department,
640
           e.name AS employee, g.taxincluded, g.gldate,
643 641
         g.ob_transaction, g.cb_transaction
644 642
         FROM gl g
645 643
         LEFT JOIN department d ON (d.id = g.department_id)

Auch abrufbar als: Unified diff