X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fis.pl;h=220c993aaf069c9a3272dc7e409dbb5c45c4f99f;hb=16455a4f7a2e871d645485ffb5904d197b907217;hp=47e71316755bf41bed527c6f0dcd1cfb382f8a4d;hpb=872f04a75528d55c3987c09fa0445451c35c6ef9;p=kivitendo-erp.git

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 47e713167..220c993aa 100644
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -35,10 +35,12 @@ use SL::FU;
 use SL::IS;
 use SL::PE;
 use SL::OE;
-use SL::DB::Default;
 use Data::Dumper;
 use List::Util qw(max sum);
 
+use SL::DB::Default;
+use SL::DB::Customer;
+
 require "bin/mozilla/io.pl";
 require "bin/mozilla/invoice_io.pl";
 require "bin/mozilla/arap.pl";
@@ -406,14 +408,11 @@ sub form_footer {
 
   # tax, total and subtotal calculations
   my ($tax, $subtotal);
-  $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ];
-
-  my $paymet_id = $::form->{payment_id};
-  IS->get_customer(\%myconfig, \%$form) if $form->{type} =~ /sales_(order|quotation)/;
-  $::form->{payment_id} = $paymet_id;
+  $form->{taxaccounts_array} = [ split(/ /, $form->{taxaccounts}) ];
 
-  if ( $form->{vc} eq 'customer' && !$form->{taxincluded_changed_by_user} ) {
-    $form->{taxincluded} = defined($form->{taxincluded_checked}) ? $form->{taxincluded_checked} : $myconfig{taxincluded_checked};
+  if( $form->{customer_id} && !$form->{taxincluded_changed_by_user} ) {
+    my $customer = SL::DB::Customer->new(id => $form->{customer_id})->load();
+    $form->{taxincluded} = defined($customer->taxincluded_checked) ? $customer->taxincluded_checked : $myconfig{taxincluded_checked};
   }
 
   foreach my $item (@{ $form->{taxaccounts_array} }) {
@@ -717,6 +716,8 @@ sub post {
   my $closedto = $form->datetonum($form->{closedto}, \%myconfig);
   my $invdate  = $form->datetonum($form->{invdate},  \%myconfig);
 
+  $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+    if ($form->date_max_future($invdate, \%myconfig));
   $form->error($locale->text('Cannot post invoice for a closed period!'))
     if ($invdate <= $closedto);
 
@@ -799,7 +800,7 @@ sub print_and_post {
 
 }
 
-sub use_as_template {
+sub use_as_new {
   $main::lxdebug->enter_sub();
 
   my $form     = $main::form;
@@ -807,12 +808,13 @@ sub use_as_template {
 
   $main::auth->assert('invoice_edit');
 
-  map { delete $form->{$_} } qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked);
+  delete @{ $form }{qw(printed emailed queued invnumber invdate deliverydate id datepaid_1 gldate_1 acc_trans_id_1 source_1 memo_1 paid_1 exchangerate_1 AP_paid_1 storno locked)};
   $form->{paidaccounts} = 1;
   $form->{rowcount}--;
   $form->{invdate} = $form->current_date(\%myconfig);
+  $form->{duedate} = $form->get_duedate(\%myconfig, $form->{invdate}) || $form->{invdate};
 
-  # remember pricegroups for "use as template"
+  # remember pricegroups for "use as new"
   IS->get_pricegroups_for_parts(\%myconfig, \%$form);
   set_pricegroup($_) for 1 .. $form->{rowcount};