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

[..hidden..]

Revision: 5336
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5336&view=rev
Author:   einhverfr
Date:     2012-12-11 10:10:08 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Sysconfig.pm
    trunk/bin/io.pl

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5332
   + /branches/1.3:3711-5335

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-12-11 09:58:04 UTC (rev 5335)
+++ trunk/Changelog	2012-12-11 10:10:08 UTC (rev 5336)
@@ -90,6 +90,8 @@
 * Fixed projects not attached to customers lost 1.2-1.3 (Chris T, h/t Ario)
 * Fixed the rpm file to make a valid ledgersmb-httpd.conf (Havard S, 3593393)
 * Dropped seconds/subsecs from password expiration notice (Chris T, 3593963)
+* Fixed parts images not available from template. (Chris T, h/t Brian W)
+* Fixed fs_cssdir not handling trailing / properly (Chris T, h/t Nigel T)
 
 Chris T is Chris Travers
 Havard S is Havard Sorli

Modified: trunk/LedgerSMB/Sysconfig.pm
===================================================================
--- trunk/LedgerSMB/Sysconfig.pm	2012-12-11 09:58:04 UTC (rev 5335)
+++ trunk/LedgerSMB/Sysconfig.pm	2012-12-11 10:10:08 UTC (rev 5336)
@@ -113,6 +113,7 @@
 if ($cssdir !~ m|/$|){
     $cssdir = "$cssdir/";
 }
+$fs_cssdir =~ s|/$||;
 
 for ($cfg->Parameters('printers')){
      $printer{$_} = $cfg->val('printers', $_);   

Modified: trunk/bin/io.pl
===================================================================
--- trunk/bin/io.pl	2012-12-11 09:58:04 UTC (rev 5335)
+++ trunk/bin/io.pl	2012-12-11 10:10:08 UTC (rev 5336)
@@ -1672,6 +1672,8 @@
     &{"$form->{vc}_details"};
 
     my @vars = ();
+
+    $form->{parts_id} = [];
     foreach $i ( 1 .. $form->{rowcount} ) {
         push @vars,
           (
@@ -1681,6 +1683,7 @@
             "unit_$i",          "notes_$i", 
             "image_$i",         "id_$i"
           );
+          push @{$form->{parts_id}}, $form->{"id_$i"};
     }
     for ( split / /, $form->{taxaccounts} ) { push @vars, "${_}_description" }
 

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