X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Far.pl;h=cec9db7a695e3ec07721baf76779aa66f926a8ad;hb=1f6a2920746912f82410c5855c15b2f6e6c434f9;hp=655f35a9f75ba59f30ea23691df4d7e8b8f10c4e;hpb=25c3ca0d2e6360fcb3cc56f3c26c2dd4bcce3af9;p=kivitendo-erp.git

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 655f35a9f..cec9db7a6 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -100,7 +100,7 @@ sub add {
 
   AR->get_transdate(\%myconfig, $form);
   $form->{initial_transdate} = $form->{transdate};
-  &create_links;
+  create_links(dont_save => 1);
   $form->{transdate} = $form->{initial_transdate};
   &display_form;
   $main::lxdebug->leave_sub();
@@ -119,7 +119,7 @@ sub edit {
   $form->{javascript} .= qq|<script type="text/javascript" src="js/common.js"></script>|;
   $form->{title} = "Edit";
 
-  &create_links;
+  create_links();
   &display_form;
 
   $main::lxdebug->leave_sub();
@@ -143,21 +143,21 @@ sub create_links {
 
   $main::auth->assert('general_ledger');
 
+  my %params   = @_;
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
 
-  my ($duedate, $taxincluded);
-
   $form->create_links("AR", \%myconfig, "customer");
-  $duedate = $form->{duedate};
 
-  $taxincluded = $form->{taxincluded};
-  my $id = $form->{id};
+  my %saved;
+  if (!$params{dont_save}) {
+    %saved = map { ($_ => $form->{$_}) } qw(direct_debit id taxincluded);
+    $saved{duedate} = $form->{duedate} if $form->{duedate};
+  }
+
   IS->get_customer(\%myconfig, \%$form);
-  $form->{taxincluded} = $taxincluded;
-  $form->{id} = $id;
 
-  $form->{duedate}     = $duedate if $duedate;
+  $form->{$_}          = $saved{$_} for keys %saved;
   $form->{oldcustomer} = "$form->{customer}--$form->{customer_id}";
   $form->{rowcount}    = 1;
 
@@ -315,8 +315,6 @@ sub form_header {
     $taxcharts{$item->{id}} = $item;
   }
 
-  $::request->{layout}->focus("#customer");
-
   my $follow_up_vc         =  $form->{customer};
   $follow_up_vc            =~ s/--.*?//;
   my $follow_up_trans_info =  "$form->{invnumber} ($follow_up_vc)";
@@ -456,89 +454,29 @@ sub form_footer {
   my $locale   = $main::locale;
   my $cgi      = $::request->{cgi};
 
-  my ($transdate, $closedto);
-
-  my $follow_ups_block;
-  if ($form->{id}) {
+  if ( $form->{id} ) {
     my $follow_ups = FU->follow_ups('trans_id' => $form->{id});
-
-    if (@{ $follow_ups} ) {
-      my $num_due       = sum map { $_->{due} * 1 } @{ $follow_ups };
-      $follow_ups_block = qq|<p>| . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq|</p>|;
+    if ( @{ $follow_ups} ) {
+      $form->{follow_up_length} = scalar(@{$follow_ups});
+      $form->{follow_up_due_length} = sum(map({ $_->{due} * 1 } @{ $follow_ups }));
     }
   }
 
-  print qq|
-
-$follow_ups_block
-
-<input name=gldate type=hidden value="| . Q($form->{gldate}) . qq|">
-
-<input name=callback type=hidden value="$form->{callback}">
-|
-. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}])
-. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}])
-. qq|
-
-<br>
-|;
-
-  if (!$form->{id} && $form->{draft_id}) {
-    print(NTI($cgi->checkbox('-name' => 'remove_draft', '-id' => 'remove_draft',
-                             '-value' => 1, '-checked' => $form->{remove_draft},
-                             '-label' => '')) .
-          qq|&nbsp;<label for="remove_draft">| .
-          $locale->text("Remove draft when posting") .
-          qq|</label><br>|);
-  }
-
-  $transdate = $form->datetonum($form->{transdate}, \%myconfig);
-  $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
+  my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+  my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
 
-  print qq|<input class="submit" type="submit" name="action" id="update_button" value="| . $locale->text('Update') . qq|">\n|;
+  $form->{is_closed} = $transdate <= $closedto;
 
   # ToDO: - insert a global check for stornos, so that a storno is only possible a limited time after saving it
-  print qq| <input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|"> |
-    if ($form->{id} && !IS->has_storno(\%myconfig, $form, 'ar') && !IS->is_storno(\%myconfig, $form, 'ar') && (($form->{totalpaid} == 0) || ($form->{totalpaid} eq "")));
-
-  if ($form->{id}) {
-    if ($form->{radier}) {
-      print qq|
-        <input class=submit type=submit name=action value="| . $locale->text('Post') .            qq|">
-        <input class=submit type=submit name=action value="| . $locale->text('Delete') .          qq|"> |;
-    }
-    if ($transdate > $closedto) {
-      print qq|
-        <input class=submit type=submit name=action value="| . $locale->text('Use As Template') . qq|"> |;
-    }
-    print qq|
-        <input class=submit type=submit name=action value="| . $locale->text('Post Payment') .    qq|">
-        <input type="button" class="submit" onclick="follow_up_window()" value="|
-      . $locale->text('Follow-Up')
-      . qq|"> |;
-
-  } else {
-    if ($transdate > $closedto) {
-      print qq| <input class=submit type=submit name=action value="| . $locale->text('Post') .     qq|"> | .
-        NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit'));
-    }
-  }
+  $form->{show_storno_button} =
+    $form->{id} &&
+    !IS->has_storno(\%myconfig, $form, 'ar') &&
+    !IS->is_storno(\%myconfig, $form, 'ar') &&
+    ($form->{totalpaid} == 0 || $form->{totalpaid} eq "");
 
-  # button for saving history
-  if($form->{id} ne "") {
-    print qq| <input type=button class=submit onclick=set_history_window($form->{id}); name=history id=history value=| . $locale->text('history') . qq|> |;
-  }
-  # /button for saving history
-  # mark_as_paid button
-  if(($form->{id} ne "") && $::instance_conf->get_ar_show_mark_as_paid) {
-    print qq|<input type="submit" class="submit" name="action" value="|
-          . $locale->text('mark as paid') . qq|">|;
-  }
-  # /mark_as_paid button
+  $form->{show_mark_as_paid_button} = $form->{id} && $::instance_conf->get_ar_show_mark_as_paid();
 
-  print "
-</form>
-";
+  print $::form->parse_html_template('ar/form_footer');
 
   $main::lxdebug->leave_sub();
 }
@@ -729,6 +667,9 @@ sub post {
 
   my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
   my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
+
+  $form->error($locale->text('Cannot post transaction above the maximum future booking date!'))
+    if ($form->date_max_future($transdate, \%myconfig));
   $form->error($locale->text('Cannot post transaction for a closed period!')) if ($form->date_closed($form->{"transdate"}, \%myconfig));
 
   $form->error($locale->text('Zero amount posting!'))
@@ -803,7 +744,7 @@ sub post_as_new {
   $main::lxdebug->leave_sub();
 }
 
-sub use_as_template {
+sub use_as_new {
   $main::lxdebug->enter_sub();
 
   $main::auth->assert('general_ledger');
@@ -886,21 +827,17 @@ sub yes {
 sub search {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('general_ledger | invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
   my $cgi      = $::request->{cgi};
 
-  my ($customer, $department);
-  my ($jsscript, $button1, $button2);
-
   # setup customer selection
   $form->all_vc(\%myconfig, "customer", "AR");
 
   $form->{title}    = $locale->text('AR Transactions');
-  $form->{jsscript} = 1;
 
   # Auch in Rechnungsübersicht nach Kundentyp filtern - jan
   $form->get_lists("projects"       => { "key" => "ALL_PROJECTS", "all" => 1 },
@@ -911,7 +848,6 @@ sub search {
   $form->{SHOW_BUSINESS_TYPES} = scalar @{ $form->{ALL_BUSINESS_TYPES} } > 0;
 
   # constants and subs for template
-  $form->{jsscript}  = 1;
   $form->{vc_keys}   = sub { "$_[0]->{name}--$_[0]->{id}" };
 
   $form->header;
@@ -944,7 +880,7 @@ sub create_subtotal_row {
 sub ar_transactions {
   $main::lxdebug->enter_sub();
 
-  $main::auth->assert('general_ledger | invoice_edit');
+  $main::auth->assert('invoice_edit');
 
   my $form     = $main::form;
   my %myconfig = %main::myconfig;