Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 1b9d3857

Von Tamino Steinert vor 5 Tagen hinzugefügt

  • ID 1b9d38570995b59d7d95281d4c2a2d7d7ac15381
  • Vorgänger 8378a566
  • Nachfolger 9fb701e6

ZUGFeRD: auch ohne Zahlungsbedingung Fälligkeitsdatum übernehmen

Unterschiede anzeigen:

SL/DB/Helper/ZUGFeRD.pm
388 388
sub _payment_terms {
389 389
  my ($self, %params) = @_;
390 390

  
391
  return unless $self->payment_terms;
391
  return if !$self->payment_terms && !$self->duedate;
392

  
393
  if (!$self->payment_terms) { # only duedate
394
    #     <ram:SpecifiedTradePaymentTerms>
395
    $params{xml}->startTag("ram:SpecifiedTradePaymentTerms");
396

  
397
    #       <ram:DueDateDateTime>
398
    $params{xml}->startTag("ram:DueDateDateTime");
399
    $params{xml}->dataElement("udt:DateTimeString", $self->duedate->strftime('%Y%m%d'), format => "102");
400
    $params{xml}->endTag;
401
    #       </ram:DueDateDateTime>
402

  
403
    $params{xml}->endTag;
404
    #     </ram:SpecifiedTradePaymentTerms>
405
    return;
406
  }
392 407

  
393 408
  my %payment_terms_vars = _calculate_payment_terms_values($self);
394 409

  
......
722 737
    }
723 738
  }
724 739

  
740
  if ($self->amount - $self->paid > 0) {
741
    if (!$self->duedate && !$self->payment_terms) {
742
      SL::X::ZUGFeRDValidation->throw(message => $prefix . $::locale->text('In case the amount due is positive, either due date or payment term must be set.'));
743
    }
744
  }
745

  
725 746
  if (_is_profile($self, PROFILE_XRECHNUNG())) {
726 747
    if (!$self->customer->c_vendor_routing_id) {
727 748
      SL::X::ZUGFeRDValidation->throw(message => $prefix . $::locale->text('The value \'our routing id at customer\' must be set in the customer\'s master data for profile #1.', 'XRechnung 2.0'));
locale/de/all
2059 2059
  'Imported Pay Postings'       => 'Importierte Lohnbuchungen',
2060 2060
  'Imported entries'            => 'Importierte Einträge',
2061 2061
  'In addition to the above date functions, subtract the following amount of days from the calculated date as a buffer.' => 'Der folgende Puffer in Tagen wird von den beiden obigen vorausberechneten Daten abgezogen.',
2062
  'In case the amount due is positive, either due date or payment term must be set.' => 'Wenn der fällige Betrag positiv ist, muss entweder ein Fälligkeitsdatum oder eine Zahlungsbedinung gesetzt sein.',
2062 2063
  'In order to do that hit the button "Delete transaction".' => 'Drücken Sie dafür auf den Button "Buchung löschen".',
2063 2064
  'In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.' => 'Um die alte Ordnerstruktur in die neue Struktur zu migrieren, müssen Sie festlegen, welchem Mandanten die bisherige Struktur zugewiesen wird.',
2064 2065
  'In order to use kivitendo you have to create at least a client, a user and a group.' => 'Um kivitendo zu nutzen, müssen Sie mindestens einen Mandanten, einen Benutzer und eine Gruppe anlegen.',
locale/en/all
2058 2058
  'Imported Pay Postings'       => '',
2059 2059
  'Imported entries'            => '',
2060 2060
  'In addition to the above date functions, subtract the following amount of days from the calculated date as a buffer.' => '',
2061
  'In case the amount due is positive, either due date or payment term must be set.' => '',
2061 2062
  'In order to do that hit the button "Delete transaction".' => '',
2062 2063
  'In order to migrate the old folder structure into the new structure you have to chose which client the old structure will be assigned to.' => '',
2063 2064
  'In order to use kivitendo you have to create at least a client, a user and a group.' => '',

Auch abrufbar als: Unified diff