Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 06d98024

Von Sven Schöling vor mehr als 15 Jahren hinzugefügt

  • ID 06d9802415e74e4b10cf3377cb1f38359f55ae3d
  • Vorgänger 21ca8cb7
  • Nachfolger 0a6affab

Whitespace

Unterschiede anzeigen:

SL/OE.pm
111 111
    $query .= " AND o.employee_id = ?";
112 112
    push @values, conv_i($form->{employee_id});
113 113
  }
114
  
114

  
115 115
  if ($form->{salesman_id}) {
116 116
    $query .= " AND o.salesman_id = ?";
117 117
    push @values, conv_i($form->{salesman_id});
......
701 701
         JOIN ${vc} cv ON (o.${vc}_id = cv.id)
702 702
         LEFT JOIN employee e ON (o.employee_id = e.id)
703 703
         LEFT JOIN department d ON (o.department_id = d.id) | .
704
        ($form->{id} 
705
         ? "WHERE o.id = ?" 
704
        ($form->{id}
705
         ? "WHERE o.id = ?"
706 706
         : "WHERE o.id IN (" . join(', ', map("? ", @ids)) . ")"
707 707
        );
708 708
    @values = $form->{id} ? ($form->{id}) : @ids;
......
770 770
    # stuff different from the whole will not be overwritten, but saved with a suffix.
771 771
    $query =
772 772
      qq|SELECT o.id AS orderitems_id,
773
           c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid, 
773
           c1.accno AS inventory_accno, c1.new_chart_id AS inventory_new_chart, date($transdate) - c1.valid_from as inventory_valid,
774 774
           c2.accno AS income_accno,    c2.new_chart_id AS income_new_chart,    date($transdate) - c2.valid_from as income_valid,
775 775
           c3.accno AS expense_accno,   c3.new_chart_id AS expense_new_chart,   date($transdate) - c3.valid_from as expense_valid,
776 776
           oe.ordnumber AS ordnumber_oe, oe.transdate AS transdate_oe, oe.cusordnumber AS cusordnumber_oe,
......
1124 1124
            push(@{ $form->{description} }, $sameitem);
1125 1125
          }
1126 1126

  
1127
          push(@{ $form->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq|, $ref->{partnumber}, $ref->{description}|); 
1127
          push(@{ $form->{description} }, $form->format_amount($myconfig, $ref->{qty} * $form->{"qty_$i"}) . qq|, $ref->{partnumber}, $ref->{description}|);
1128 1128
          map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
1129 1129
        }
1130 1130
        $sth->finish;

Auch abrufbar als: Unified diff