From b8916e5c2982dd12e0a612252c85f5e1648e162c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Tue, 27 Oct 2009 11:12:24 +0100 Subject: [PATCH] is_templates: form_footer erste Version --- bin/mozilla/is.pl | 681 +++++++++--------- locale/de/all | 1 + locale/de/is | 2 +- templates/webpages/is/_payments_master.html | 100 +++ templates/webpages/is/form_footer_de.html | 194 +++++ templates/webpages/is/form_footer_master.html | 194 +++++ templates/webpages/oe/form_footer_de.html | 2 +- templates/webpages/oe/form_footer_master.html | 2 +- 8 files changed, 822 insertions(+), 354 deletions(-) create mode 100644 templates/webpages/is/_payments_master.html create mode 100644 templates/webpages/is/form_footer_de.html create mode 100644 templates/webpages/is/form_footer_master.html diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index 3aa93b622..a732e4d95 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -173,15 +173,14 @@ sub invoice_links { $form->{selectcustomer} = 1; # departments - if ($form->{all_departments}) { - $form->{selectdepartment} = "\n" - } (@{ $form->{all_departments} }); - } +# if ($form->{all_departments}) { +# $form->{selectdepartment} = "\n" +# } @{ $form->{all_departments} }; +# } $form->{employee} = "$form->{employee}--$form->{employee_id}"; @@ -191,41 +190,35 @@ sub invoice_links { foreach my $key (keys %{ $form->{AR_links} }) { foreach my $ref (@{ $form->{AR_links}{$key} }) { - $form->{"select$key"} .= -"\n"; + $form->{"select$key"} .= "\n"; } if ($key eq "AR_paid") { next unless $form->{acc_trans}{$key}; for my $i (1 .. scalar @{ $form->{acc_trans}{$key} }) { - $form->{"AR_paid_$i"} = - "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; + $form->{"AR_paid_$i"} = "$form->{acc_trans}{$key}->[$i-1]->{accno}--$form->{acc_trans}{$key}->[$i-1]->{description}"; # reverse paid - $form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1; - $form->{"datepaid_$i"} = - $form->{acc_trans}{$key}->[$i - 1]->{transdate}; - $form->{"forex_$i"} = $form->{"exchangerate_$i"} = - $form->{acc_trans}{$key}->[$i - 1]->{exchangerate}; - $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source}; - $form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{memo}; + $form->{"paid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{amount} * -1; + $form->{"datepaid_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{transdate}; + $form->{"exchangerate_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{exchangerate}; + $form->{"forex_$i"} = $form->{"exchangerate_$i"}; + $form->{"source_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{source}; + $form->{"memo_$i"} = $form->{acc_trans}{$key}->[$i - 1]->{memo}; $form->{paidaccounts} = $i; } } else { - $form->{$key} = - "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}"; + $form->{$key} = "$form->{acc_trans}{$key}->[0]->{accno}--$form->{acc_trans}{$key}->[0]->{description}"; } - } $form->{paidaccounts} = 1 unless (exists $form->{paidaccounts}); $form->{AR} = $form->{AR_1} unless $form->{id}; - $form->{locked} = - ($form->datetonum($form->{invdate}, \%myconfig) <= - $form->datetonum($form->{closedto}, \%myconfig)); + $form->{locked} = ($form->datetonum($form->{invdate}, \%myconfig) + <= $form->datetonum($form->{closedto}, \%myconfig)); $main::lxdebug->leave_sub(); } @@ -399,22 +392,9 @@ sub form_footer { $form->{invtotal} = $form->{invsubtotal}; my ($rows, $introws); - if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) { - $rows = 2; - } - if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) { - $introws = 2; - } - $rows = ($rows > $introws) ? $rows : $introws; - my $notes = qq||; - my $intnotes = qq||; - - $form->{taxincluded} = ($form->{taxincluded} ? "checked" : ""); - - my $taxincluded = ""; - if ($form->{taxaccounts}) { - $taxincluded = qq| {taxincluded}> | . $locale->text('Tax Included') . qq|

|; - } + if (($rows = $form->numtextrows($form->{notes}, 26, 8)) < 2) { $rows = 2; } + if (($introws = $form->numtextrows($form->{intnotes}, 35, 8)) < 2) { $introws = 2; } + $form->{rows} = ($rows > $introws) ? $rows : $introws; my ($tax, $subtotal); if (!$form->{taxincluded}) { @@ -429,12 +409,11 @@ sub form_footer { $form->{"${item}_description"} | . $form->{"${item}_rate"} * 100 .qq|% $form->{"${item}_total"} - -|; + |; } } - $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); +# $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); $subtotal = qq| @@ -446,6 +425,7 @@ sub form_footer { } if ($form->{taxincluded}) { + $form->{taxaccounts_array} = [ split / /, $form->{taxaccounts} ]; foreach my $item (split / /, $form->{taxaccounts}) { if ($form->{"${item}_base"}) { $form->{"${item}_total"} = $form->round_amount( ($form->{"${item}_base"} * $form->{"${item}_rate"} / (1 + $form->{"${item}_rate"})), 2); @@ -453,326 +433,325 @@ sub form_footer { $form->{"${item}_total"} = $form->format_amount(\%myconfig, $form->{"${item}_total"}, 2); $form->{"${item}_netto"} = $form->format_amount(\%myconfig, $form->{"${item}_netto"}, 2); - $tax .= qq| - - Enthaltene $form->{"${item}_description"} | - . $form->{"${item}_rate"} * 100 .qq|% - $form->{"${item}_total"} - - - Nettobetrag - $form->{"${item}_netto"} - -|; +# $tax .= qq| +# +# Enthaltene $form->{"${item}_description"} | +# . $form->{"${item}_rate"} * 100 .qq|% +# $form->{"${item}_total"} +# +# +# Nettobetrag +# $form->{"${item}_netto"} +# +#|; } } } $form->{oldinvtotal} = $form->{invtotal}; - $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); +# $form->{invtotal} = $form->format_amount(\%myconfig, $form->{invtotal}, 2, 0); - my $follow_ups_block; + # unfortunately locales doesn't support extended syntax 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| - - | . $locale->text("There are #1 unfinished follow-ups of which #2 are due.", scalar @{ $follow_ups }, $num_due) . qq| - -|; - } - } - - print qq| - - - - - - - - -
- - - - - - - - - - - - $follow_ups_block -
| . $locale->text('Notes') . qq|| . $locale->text('Internal Notes') . qq|| . $locale->text('Payment Terms') . qq|
$notes$intnotes
- 		- - - - - - - - - - - -
| . $locale->text('Ertrag') . qq|| . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|
| . $locale->text('Ertrag prozentual') . qq|| . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %
- 		- $taxincluded - - $subtotal - $tax - - - - -
| . $locale->text('Total') . qq|$form->{invtotal}
-
- - -|; - my $webdav_list; - if ($main::webdav) { - $webdav_list = qq| - -
- - - Dokumente im Webdav-Repository - - - - -|; - foreach my $file (@{ $form->{WEBDAV} }) { - $webdav_list .= qq| - - - - -|; + $form->{follow_ups_text} = $locale->text("There are #1 unfinished follow-ups of which #2 are due.", + scalar @{ $follow_ups }, + sum map { $_->{due} * 1 } @{ $follow_ups }); } - $webdav_list .= qq| -
DateinameWebdavlink
$file->{name}$file->{type}
- -|; - - print $webdav_list; } -if ($form->{type} eq "credit_note") { - print qq| - - - - - - -|; -} else { - print qq| - - - - - - - - - -
| - . $locale->text('Payments') . qq|
- - - - -|; -} - my @column_index; - if ($form->{currency} eq $form->{defaultcurrency}) { - @column_index = qw(datepaid source memo paid AR_paid); - } else { - @column_index = qw(datepaid source memo paid exchangerate AR_paid); - } - - my %column_data; - $column_data{datepaid} = ""; - $column_data{paid} = ""; - $column_data{exchangerate} = ""; - $column_data{AR_paid} = ""; - $column_data{source} = ""; - $column_data{memo} = ""; - - print " - -"; - map { print "$column_data{$_}\n" } @column_index; - print " - -"; - - my @triggers = (); - my $totalpaid = 0; - - $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); - for my $i (1 .. $form->{paidaccounts}) { - print " - \n"; - - $form->{"selectAR_paid_$i"} = $form->{selectAR_paid}; - $form->{"selectAR_paid_$i"} =~ - s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/; - - # format amounts - $totalpaid += $form->{"paid_$i"}; - if ($form->{"paid_$i"}) { - $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); - } - $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); - - if ($form->{"exchangerate_$i"} == 0) { - $form->{"exchangerate_$i"} = ""; - } - my $exchangerate = qq| |; - if ($form->{currency} ne $form->{defaultcurrency}) { - if ($form->{"forex_$i"}) { - $exchangerate = qq|$form->{"exchangerate_$i"}|; - } else { - $exchangerate = qq||; - } - } - - $exchangerate .= qq||; - - $column_data{"paid_$i"} = - qq||; - $column_data{"exchangerate_$i"} = qq||; - $column_data{"AR_paid_$i"} = - qq||; - $column_data{"datepaid_$i"} = - qq||; - $column_data{"source_$i"} = - qq||; - $column_data{"memo_$i"} = - qq||; - - map { print qq|$column_data{"${_}_$i"}\n| } @column_index; - print " - \n"; - push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); - } - - my $paid_missing = $form->{oldinvtotal} - $totalpaid; - - print qq| - - - - - - - - - - - - -|; - - map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); - print qq| -
| - . $locale->text('Incoming Payments') . qq|
" . $locale->text('Date') . "" . $locale->text('Amount') . "" . $locale->text('Exch') . "" . $locale->text('Account') . "" . $locale->text('Source') . "" . $locale->text('Memo') . "
$exchangerate -
| . $locale->text('Total') . qq|| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|
| . $locale->text('Missing amount') . qq|| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|
-
-|; - - print_options(); - - print qq| -
-|; - - my $invdate = $form->datetonum($form->{invdate}, \%myconfig); - my $closedto = $form->datetonum($form->{closedto}, \%myconfig); - - if ($form->{id}) { - my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq "")); - - print qq| - - - - |; - print qq| | if ($show_storno); - print qq| |; - print qq| |; - if ($form->{id} && !($form->{type} eq "credit_note")) { - print qq| |; - } - if ($form->{radier}) { - print qq| |; - } - - - if ($invdate > $closedto) { - print qq| |; - } - - print qq| |; - - } else { - if ($invdate > $closedto) { - print qq| - - - - - - | . - NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit')); - } - } - - # button for saving history - if($form->{id} ne "") { - print qq| - |; - } - # /button for saving history - - # mark_as_paid button - if($form->{id} ne "") { - print qq||; - } - # /mark_as_paid button - print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . - qq| - - -| . -$cgi->hidden("-name" => "callback", "-value" => $form->{callback}) -. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) -. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]) -. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}]) -. qq| - - - - - -|; + print $form->parse_html_template('is/form_footer'); + +# print qq| +# +# +# +# +# +# +# +# +#
+# +# +# +# +# +# +# +# +# +# +# +# $follow_ups_block +#
| . $locale->text('Notes') . qq|| . $locale->text('Internal Notes') . qq|| . $locale->text('Payment Terms') . qq|
$notes$intnotes
+# 		+# +# +# +# +# +# +# +# +# +# +# +#
| . $locale->text('Ertrag') . qq|| . $form->format_amount(\%myconfig, $form->{marge_total}, 2, 0) . qq|
| . $locale->text('Ertrag prozentual') . qq|| . $form->format_amount(\%myconfig, $form->{marge_percent}, 2, 0) . qq| %
+# 		+# $taxincluded +# +# $subtotal +# $tax +# +# +# +# +#
| . $locale->text('Total') . qq|$form->{invtotal}
+#
+# +# +#|; +# my $webdav_list; +# if ($main::webdav) { +# $webdav_list = qq| +# +#
+# +# +# Dokumente im Webdav-Repository +# +# +# +# +#|; +# foreach my $file (@{ $form->{WEBDAV} }) { +# $webdav_list .= qq| +# +# +# +# +#|; +# } +# $webdav_list .= qq| +#
DateinameWebdavlink
$file->{name}$file->{type}
+# +#|; +# +# print $webdav_list; +# } +#if ($form->{type} eq "credit_note") { +# print qq| +# +# +# +# +# +# +#|; +#} else { +# print qq| +# +# +# +# +# +# +# +# +# +#
| +# . $locale->text('Payments') . qq|
+# +# +# +# +#|; +#} +# +# my @column_index; +# if ($form->{currency} eq $form->{defaultcurrency}) { +# @column_index = qw(datepaid source memo paid AR_paid); +# } else { +# @column_index = qw(datepaid source memo paid exchangerate AR_paid); +# } +# +# my %column_data; +# $column_data{datepaid} = ""; +# $column_data{paid} = ""; +# $column_data{exchangerate} = ""; +# $column_data{AR_paid} = ""; +# $column_data{source} = ""; +# $column_data{memo} = ""; +# +# print " +# +#"; +# map { print "$column_data{$_}\n" } @column_index; +# print " +# +#"; +# +# my @triggers = (); +# my $totalpaid = 0; +# +# $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); +# for my $i (1 .. $form->{paidaccounts}) { +# +# print " +# \n"; +# +# $form->{"selectAR_paid_$i"} = $form->{selectAR_paid}; +# $form->{"selectAR_paid_$i"} =~ +# s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/; +# +# # format amounts +# $totalpaid += $form->{"paid_$i"}; +# if ($form->{"paid_$i"}) { +# $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); +# } +# $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); +# +# if ($form->{"exchangerate_$i"} == 0) { +# $form->{"exchangerate_$i"} = ""; +# } +# my $exchangerate = qq| |; +# if ($form->{currency} ne $form->{defaultcurrency}) { +# if ($form->{"forex_$i"}) { +# $exchangerate = qq|$form->{"exchangerate_$i"}|; +# } else { +# $exchangerate = qq||; +# } +# } +# +# $exchangerate .= qq||; +# +# $column_data{"paid_$i"} = +# qq||; +# $column_data{"exchangerate_$i"} = qq||; +# $column_data{"AR_paid_$i"} = +# qq||; +# $column_data{"datepaid_$i"} = +# qq||; +# $column_data{"source_$i"} = +# qq||; +# $column_data{"memo_$i"} = +# qq||; +# +# map { print qq|$column_data{"${_}_$i"}\n| } @column_index; +# print " +# \n"; +# push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); +# } +# +# my $paid_missing = $form->{oldinvtotal} - $totalpaid; +# +# print qq| +# +# +# +# +# +# +# +# +# +# +# +# +#|; +# +# map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); +# print qq| +#
| +# . $locale->text('Incoming Payments') . qq|
" . $locale->text('Date') . "" . $locale->text('Amount') . "" . $locale->text('Exch') . "" . $locale->text('Account') . "" . $locale->text('Source') . "" . $locale->text('Memo') . "
$exchangerate +#
| . $locale->text('Total') . qq|| . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq|
| . $locale->text('Missing amount') . qq|| . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq|
+#
+#|; +# +# print_options(); +# +# print qq| +#
+#|; +# +# my $invdate = $form->datetonum($form->{invdate}, \%myconfig); +# my $closedto = $form->datetonum($form->{closedto}, \%myconfig); +# +# if ($form->{id}) { +# my $show_storno = !$form->{storno} && !IS->has_storno(\%myconfig, $form, "ar") && (($totalpaid == 0) || ($totalpaid eq "")); +# +# print qq| +# +# +# +# |; +# print qq| | if ($show_storno); +# print qq| |; +# print qq| |; +# if ($form->{id} && !($form->{type} eq "credit_note")) { +# print qq| |; +# } +# if ($form->{radier}) { +# print qq| |; +# } +# +# +# if ($invdate > $closedto) { +# print qq| |; +# } +# +# print qq| |; +# +# } else { +# if ($invdate > $closedto) { +# print qq| +# +# +# +# +# +# | . +# NTI($cgi->submit('-name' => 'action', '-value' => $locale->text('Save draft'), '-class' => 'submit')); +# } +# } +# +# # button for saving history +# if($form->{id} ne "") { +# print qq| +# |; +# } +# # /button for saving history +# +# # mark_as_paid button +# if($form->{id} ne "") { +# print qq||; +# } +# # /mark_as_paid button +# print $form->write_trigger(\%myconfig, scalar(@triggers) / 3, @triggers) . +# qq| +# +# +#| . +#$cgi->hidden("-name" => "callback", "-value" => $form->{callback}) +#. $cgi->hidden('-name' => 'draft_id', '-default' => [$form->{draft_id}]) +#. $cgi->hidden('-name' => 'draft_description', '-default' => [$form->{draft_description}]) +#. $cgi->hidden('-name' => 'customer_discount', '-value' => [$form->{customer_discount}]) +#. qq| +# +# +# +# +# +#|; $main::lxdebug->leave_sub(); } diff --git a/locale/de/all b/locale/de/all index 557892970..4ad45e6e8 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1355,6 +1355,7 @@ $self->{texts} = { 'Sat. Phone' => 'Sat. Tel.', 'Satz %' => 'Satz %', 'Save' => 'Speichern', + 'Save Draft' => '', 'Save account first to insert taxkeys' => 'Einstellungen sind nach dem Speichern des Kontos verfügbar...', 'Save and AP Transaction' => 'Speichern und Kreditorenbuchung erfassen', diff --git a/locale/de/is b/locale/de/is index 04bd63b05..ab2cdf1b6 100644 --- a/locale/de/is +++ b/locale/de/is @@ -265,7 +265,6 @@ $self->{texts} = { 'Street' => 'Straße', 'Subject' => 'Betreff', 'Subtotal' => 'Zwischensumme', - 'Tax Included' => 'Steuer im Preis inbegriffen', 'The \'tag\' field must only consist of alphanumeric characters or the carachters - _ ( )' => 'Das Feld \'tag\' darf nur aus alphanumerischen Zeichen und den Zeichen - _ ( ) bestehen.', 'The LDAP server "#1:#2" is unreachable. Please check config/authentication.pl.' => 'Der LDAP-Server "#1:#2" ist nicht erreichbar. Bitte überprüfen Sie die Angaben in config/authentication.pl.', 'The config file "config/authentication.pl" contained invalid Perl code:' => 'Die Konfigurationsdatei "config/authentication.pl" enthielt ungütigen Perl-Code:', @@ -425,6 +424,7 @@ $self->{subs} = { 'druckvorschau' => 'preview', 'drucken' => 'print', 'drucken_und_buchen' => 'print_and_post', + 'save_draft' => 'save_draft', 'entwurf_speichern' => 'save_draft', 'lieferadresse' => 'ship_to', 'Überspringen' => 'skip', diff --git a/templates/webpages/is/_payments_master.html b/templates/webpages/is/_payments_master.html new file mode 100644 index 000000000..09c0812c2 --- /dev/null +++ b/templates/webpages/is/_payments_master.html @@ -0,0 +1,100 @@ + + + + + + + my @column_index; + if ($form->{currency} eq $form->{defaultcurrency}) { + @column_index = qw(datepaid source memo paid AR_paid); + } else { + @column_index = qw(datepaid source memo paid exchangerate AR_paid); + } + + my %column_data; + $column_data{datepaid} = "" . $locale->text('Date') . ""; + $column_data{paid} = "" . $locale->text('Amount') . ""; + $column_data{exchangerate} = "" . $locale->text('Exch') . ""; + $column_data{AR_paid} = "" . $locale->text('Account') . ""; + $column_data{source} = "" . $locale->text('Source') . ""; + $column_data{memo} = "" . $locale->text('Memo') . ""; + + + + map { print "$column_data{$_}\n" } @column_index; + + + + my @triggers = (); + my $totalpaid = 0; + + $form->{paidaccounts}++ if ($form->{"paid_$form->{paidaccounts}"}); + + + + [% FOREACH i = 1 .. paidaccounts %] + + + + + $form->{"selectAR_paid_$i"} = $form->{selectAR_paid}; + $form->{"selectAR_paid_$i"} =~ + s/option>\Q$form->{"AR_paid_$i"}\E/option selected>$form->{"AR_paid_$i"}/; + + # format amounts + $totalpaid += $form->{"paid_$i"}; + if ($form->{"paid_$i"}) { + $form->{"paid_$i"} = $form->format_amount(\%myconfig, $form->{"paid_$i"}, 2); + } + $form->{"exchangerate_$i"} = $form->format_amount(\%myconfig, $form->{"exchangerate_$i"}); + + if ($form->{"exchangerate_$i"} == 0) { + $form->{"exchangerate_$i"} = ""; + } + my $exchangerate = qq| |; + if ($form->{currency} ne $form->{defaultcurrency}) { + if ($form->{"forex_$i"}) { + $exchangerate = qq|$form->{"exchangerate_$i"}|; + } else { + $exchangerate = qq||; + } + } + + $exchangerate .= qq||; + + $column_data{"paid_$i"} = + qq||; + $column_data{"exchangerate_$i"} = qq|$exchangerate|; + $column_data{"AR_paid_$i"} = + qq||; + $column_data{"datepaid_$i"} = + qq| + |; + $column_data{"source_$i"} = + qq||; + $column_data{"memo_$i"} = + qq||; + + map { print qq|$column_data{"${_}_$i"}\n| } @column_index; + print " + \n"; + push(@triggers, "datepaid_$i", "BL", "trigger_datepaid_$i"); + } + + + + + | . $locale->text('Total') . qq| + | . H($form->format_amount(\%myconfig, $totalpaid, 2)) . qq| + + + + + | . $locale->text('Missing amount') . qq| + | . H($form->format_amount(\%myconfig, $paid_missing, 2)) . qq| + + + map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } qw(paidaccounts selectAR_paid oldinvtotal)); + + + diff --git a/templates/webpages/is/form_footer_de.html b/templates/webpages/is/form_footer_de.html new file mode 100644 index 000000000..eeae7564d --- /dev/null +++ b/templates/webpages/is/form_footer_de.html @@ -0,0 +1,194 @@ +[%- USE HTML %] +[%- USE LxERP %] + + + + + + + + +
+ + + + + + + + + + + + + + + +
Bemerkungeninterne BemerkungenZahlungskonditionen
+ + + + + + +
[% follow_up_text %]
+ 		+ + + + + + + + + + + +
Ertrag[% LxERP.format_amount(marge_total, 2, 0) %]
Ertrag prozentual[% LxERP.format_amount(marge_percent, 2, 0) %] %
+ 		+ [%- IF taxaccounts %] + + Steuer im Preis inbegriffen +
+
+ [%- END %] + + + $subtotal + +[%# tax %] +[% FOREACH item = taxaccounts_array %] +[% SET description_ref = item _ 'description' %] +[% SET rate_ref = item _ 'rate' %] +[% SET total_ref = item _ 'total' %] +[% SET netto_ref = item _ 'netto' %] + + + + + + + + +[%- END %] + + + + + +
Enthaltene [% $description_ref %] [% $rate_ref * 100 %]%[% $total_ref %]
Nettobetrag[% $netto_ref %]
Summe[% invtotal %]
+
+ + + +[%- IF webdav %] + +
+ + + Dokumente im Webdav-Repository + + + + + + + [%- FOREACH file = WEBDAV %] + + + + + [%- END %] +
DateinameWebdavlink
[% file.name %][% file.type %]
+ +[% END %] + + + + + + +[% IF is_credit_note %] + +[% ELSE %] + +[%- END %] + + + +[%# INCLUDE _payments %] + + + + + + + + + + +
ZahlungsausgängeZahlungseingänge
+ [% print_options %] +
+ + [% IF id %] + + + + + +[% IF show_storno %] + +[% END %] + + + +[% IF id && is_credit_note %] + +[% END %] +[% IF show_delete %] + +[% END %] + + [%- IF invdate > closedto %] + + [%- END %] + + + + [% ELSE # no id %] + [% IF invdate > closedto %] + + + + + + + + [%- END %] + [% END # id %] + + [% IF id %] + [%#- button for saving history %] + + + + [% END %] + + + + + + + + + + + + diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html new file mode 100644 index 000000000..cc1810885 --- /dev/null +++ b/templates/webpages/is/form_footer_master.html @@ -0,0 +1,194 @@ +[%- USE HTML %] +[%- USE LxERP %] + + + + + + + + +
+ + + + + + + + + + + + + + + +
NotesInternal NotesPayment Terms
+ + + + + + +
[% follow_up_text %]
+ 		+ + + + + + + + + + + +
Ertrag[% LxERP.format_amount(marge_total, 2, 0) %]
Ertrag prozentual[% LxERP.format_amount(marge_percent, 2, 0) %] %
+ 		+ [%- IF taxaccounts %] + + Tax Included +
+
+ [%- END %] + + + $subtotal + +[%# tax %] +[% FOREACH item = taxaccounts_array %] +[% SET description_ref = item _ 'description' %] +[% SET rate_ref = item _ 'rate' %] +[% SET total_ref = item _ 'total' %] +[% SET netto_ref = item _ 'netto' %] + + + + + + + + +[%- END %] + + + + + +
Enthaltene [% $description_ref %] [% $rate_ref * 100 %]%[% $total_ref %]
Nettobetrag[% $netto_ref %]
Total[% invtotal %]
+
+ + + +[%- IF webdav %] + +
+ + + Dokumente im Webdav-Repository + + + + + + + [%- FOREACH file = WEBDAV %] + + + + + [%- END %] +
DateinameWebdavlink
[% file.name %][% file.type %]
+ +[% END %] + + + + + + +[% IF is_credit_note %] + +[% ELSE %] + +[%- END %] + + + +[%# INCLUDE _payments %] + + + + + + + + + + +
PaymentsIncoming Payments
+ [% print_options %] +
+ + [% IF id %] + + + + + +[% IF show_storno %] + +[% END %] + + + +[% IF id && is_credit_note %] + +[% END %] +[% IF show_delete %] + +[% END %] + + [%- IF invdate > closedto %] + + [%- END %] + + + + [% ELSE # no id %] + [% IF invdate > closedto %] + + + + + + + + [%- END %] + [% END # id %] + + [% IF id %] + [%#- button for saving history %] + + + + [% END %] + + + + + + + + + + + + diff --git a/templates/webpages/oe/form_footer_de.html b/templates/webpages/oe/form_footer_de.html index 0247b59c6..b2aa6f7c0 100644 --- a/templates/webpages/oe/form_footer_de.html +++ b/templates/webpages/oe/form_footer_de.html @@ -91,7 +91,7 @@ Dateiname Webdavlink - [%- FOREACH file=WEBDAV %] + [%- FOREACH file = WEBDAV %] [% HTML.escape(file.name) %] [% HTML.escape(file.type) %] diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html index c77c993d2..9de093919 100644 --- a/templates/webpages/oe/form_footer_master.html +++ b/templates/webpages/oe/form_footer_master.html @@ -91,7 +91,7 @@ Dateiname Webdavlink - [%- FOREACH file=WEBDAV %] + [%- FOREACH file = WEBDAV %] [% HTML.escape(file.name) %] [% HTML.escape(file.type) %] -- 2.20.1