From 9c548b6f507a54d562dd47e79d6dcc0893e15da5 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 12 Jul 2007 13:09:25 +0000 Subject: [PATCH] Umstellung der Steuerbearbeitungsfunktion auf das "Template"-Modul. --- SL/AM.pm | 2 +- bin/mozilla/am.pl | 26 ++------ templates/webpages/am/edit_tax_de.html | 78 +++++++++------------- templates/webpages/am/edit_tax_master.html | 78 +++++++++------------- templates/webpages/am/list_tax_de.html | 76 +++++++++------------ templates/webpages/am/list_tax_master.html | 76 +++++++++------------ 6 files changed, 132 insertions(+), 204 deletions(-) diff --git a/SL/AM.pm b/SL/AM.pm index f2eae601d..3737c130c 100644 --- a/SL/AM.pm +++ b/SL/AM.pm @@ -2098,7 +2098,7 @@ sub get_tax_accounts { # get Accounts from chart my $query = qq{ SELECT id, - accno || ' - ' || description AS _taxaccount + accno || ' - ' || description AS taxaccount FROM chart WHERE link LIKE '%_tax%' ORDER BY accno diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl index e7d56ddaf..4f8f3bc8c 100644 --- a/bin/mozilla/am.pl +++ b/bin/mozilla/am.pl @@ -3156,7 +3156,7 @@ sub add_tax { }; # Ausgabe des Templates - print($form->parse_html_template('am/edit_tax', $parameters_ref)); + print($form->parse_html_template2('am/edit_tax', $parameters_ref)); $lxdebug->leave_sub(); } @@ -3177,7 +3177,7 @@ sub edit_tax { }; # Ausgabe des Templates - print($form->parse_html_template('am/edit_tax', $parameters_ref)); + print($form->parse_html_template2('am/edit_tax', $parameters_ref)); $lxdebug->leave_sub(); } @@ -3196,33 +3196,17 @@ sub list_tax { $form->header(); # Ausgabe des Templates - print($form->parse_html_template('am/list_tax', $parameters_ref)); + print($form->parse_html_template2('am/list_tax', $parameters_ref)); $lxdebug->leave_sub(); } sub _get_taxaccount_selection{ - $lxdebug->enter_sub(); + $lxdebug->enter_sub(); AM->get_tax_accounts(\%myconfig, \%$form); - my $i = 0; - foreach my $taxaccount (@{ $form->{ACCOUNTS} } ) { - - # Fill in the Taxaxxounts as select options - if ($form->{chart_id} == $taxaccount->{id}) { - $form->{ACCOUNTS}[$i]{select_taxaccount} .= - qq|