From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 18 Jan 2012 14:42:09 +0000 (+0100)
Subject: gl::form_footer auf template umgeschrieben.
X-Git-Tag: release-2.7.0beta1~33
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=750ac970f34b91bea202a177f9bd07e77476049d;p=kivitendo-erp.git

gl::form_footer auf template umgeschrieben.
---

diff --git a/bin/mozilla/gl.pl b/bin/mozilla/gl.pl
index b42282947..a4f2d1dfe 100644
--- a/bin/mozilla/gl.pl
+++ b/bin/mozilla/gl.pl
@@ -897,99 +897,25 @@ sub form_header {
 }
 
 sub form_footer {
-  $main::lxdebug->enter_sub();
-
-  $main::auth->assert('general_ledger');
-
-  my $form     = $main::form;
-  my %myconfig = %main::myconfig;
-  my $locale   = $main::locale;
-  my $cgi      = $::request->{cgi};
-
-  my $follow_ups_block;
-  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>|;
-    }
-  }
-
-  my ($dec) = ($form->{totaldebit} =~ /\.(\d+)/);
-  $dec = length $dec;
-  my $decimalplaces = ($dec > 2) ? $dec : 2;
-  my $radieren = ($form->current_date(\%myconfig) eq $form->{gldate}) ? 1 : 0;
-
-  map {
-    $form->{$_} = $form->format_amount(\%myconfig, $form->{$_}, 2, "&nbsp;")
-  } qw(totaldebit totalcredit);
-
-  print qq|
-    <tr class=listtotal>
-    <th colspan="3" align=right class=listtotal> $form->{totaldebit}</th>
-    <th align=right class=listtotal> $form->{totalcredit}</th>
-    <td colspan=6></td>
-    </tr>
-  </table>
-  </td>
-  </tr>
-</table>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-$follow_ups_block
-
-<br>
-|;
-
-  my $transdate = $form->datetonum($form->{transdate}, \%myconfig);
-  my $closedto  = $form->datetonum($form->{closedto},  \%myconfig);
-
-  if ($form->{id}) {
-
-    if (!$form->{storno}) {
-      print qq|<input class=submit type=submit name=action value="| . $locale->text('Storno') . qq|">|;
-    }
-
-    # Löschen und Ändern von Buchungen nicht mehr möglich (GoB) nur am selben Tag möglich
-    if (!$form->{locked} && $radieren) {
-      print qq|
-        <input class=submit type=submit name=action value="| . $locale->text('Post') . qq|" accesskey="b">
-        <input class=submit type=submit name=action value="| . $locale->text('Delete') . qq|">|;
-    }
-
-    print qq|
-        <input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . qq|">
-        <input type="button" class="submit" onclick="follow_up_window()" value="|
-      . $locale->text('Follow-Up')
-      . qq|"> |;
+  $::lxdebug->enter_sub;
+  $::auth->assert('general_ledger');
 
-  } else {
-    if ($form->{draft_id}) {
-      my $remove_draft_checked = $form->{remove_draft} ? 'checked' : '';
-      print qq|<p>\n|
-        . qq|  <input name="remove_draft" id="remove_draft" type="checkbox" class="checkbox" ${remove_draft_checked}>|
-        . qq|  <label for="remove_draft">| . $locale->text('Remove Draft') . qq|</label>\n|
-        . qq|</p>\n|;
-    }
+  my ($follow_ups, $follow_ups_due);
 
-    print qq|
-        <input class=submit type=submit name=action id=update_button value="| . $locale->text('Update') . 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'))
-        . $cgi->hidden('-name' => 'draft_id',          '-default' => [$form->{draft_id}])
-        . $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]);
+  if ($::form->{id}) {
+    $follow_ups     = FU->follow_ups('trans_id' => $::form->{id});
+    $follow_ups_due = sum map { $_->{due} * 1 } @{ $follow_ups || [] };
   }
 
-  print "
-  </form>
+  my $radieren = $::form->current_date(\%::myconfig) eq $::form->{gldate};
 
-</body>
-</html>
-";
-  $main::lxdebug->leave_sub();
+  print $::form->parse_html_template('gl/form_footer', {
+    radieren       => $radieren,
+    follow_ups     => $follow_ups,
+    follow_ups_due => $follow_ups_due,
+  });
 
+  $::lxdebug->leave_sub;
 }
 
 sub delete {
diff --git a/templates/webpages/gl/form_footer.html b/templates/webpages/gl/form_footer.html
new file mode 100644
index 000000000..48ad9952c
--- /dev/null
+++ b/templates/webpages/gl/form_footer.html
@@ -0,0 +1,52 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE T8 %]
+[%- USE L %]
+    <tr class=listtotal>
+    <th colspan="3" align=right class=listtotal> [% LxERP.format_amount(totaldebit, 2) | html %]</th>
+    <th align=right class=listtotal> [% LxERP.format_amount(totalcredit, 2) | html %]</th>
+    <td colspan=6></td>
+    </tr>
+  </table>
+  </td>
+  </tr>
+</table>
+
+<input name=callback type=hidden value="[% callback %]">
+
+[%- IF id && follow_ups.size %]
+  <p>[% LxERP.t8('There are #1 unfinished follow-ups of which #2 are due.', follow_ups.size , follow_ups_due) %]</p>
+[%- END %]
+
+<br>
+
+[%- IF id %]
+
+ [%- IF !storno %]
+      [% L.submit_tag('action', LxERP.t8('Storno')) %]
+ [%- END %]
+
+ [% IF !locked && radieren %]
+      [% L.submit_tag('action', LxERP.t8('Post'), accesskey='b') %]
+      [% L.submit_tag('action', LxERP.t8('Delete')) %]
+ [%- END %]
+      [% L.submit_tag('action', LxERP.t8('Update'), id='update_button') %]
+      [% L.submit_tag('action', LxERP.t8('Follow-Up'), onclick='follow_up_window()') %]
+
+[%- ELSE %]
+
+ [%- IF draft_id %]
+      <p>[% L.checkbox_tag('remove_draft', checked=remove_draft, label=LxERP.t8('Remove Draft')) %]</p>
+ [%- END %]
+
+      [% L.submit_tag('action', LxERP.t8('Update'), id='update_button') %]
+      [% L.submit_tag('action', LxERP.t8('Post')) %]
+      [% L.submit_tag('action', LxERP.t8('Save Draft')) %]
+      [% L.hidden_tag('draft_id', draft_id) %]
+      [% L.hidden_tag('draft_description', draft_description) %]
+[%- END %]
+
+  </form>
+
+</body>
+</html>