Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 46f028ef

Von Bernd Bleßmann vor mehr als 4 Jahren hinzugefügt

  • ID 46f028ef78a55580e7e33c2439cedd0e60bde998
  • Vorgänger 51cbfc64
  • Nachfolger d04f241a

S:DATEV:CSV: Lieferdatum als Leistungsdatum exportieren

Unterschiede anzeigen:

SL/DATEV.pm
575 575
       UNION ALL
576 576

  
577 577
       SELECT ac.acc_trans_id, ac.transdate, ac.gldate, ac.trans_id,gl.id, ac.amount, ac.taxkey, ac.memo,
578
         gl.reference AS invnumber, NULL AS duedate, ac.amount as umsatz, NULL as deliverydate, gl.itime::date,
578
         gl.reference AS invnumber, NULL AS duedate, ac.amount as umsatz, gl.deliverydate, gl.itime::date,
579 579
         gl.description AS name, NULL as ustid, '' AS vcname, NULL AS customer_id, NULL AS vendor_id,
580 580
         c.accno, c.description AS accname, c.taxkey_id as charttax, c.datevautomatik, c.id, ac.chart_link AS link,
581 581
         FALSE AS invoice,
......
1051 1051
      if (($transaction->[$haben]->{'duedate'} // '') ne "") {
1052 1052
        $datev_data{belegfeld2} = $transaction->[$haben]->{'duedate'};
1053 1053
      }
1054
      if (($transaction->[$haben]->{'deliverydate'} // '') ne "") {
1055
        $datev_data{leistungsdatum} = $transaction->[$haben]->{'deliverydate'};
1056
      }
1054 1057
    }
1055 1058
    $datev_data{umsatz} = abs($umsatz); # sales invoices without tax have a different sign???
1056 1059

  
SL/DATEV/CSV.pm
478 478
                              valid_check     => sub { my ($check) = @_; return ($check =~ m/^(0|1)$/) },
479 479
                            },  # pos 114
480 480
                            {
481
                              kivi_datev_name => 'not yet implemented',
482
                            },
481
                              kivi_datev_name => 'leistungsdatum',
482
                              csv_header_name => t8('Payment Date'),
483
                              max_length      => 8,
484
                              type            => 'Date',
485
                              default         => '',
486
                              input_check     => sub { my ($check) = @_; return  1 if ('' eq $check); return (ref (DateTime->from_kivitendo($check)) eq 'DateTime') },
487
                              formatter       => sub { my ($input) = @_; return '' if ('' eq $input); return DateTime->from_kivitendo($input)->strftime('%d%m%Y') },
488
                              valid_check     => sub { my ($check) = @_; return  1 if ('' eq $check); return ($check =~ m/^[0-9]{8}$/) },
489
                            },  # pos 115
483 490
                            {
484 491
                              kivi_datev_name => 'not yet implemented',
485 492
                            },
locale/de/all
2300 2300
  'Payables'                    => 'Verbindlichkeiten',
2301 2301
  'Payment'                     => 'Zahlungsausgang',
2302 2302
  'Payment / Delivery Options'  => 'Zahlungs- und Lieferoptionen',
2303
  'Payment Date'                => 'Leistungsdatum',
2303 2304
  'Payment Reminder'            => 'Zahlungserinnerung',
2304 2305
  'Payment Terms'               => 'Zahlungsbedingungen',
2305 2306
  'Payment Terms missing in row ' => 'Zahlungsfrist fehlt in Zeile ',
locale/en/all
2300 2300
  'Payables'                    => '',
2301 2301
  'Payment'                     => '',
2302 2302
  'Payment / Delivery Options'  => '',
2303
  'Payment Date'                => '',
2303 2304
  'Payment Reminder'            => '',
2304 2305
  'Payment Terms'               => '',
2305 2306
  'Payment Terms missing in row ' => '',

Auch abrufbar als: Unified diff