SF.net SVN: ledger-smb:[5320] trunk

[..hidden..]

Revision: 5320
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5320&view=rev
Author:   einhverfr
Date:     2012-12-08 03:17:44 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/File.pm
    trunk/dists/rpm/build.sh

Added Paths:
-----------
    trunk/templates/demo_with_images/

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5313
   + /branches/1.3:3711-5319

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-12-08 03:08:18 UTC (rev 5319)
+++ trunk/Changelog	2012-12-08 03:17:44 UTC (rev 5320)
@@ -84,6 +84,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: trunk/LedgerSMB/File.pm
===================================================================
--- trunk/LedgerSMB/File.pm	2012-12-08 03:08:18 UTC (rev 5319)
+++ trunk/LedgerSMB/File.pm	2012-12-08 03:17:44 UTC (rev 5320)
@@ -226,6 +226,7 @@
 
 sub get_for_template{
     my ($self, $args) = @_;
+    warn 'entering get_for_template';
 
     my @results = $self->exec_method(
                  {funcname => 'file__get_for_template',
@@ -239,6 +240,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};
@@ -257,6 +259,7 @@
            $result->{ref_key} = $args->{ref_key};
         }
     }
+    return @results;
 }
 
 

Modified: trunk/dists/rpm/build.sh
===================================================================
--- trunk/dists/rpm/build.sh	2012-12-08 03:08:18 UTC (rev 5319)
+++ trunk/dists/rpm/build.sh	2012-12-08 03:17:44 UTC (rev 5320)
@@ -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
+

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