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

[..hidden..]

Revision: 5249
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5249&view=rev
Author:   einhverfr
Date:     2012-11-23 10:46:09 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/bin/io.pl

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5237
   + /branches/1.3:3711-5248

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-23 10:42:03 UTC (rev 5248)
+++ trunk/Changelog	2012-11-23 10:46:09 UTC (rev 5249)
@@ -83,7 +83,11 @@
 * Fixed internal server errors on LedgerSMB->error() during new() (Chris T)
 * Fixed pricematrix rows not showing where pricegroups are used (Chris T)
 * Fixed missing grant in some cases on cr_coa_to_account (Chris T)
+* Fixed letterhead not showing up on emailed invoices (Chris T, h/t Kevin B)
 
+Chris T is Chris Travers
+Kevin B is Kevin Bailey
+
 Changelog for 1.3.24
 * Fixed error in msgid for "Add Language" (Havard S, h/t Robert C)
 * Moved Makefile.PL to version_from to reduce errors (Chris T, h/t Robert C)

Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl	2012-11-23 10:42:03 UTC (rev 5248)
+++ trunk/bin/io.pl	2012-11-23 10:46:09 UTC (rev 5249)
@@ -1500,18 +1500,11 @@
 }
 sub print {
 
-    my $csettings = $LedgerSMB::Company_Config::settings;
-    $form->{company} = $csettings->{company_name};
-    $form->{businessnumber} = $csettings->{businessnumber};
-    $form->{email} = $csettings->{company_email};
-    $form->{address} = $csettings->{company_address};
-    $form->{tel} = $csettings->{company_phone};
-    #$form->{myCompanyFax} = $csettings->{company_fax};#fax should be named myCompanyFax ?
-    $form->{fax} = $csettings->{company_fax};
     $logger->trace("setting fax from LedgerSMB::Company_Config::settings \$form->{formname}=$form->{formname} \$form->{fax}=$form->{fax}");
 
 
     # if this goes to the printer pass through
+    my $old_form = undef;
     if ( $form->{media} !~ /(screen|email)/ ) {
         $form->error( $locale->text('Select txt, postscript or PDF!') )
           if ( $form->{format} !~ /(txt|postscript|pdf)/ );
@@ -1520,13 +1513,20 @@
         for ( keys %$form ) { $old_form->{$_} = $form->{$_} }
 
     }
-
     &print_form($old_form);
 
+
 }
 
 sub print_form {
     my ($old_form) = @_;
+    my $csettings = $LedgerSMB::Company_Config::settings;
+    $form->{company} = $csettings->{company_name};
+    $form->{businessnumber} = $csettings->{businessnumber};
+    $form->{address} = $csettings->{company_address};
+    $form->{tel} = $csettings->{company_phone};
+    #$form->{myCompanyFax} = $csettings->{company_fax};#fax should be named myCompanyFax ?
+    $form->{fax} = $csettings->{company_fax};
     my $inv = "inv";
     my $due = "due";
 

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