SF.net SVN: ledger-smb:[5318] branches/1.3

[..hidden..]

Revision: 5318
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5318&view=rev
Author:   einhverfr
Date:     2012-12-08 02:04:06 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Added template demos for including attached images
Fixed images not being available for the template

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/File.pm
    branches/1.3/dists/rpm/build.sh
    branches/1.3/templates/demo_with_images/invoice.tex

Added Paths:
-----------
    branches/1.3/templates/demo_with_images/

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-12-07 08:40:18 UTC (rev 5317)
+++ branches/1.3/Changelog	2012-12-08 02:04:06 UTC (rev 5318)
@@ -7,6 +7,8 @@
 * Merged in fcgi support from addons (Chris T)
 * Clarified UI for changing password vs settings (Chris T, 3588810) 
 * Fixed eca selection issues when creating invoices (Chris T, 3588301)
+* Added demo templates with for invoices with attached images (Chris T)
+* Fixed attached images not appearing in templates (Chris T)
 
 Changelog for 1.3.25
 * Fixed internal server errors on LedgerSMB->error() during new() (Chris T)

Modified: branches/1.3/LedgerSMB/File.pm
===================================================================
--- branches/1.3/LedgerSMB/File.pm	2012-12-07 08:40:18 UTC (rev 5317)
+++ branches/1.3/LedgerSMB/File.pm	2012-12-08 02:04:06 UTC (rev 5318)
@@ -298,6 +298,7 @@
 
 sub get_for_template{
     my ($self, $args) = @_;
+    warn 'entering get_for_template';
 
     my @results = $self->exec_method(
                  {funcname => 'file__get_for_template',
@@ -311,6 +312,7 @@
     $self->file_path($LedgerSMB::Sysconfig::tempdir . '/' . $$);
     
     for my $result (@results) {
+        warn "File found: $result->{file_name}";
         open FILE, '>', $self->file_path . "/$result->{file_name}";
         binmode FILE, ':bytes';
         print FILE $result->{content};
@@ -329,6 +331,7 @@
            $result->{ref_key} = $args->{ref_key};
         }
     }
+    return @results;
 }
 
 

Modified: branches/1.3/dists/rpm/build.sh
===================================================================
--- branches/1.3/dists/rpm/build.sh	2012-12-07 08:40:18 UTC (rev 5317)
+++ branches/1.3/dists/rpm/build.sh	2012-12-08 02:04:06 UTC (rev 5318)
@@ -4,9 +4,14 @@
 
 cp ../release/ledgersm*.tar.gz /root/rpmbuild/SOURCES/
 
-rpmbuild -ba   \
+rpmbuild -ba --sign  \
                --define "_source_filedigest_algorithm 0" \
                --define "_binary_filedigest_algorithm 0" \
                dists/rpm/ledgersmb.spec
 
 mv /root/rpmbuild/SOURCES/ledgersmb* ../release
+
+mv /root/rpmbuild/SRPMS/ledgersmb* ../release
+
+mv /root/rpmbuild/RPMS/noarch/ledgersmb* ../release
+

Modified: branches/1.3/templates/demo_with_images/invoice.tex
===================================================================
--- branches/1.3/templates/demo/invoice.tex	2012-12-06 21:28:10 UTC (rev 5310)
+++ branches/1.3/templates/demo_with_images/invoice.tex	2012-12-08 02:04:06 UTC (rev 5318)
@@ -208,6 +208,10 @@
 \end{tabularx}
 <?lsmb END ?>
 
+<?lsmb FOR FILE IN file_list ?>
+\includegraphics[scale=0.3]{<?lsmb file_path _ '/' _ FILE.file_name ?>}
+<?lsmb END ?>
+
 \vspace{1cm}
 
 \centerline{\textbf{<?lsmb text('Thank You for your valued business!') ?>}}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.