diff options
author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-07-05 22:13:42 +0000 |
---|---|---|
committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-07-05 22:13:42 +0000 |
commit | 4afd2ef4324be7f35a126b89935a2932ed0373aa (patch) | |
tree | a61cfca1488ea954278f8acb0e5b696c7f05c769 | |
parent | 859ae950bebed02d0d3d6d0ab2341629d242d236 (diff) |
Removing debugging code accidently left in
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2187 4979c152-3d1c-0410-bac9-87ea11338e46
-rwxr-xr-x | LedgerSMB/Template/HTML.pm | 1 | ||||
-rw-r--r-- | UI/payments/payments_detail.html | 24 | ||||
-rw-r--r-- | scripts/payment.pl | 18 | ||||
-rwxr-xr-x | templates/Default-check.tex | 65 |
4 files changed, 43 insertions, 65 deletions
diff --git a/LedgerSMB/Template/HTML.pm b/LedgerSMB/Template/HTML.pm index 7b3544fd..59e57c8a 100755 --- a/LedgerSMB/Template/HTML.pm +++ b/LedgerSMB/Template/HTML.pm @@ -69,7 +69,6 @@ sub preprocess { } elsif ($type eq 'SCALAR' or $type eq 'Math::BigInt::GMP') { return escapeHTML($$rawvars); } else { # Hashes and objects - print STDERR "$_ is $type:$rawvars"; for ( keys %{$rawvars} ) { $vars->{preprocess($_)} = preprocess( $rawvars->{$_} ); } diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html index 6419be4b..1b142aa2 100644 --- a/UI/payments/payments_detail.html +++ b/UI/payments/payments_detail.html @@ -188,7 +188,7 @@ END ?>"><?lsmb r.contact_name ?></span></td> <td class="invoice"><?lsmb r.total_due ?> <?lsmb currency ?></td> - <td class="payment"> + <td class="payment" class="details_select"> <?lsmb INCLUDE input element_data = { name = "paid_$r.contact_id" value = "some" @@ -214,7 +214,7 @@ </tr> <tr class="listrow<?lsmb rc ?>"> <td class="invoice_detail_list" colspan="3"> - <table id = "invoice_data_table_<?lsmb r.contact_id ?>" width="100%"> + <table id = "invoice_data_table_<?lsmb r.contact_id ?>" width="100%" class = "detail_table_visible"> <tr class="listheading"> <th class="invoice_date_list"><?lsmb text('Date') ?> </th> @@ -291,6 +291,26 @@ class = 'submit' name = 'action' } ?> + <?lsmb IF can_print ?> + <?lsmb INCLUDE select element_data = { + name = "media" + class = "select" + options = media_options + value = media + } ?> + <?lsmb INCLUDE select element_data = { + name = "format" + class = "select" + options = format_options + value = format + } ?> + <?lsmb INCLUDE button element_data = { + text = text('Print') + value = 'print' + class = 'submit' + name = 'action' + } ?> + <?lsmb END # IF can_print ?> </form> </body> </html> diff --git a/scripts/payment.pl b/scripts/payment.pl index ed83b9c8..a5561cc1 100644 --- a/scripts/payment.pl +++ b/scripts/payment.pl @@ -72,6 +72,7 @@ sub payments { my ($request) = @_; my $payment = LedgerSMB::DBObject::Payment->new({'base' => $request}); $payment->get_metadata(); + $payment->debug({file => '/tmp/delme'}); my $template = LedgerSMB::Template->new( user => $request->{_user}, locale => $request->{_locale}, @@ -260,6 +261,23 @@ sub display_payments { for (@{$payment->{contact_invoices}}){ $_->{total_due} = $payment->format_amount(amount => $_->{total_due}); } + + @{$payment->{media_options}} = ( + {text => $request->{_locale}->text('Screen'), + value => 'screen'}); + for (keys %LedgerSMB::Sysconfig::printer){ + push @{$payment->{media_options}}, + {text => $_, + value => $LedgerSMB::Sysconfig::printer{$_}}; + } + if ($LedgerSMB::Sysconfig::latex){ + @{$payment->{format_options}} = ( + {text => 'PDF', value => 'PDF'}, + {text => 'Postscript', value => 'Postscript'}, + ); + $payment->{can_print} = 1; + } + my $template = LedgerSMB::Template->new( user => $request->{_user}, locale => $request->{_locale}, diff --git a/templates/Default-check.tex b/templates/Default-check.tex index 3b8053ac..807f7eac 100755 --- a/templates/Default-check.tex +++ b/templates/Default-check.tex @@ -4,6 +4,8 @@ \usepackage[letterpaper,top=2cm,bottom=1.5cm,left=1.1cm,right=1.5cm]{geometry} \usepackage{graphicx} +<?lsmb REQUIRE check_base.tex ?> + \begin{document} \pagestyle{myheadings} @@ -11,67 +13,6 @@ \fontfamily{cmss}\fontsize{9pt}{9pt}\selectfont -\parbox[t]{12cm}{ - <?lsmb company ?> - - <?lsmb address ?>} -\hfill -\parbox[t]{6cm}{\hfill <?lsmb source ?>} - -\vspace*{0.6cm} - -<?lsmb text_amount ?> \dotfill <?lsmb decimal ?>/100 \makebox[0.5cm]{\hfill} - -\vspace{0.5cm} - -\hfill <?lsmb datepaid ?> \makebox[2cm]{\hfill} <?lsmb amount ?> - -% different date format for datepaid -% <?lsmb DD ?><?lsmb MM ?><?lsmb YYYY ?> - -\vspace{0.5cm} - -<?lsmb name ?> - -<?lsmb address1 ?> - -<?lsmb address2 ?> - -<?lsmb city ?> -<?lsmb if state ?> -\hspace{-0.1cm}, <?lsmb state ?> -<?lsmb end state ?> -<?lsmb zipcode ?> +<?lsmb PROCESS check_single ?> -<?lsmb country ?> - -\vspace{1.8cm} - -<?lsmb memo ?> - -\vspace{0.8cm} - -<?lsmb company ?> - -\vspace{0.5cm} - -<?lsmb name ?> \hfill <?lsmb datepaid ?> \hfill <?lsmb source ?> - -\vspace{0.5cm} -\begin{tabularx}{\textwidth}{lXrr@{}} -\textbf{Invoice \#} & \textbf{Invoice Date} - & \textbf{Amount Due} & \textbf{Applied} \\ -<?lsmb foreach invnumber ?> -<?lsmb invnumber ?> & <?lsmb invdate ?> \dotfill - & <?lsmb due ?> & <?lsmb paid ?> \\ -<?lsmb end invnumber ?> -\end{tabularx} - -\vspace{1cm} - -<?lsmb memo ?> - -\vfill -<?lsmb message ?> \end{document} - |