Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 9a3d356c

Von Bernd Blessmann vor etwa 13 Jahren hinzugefügt

Projektnummer pro Beleg auch für Debitoren- und Kreditorenbuchungen.

Unterschiede anzeigen:

SL/AP.pm
185 185
    $query = qq|UPDATE ap SET
186 186
                invnumber = ?, transdate = ?, ordnumber = ?, vendor_id = ?, taxincluded = ?,
187 187
                amount = ?, duedate = ?, paid = ?, netamount = ?,
188
                curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?
188
                curr = ?, notes = ?, department_id = ?, storno = ?, storno_id = ?,
189
                globalproject_id = ?
189 190
               WHERE id = ?|;
190 191
    @values = ($form->{invnumber}, conv_date($form->{transdate}),
191 192
                  $form->{ordnumber}, conv_i($form->{vendor_id}),
......
194 195
                  $form->{netamount},
195 196
                  $form->{currency}, $form->{notes},
196 197
                  conv_i($form->{department_id}), $form->{storno},
197
                  $form->{storno_id}, $form->{id});
198
                  $form->{storno_id}, conv_i($form->{globalproject_id}),
199
                  $form->{id});
198 200
    do_query($form, $dbh, $query, @values);
199 201

  
200 202
    # add individual transactions
SL/AR.pm
156 156
           invnumber = ?, ordnumber = ?, transdate = ?, customer_id = ?,
157 157
           taxincluded = ?, amount = ?, duedate = ?, paid = ?,
158 158
           netamount = ?, curr = ?, notes = ?, department_id = ?,
159
           employee_id = ?, storno = ?, storno_id = ?
159
           employee_id = ?, storno = ?, storno_id = ?, globalproject_id = ?
160 160
         WHERE id = ?|;
161 161
    my @values = ($form->{invnumber}, $form->{ordnumber}, conv_date($form->{transdate}), conv_i($form->{customer_id}), $form->{taxincluded} ? 't' : 'f', $form->{amount},
162 162
                  conv_date($form->{duedate}), $form->{paid}, $form->{netamount}, $form->{currency}, $form->{notes}, conv_i($form->{department_id}),
163
                  conv_i($form->{employee_id}), $form->{storno} ? 't' : 'f', $form->{storno_id}, conv_i($form->{id}));
163
                  conv_i($form->{employee_id}), $form->{storno} ? 't' : 'f', $form->{storno_id},
164
                  conv_i($form->{globalproject_id}), conv_i($form->{id}));
164 165
    do_query($form, $dbh, $query, @values);
165 166

  
166 167
    # add individual transactions for AR, amount and taxes
SL/Form.pm
2929 2929
           a.duedate, a.ordnumber, a.taxincluded, a.curr AS currency, a.notes,
2930 2930
           a.intnotes, a.department_id, a.amount AS oldinvtotal,
2931 2931
           a.paid AS oldtotalpaid, a.employee_id, a.gldate, a.type,
2932
           a.globalproject_id,
2932 2933
           c.name AS $table,
2933 2934
           d.description AS department,
2934 2935
           e.name AS employee
bin/mozilla/ap.pl
401 401
  $form->{javascript} .= qq|<script type="text/javascript" src="js/show_vc_details.js"></script>|;
402 402
  $form->{javascript} .= qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
403 403

  
404
  my $globalprojectnumber =
405
    NTI($cgi->popup_menu('-name' => "globalproject_id",
406
                         '-values' => \@project_values,
407
                         '-labels' => \%project_labels,
408
                         '-default' => $form->{"globalproject_id"} ));
409

  
404 410
  $form->header;
405 411
  my $onload = qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
406 412
  $onload .= qq|;setupPoints('|. $myconfig{numberformat} .qq|', '|. $locale->text("wrongformat") .qq|')|;
......
486 492
                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
487 493
                $button2
488 494
              </tr>
495
              <tr>
496
                <th align=right nowrap>| . $locale->text('Project Number') . qq|</th>
497
                <td>$globalprojectnumber</td>
498
              </tr>
489 499
            </table>
490 500
          </td>
491 501
        </tr>
bin/mozilla/ar.pl
436 436
    qq|<script type="text/javascript" src="js/show_vc_details.js"></script>| .
437 437
    qq|<script type="text/javascript" src="js/follow_up.js"></script>|;
438 438

  
439
  my $globalprojectnumber =
440
    NTI($cgi->popup_menu('-name' => "globalproject_id",
441
                         '-values' => \@project_values,
442
                         '-labels' => \%project_labels,
443
                         '-default' => $form->{"globalproject_id"} ));
444

  
439 445
  $form->header;
440 446
  $onload = qq|focus()|;
441 447
  $onload .= qq|;setupDateFormat('|. $myconfig{dateformat} .qq|', '|. $locale->text("Falsches Datumsformat!") .qq|')|;
......
523 529
                <th align=right nowrap>| . $locale->text('Due Date') . qq|</th>
524 530
                $button2
525 531
              </tr>
532
              <tr>
533
                <th align=right nowrap>| . $locale->text('Project Number') . qq|</th>
534
                <td>$globalprojectnumber</td>
535
              </tr>
526 536
     </table>
527 537
          </td>
528 538
        </tr>
doc/changelog
2 2
# Veränderungen von Lx-Office ERP #
3 3
###################################
4 4

  
5
- Projektnummer pro Beleg läßt sich auch für Debitoren- und
6
  Kreditorenbuchungen angeben.
7

  
5 8
- Bei den Berichten für Verkaus- und Einkaufsrechnungen wird auch auf die
6 9
  positionsbezogenen Projektnummern für Debitoren- und Kreditorenbuchungen
7 10
  gefiltert.

Auch abrufbar als: Unified diff