Waren gruppieren für Brieffunktion entfernt

[kivitendo-erp.git] / bin / mozilla / io.pl

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index febe26776fa6e98eb4003f4367296b64e233ac10..460adef86ac824f37ebdf3ff6f1fe4e99b1e0d90 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -41,8 +41,10 @@ use CGI;
 use List::MoreUtils qw(any uniq apply);
 use List::Util qw(min max first);
 
+use SL::ClientJS;
 use SL::CVar;
 use SL::Common;
+use SL::Controller::Base;
 use SL::CT;
 use SL::Locale::String qw(t8);
 use SL::IC;
@@ -760,15 +762,6 @@ sub check_form {
     $form->{creditremaining} -= &invoicetotal;
   }
 
-  #sk
-  # if pricegroups
-  if (   $form->{type} =~ (/sales_quotation/)
-      or (($form->{level} =~ /Sales/) and ($form->{type} =~ /invoice/))
-      or (($form->{level} eq undef) and ($form->{type} =~ /invoice/))
-      or ($form->{type} =~ /sales_order/)) {
-
-  }
-
   &display_form;
 
   $main::lxdebug->leave_sub();
@@ -918,7 +911,7 @@ sub order {
   my $script = $form->{"script"};
   $script =~ s|.*/||;
   $script =~ s|.pl$||;
-  $locale = new Locale($::lx_office_conf{system}->{language}, $script);
+  $locale = Locale->new($::lx_office_conf{system}->{language}, $script);
 
   map { $form->{"select$_"} = "" } ($form->{vc}, "currency");
 
@@ -1205,6 +1198,7 @@ sub print_options {
 
   my %dont_display_groupitems = (
     'dunning' => 1,
+    'letter'  => 1,
     );
 
   my %template_vars = (
@@ -1247,7 +1241,7 @@ sub print {
     $form->error($locale->text('Select postscript or PDF!'))
       if ($form->{format} !~ /(postscript|pdf)/);
 
-    $old_form = new Form;
+    $old_form = Form->new;
     map { $old_form->{$_} = $form->{$_} } keys %$form;
   }
 
@@ -1501,11 +1495,13 @@ sub print_form {
   format_dates($output_dateformat, $output_longdates,
                qw(invdate orddate quodate pldate duedate reqdate transdate
                   shippingdate deliverydate validitydate paymentdate
-                  datepaid transdate_oe deliverydate_oe dodate
+                  datepaid transdate_oe transdate_do transdate_quo deliverydate_oe dodate
                   employee_startdate employee_enddate
                   ),
                grep({ /^datepaid_\d+$/ ||
                         /^transdate_oe_\d+$/ ||
+                        /^transdate_do_\d+$/ ||
+                        /^transdate_quo_\d+$/ ||
                         /^deliverydate_oe_\d+$/ ||
                         /^reqdate_\d+$/ ||
                         /^deliverydate_\d+$/ ||
@@ -1805,20 +1801,35 @@ sub relink_accounts {
   $main::lxdebug->leave_sub();
 }
 
-sub set_duedate {
-  $main::lxdebug->enter_sub();
+sub get_payment_terms_for_invoice {
+  my $terms = $::form->{payment_id}  ? SL::DB::PaymentTerm->new(id => $::form->{payment_id}) ->load
+            : $::form->{customer_id} ? SL::DB::Customer   ->new(id => $::form->{customer_id})->load->payment
+            : $::form->{vendor_id}   ? SL::DB::Vendor     ->new(id => $::form->{vendor_id})  ->load->payment
+            :                          undef;
 
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
+  return $terms;
+}
 
+sub set_duedate {
   _check_io_auth();
 
-  my $invdate = $form->{invdate} eq 'undefined' ? undef : $form->{invdate};
-  my $duedate = $form->get_duedate(\%myconfig, $invdate);
+  my $js      = SL::ClientJS->new(controller => SL::Controller::Base->new);
+  my $terms   = get_payment_terms_for_invoice();
+  my $invdate = $::form->{invdate} eq 'undefined' ? DateTime->today_local : DateTime->from_kivitendo($::form->{invdate});
+  my $duedate = $terms ? $terms->calc_date(reference_date => $invdate, due_date => $::form->{duedate})->to_kivitendo : ($::form->{duedate} || $invdate->to_kivitendo);
 
-  print $form->ajax_response_header() . ($duedate || $invdate);
+  if ($terms && $terms->auto_calculation) {
+    $js->hide('#duedate_container')
+       ->show('#duedate_fixed')
+       ->html('#duedate_fixed', $duedate);
 
-  $main::lxdebug->leave_sub();
+  } else {
+    $js->show('#duedate_container')
+       ->hide('#duedate_fixed');
+  }
+
+  $js->val('#duedate', $duedate)
+     ->render;
 }
 
 sub _update_part_information {