Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 470cd722

Von Sven Schöling vor etwa 8 Jahren hinzugefügt

  • ID 470cd7228cc266776adaaabe4f4939239cbcfc63
  • Vorgänger 0e1c16fd
  • Nachfolger f63bc3db

GDPDU: itime in Buchungen mit anzeigen

Unterschiede anzeigen:

SL/DATEV.pm
384 384

  
385 385
  my $query    =
386 386
    qq|SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ar.id, ac.amount, ac.taxkey, ac.memo,
387
         ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate,
387
         ar.invnumber, ar.duedate, ar.amount as umsatz, ar.deliverydate, ar.itime::date,
388 388
         ct.name, ct.ustid, ct.customernumber AS vcnumber, ct.id AS customer_id, NULL AS vendor_id,
389 389
         c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
390 390
         ar.invoice,
......
406 406
       UNION ALL
407 407

  
408 408
       SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,ap.id, ac.amount, ac.taxkey, ac.memo,
409
         ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate,
409
         ap.invnumber, ap.duedate, ap.amount as umsatz, ap.deliverydate, ap.itime::date,
410 410
         ct.name, ct.ustid, ct.vendornumber AS vcnumber, NULL AS customer_id, ct.id AS vendor_id,
411 411
         c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
412 412
         ap.invoice,
......
428 428
       UNION ALL
429 429

  
430 430
       SELECT ac.acc_trans_id, ac.transdate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo,
431
         gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate,
431
         gl.reference AS invnumber, gl.transdate AS duedate, ac.amount as umsatz, NULL as deliverydate, gl.itime::date,
432 432
         gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id,
433 433
         c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
434 434
         FALSE AS invoice,
SL/GDPDU.pm
57 57
  vcnumber          => { type => 'Rose::DB::Object::Metadata::Column::Text',    text => t8('Customer/Vendor Number'), },
58 58
  customer_id       => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Customer (database ID)'), },
59 59
  vendor_id         => { type => 'Rose::DB::Object::Metadata::Column::Integer', text => t8('Vendor (database ID)'), },
60
  itime             => { type => 'Rose::DB::Object::Metadata::Column::Date',    text => t8('Create Date'), },
60 61
);
61 62

  
62 63
my @datev_columns = qw(
......
68 69
  credit_accno credit_accname
69 70
  taxdescription tax
70 71
  tax_accno    tax_accname    taxkey
71
  notes
72
  notes itime
72 73
);
73 74

  
74 75
# rows in this listing are tiers.
......
416 417
      tax              => defined $amount->{net_amount} ? abs($amount->{amount}) - abs($amount->{net_amount}) : 0,
417 418
      taxdescription   => defined($soll->{tax_accno}) ? $soll->{taxdescription} : $haben->{taxdescription},
418 419
      notes            => $haben->{notes},
420
      itime            => $soll->{itime},
419 421
      (map { ($_ => $tax->{$_})                    } qw(taxkey tax_accname tax_accno)),
420 422
      (map { ($_ => ($haben->{$_} // $soll->{$_})) } qw(acc_trans_id invnumber name vcnumber transdate)),
421 423
    );

Auch abrufbar als: Unified diff