Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 5bc87ade

Von Moritz Bunkus vor fast 9 Jahren hinzugefügt

  • ID 5bc87ade7044239fa9e893b9d7cbd476dc627eea
  • Vorgänger b9d02507
  • Nachfolger 8e7908eb

Zahlungsbedingungen: Flag »Fälligkeitsdatum automatisch berechnen«

Unterschiede anzeigen:

bin/mozilla/is.pl
43 43

  
44 44
use SL::DB::Default;
45 45
use SL::DB::Customer;
46
use SL::DB::PaymentTerm;
46 47

  
47 48
require "bin/mozilla/io.pl";
48 49
require "bin/mozilla/invoice_io.pl";
......
387 388
  ), @custom_hiddens,
388 389
  map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}];
389 390

  
390
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part));
391
  $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part client_js));
392

  
393
  $TMPL_VAR{payment_terms_obj} = get_payment_terms_for_invoice();
394
  $form->{duedate}             = $TMPL_VAR{payment_terms_obj}->calc_date(reference_date => $form->{invdate}, due_date => $form->{due_due})->to_kivitendo if $TMPL_VAR{payment_terms_obj};
391 395

  
392 396
  $form->header();
393 397

  
......
778 782

  
779 783
  relink_accounts();
780 784

  
785
  my $terms        = get_payment_terms_for_invoice();
786
  $form->{duedate} = $terms->calc_date(reference_date => $form->{invdate}, due_date => $form->{due_due})->to_kivitendo if $terms;
787

  
781 788
  # If transfer_out is requested, get rose db handle and do post and
782 789
  # transfer out in one transaction. Otherwise just post the invoice.
783 790
  if ($::instance_conf->get_is_transfer_out && $form->{type} ne 'credit_note' && !$form->{storno}) {
......
864 871
  $form->{rowcount}--;
865 872
  $form->{paidaccounts} = 1;
866 873
  $form->{invdate}      = $form->current_date(\%myconfig);
867
  $form->{duedate}      = $form->get_duedate(\%myconfig, $form->{invdate}) || $form->{invdate};
874
  my $terms             = get_payment_terms_for_invoice();
875
  $form->{duedate}      = $terms ? $terms->calc_date(reference_date => $form->{invdate})->to_kivitendo : $form->{invdate};
868 876
  $form->{employee_id}  = SL::DB::Manager::Employee->current->id;
869 877
  $form->{forex}        = $form->check_exchangerate(\%myconfig, $form->{currency}, $form->{invdate}, 'buy');
870 878
  $form->{exchangerate} = $form->{forex} if $form->{forex};

Auch abrufbar als: Unified diff