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

[..hidden..]

Revision: 5162
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5162&view=rev
Author:   einhverfr
Date:     2012-10-15 11:28:09 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Correcting image not showable on invoice due to inadequate retrieval from database

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/IS.pm
    branches/1.3/bin/io.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-10-15 10:37:38 UTC (rev 5161)
+++ branches/1.3/Changelog	2012-10-15 11:28:09 UTC (rev 5162)
@@ -6,6 +6,7 @@
 * 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)
 * Prompts added to configure_apache.sh (Berend T)
+* Corrected image not showable on html invoice (Chris T)
 
 berend T is Berend Tober
 Chris T is Chris Travers

Modified: branches/1.3/LedgerSMB/IS.pm
===================================================================
--- branches/1.3/LedgerSMB/IS.pm	2012-10-15 10:37:38 UTC (rev 5161)
+++ branches/1.3/LedgerSMB/IS.pm	2012-10-15 11:28:09 UTC (rev 5162)
@@ -343,6 +343,7 @@
             # add number, description and qty to $form->{number}...
             push( @{ $form->{runningnumber} }, $runningnumber++ );
             push( @{ $form->{number} },        $form->{"partnumber_$i"} );
+            push( @{ $form->{image} },        $form->{"image_$i"} );
             push( @{ $form->{sku} },           $form->{"sku_$i"} );
             push( @{ $form->{serialnumber} },  $form->{"serialnumber_$i"} );
 
@@ -2144,7 +2145,8 @@
 			          p.partnumber AS sku, p.listprice, p.lastcost,
 			          p.weight, p.onhand, p.inventory_accno_id, 
 			          p.income_accno_id, p.expense_accno_id,
-			          t.description AS partsgrouptranslation
+			          t.description AS partsgrouptranslation, 
+                                  p.image
 			     FROM invoice i
 		             JOIN parts p ON (i.parts_id = p.id)
 			LEFT JOIN project pr ON (i.project_id = pr.id)

Modified: branches/1.3/bin/io.pl
===================================================================
--- branches/1.3/bin/io.pl	2012-10-15 10:37:38 UTC (rev 5161)
+++ branches/1.3/bin/io.pl	2012-10-15 11:28:09 UTC (rev 5162)
@@ -1672,7 +1672,7 @@
     }
     else {
         IS->invoice_details( \%myconfig, $form );
-    }
+    } 
     if ( exists $form->{longformat} ) {
         $form->{"${due}date"} = $duedate;
         for ( "${inv}date", "${due}date", "shippingdate", "transdate" ) {
@@ -1680,7 +1680,6 @@
               $locale->date( \%myconfig, $form->{$_}, $form->{longformat} );
         }
     }
-
     @vars =
       qw(name address1 address2 city state zipcode country contact phone fax email);
 

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