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

[..hidden..]

Revision: 5065
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5065&view=rev
Author:   einhverfr
Date:     2012-07-30 08:39:59 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/Sysconfig.pm
    trunk/LedgerSMB/Template.pm
    trunk/UI/Contact/pricelist.html
    trunk/UI/Reports/display_report.html
    trunk/css/ledgersmb.css
    trunk/t/01-load.t

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


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-5052
   + /branches/1.3:3711-5062

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/Changelog	2012-07-30 08:39:59 UTC (rev 5065)
@@ -95,6 +95,8 @@
 * Fixed customer/vendor cleared on ship/receive update (Chris T, 3548104)
 * Fixed insufficient permissions check in System/Defaults (Chris T)
 * Added missing ap_transaction_all role (Chris T, h/t Erik H)
+* Fixed internal server error setting up user in setup.pl (Chris T)
+* Performance fix for templates and format detection (Chris T)
 
 Changelog for 1.3.20
 * Fixes for es_AR translation, duplicate keys removed (Andres B)

Modified: trunk/LedgerSMB/Sysconfig.pm
===================================================================
--- trunk/LedgerSMB/Sysconfig.pm	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/LedgerSMB/Sysconfig.pm	2012-07-30 08:39:59 UTC (rev 5065)
@@ -123,7 +123,6 @@
      $ENV{$var} .= $pathsep . ( join $pathsep, $cfg->val('environment', $var));
 }
 
-warn $ENV{PERL5LIB};
 # Application-specific paths
 for my $var (qw(localepath spool templates images)) {
     ${$var} = $cfg->val('paths', $var) if $cfg->val('paths', $var);

Modified: trunk/LedgerSMB/Template.pm
===================================================================
--- trunk/LedgerSMB/Template.pm	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/LedgerSMB/Template.pm	2012-07-30 08:39:59 UTC (rev 5065)
@@ -284,7 +284,7 @@
 sub render {
 	my $self = shift;
 	my $vars = shift;
-        $vars->{FORMATS} = $self->available_formats;
+        $vars->{LIST_FORMATS} = sub { return $self->available_formats} ;
         $vars->{ENVARS} = \%ENV;
         $vars->{USER} = $LedgerSMB::App_State::User;
         $vars->{CSSDIR} = $LedgerSMB::Sysconfig::cssdir;

Modified: trunk/UI/Contact/pricelist.html
===================================================================
--- trunk/UI/Contact/pricelist.html	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/UI/Contact/pricelist.html	2012-07-30 08:39:59 UTC (rev 5065)
@@ -83,6 +83,8 @@
    value = "save_pricelist"
 } ;
 
+FORMATS = LIST_FORMATS();
+
 IF FORMATS.grep('PDF').size() ?> <a href="customer.pl?action=pricelist&format=PDF&credit_id=<?lsmb 
              credit_id ?>&entity_id=<?lsmb entity_id 
      ?>">[<?lsmb text('PDF') ?>]</a>

Modified: trunk/UI/Reports/display_report.html
===================================================================
--- trunk/UI/Reports/display_report.html	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/UI/Reports/display_report.html	2012-07-30 08:39:59 UTC (rev 5065)
@@ -7,6 +7,8 @@
 
 PROCESS "dynatable.html";
 
+FORMATS = LIST_FORMATS();
+
 LINK = 'http://' _ ENVARS.SERVER_NAME _ ENVARS.SCRIPT_NAME 
            _ '?' _ ENVARS.QUERY_STRING _ '&company=' _ DBNAME;
 

Modified: trunk/css/ledgersmb.css
===================================================================
--- trunk/css/ledgersmb.css	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/css/ledgersmb.css	2012-07-30 08:39:59 UTC (rev 5065)
@@ -249,7 +249,7 @@
 }
 
 /* Theming controls based on transaction status */
-
+/* disabled for now to speed release 
 #statusdiv.new input {
 }
 
@@ -261,6 +261,8 @@
        background-color: #ccccff;
 }
 
+*/
+
 /* media stuff */
 
 @media screen {

Modified: trunk/t/01-load.t
===================================================================
--- trunk/t/01-load.t	2012-07-30 07:07:01 UTC (rev 5064)
+++ trunk/t/01-load.t	2012-07-30 08:39:59 UTC (rev 5065)
@@ -23,7 +23,7 @@
 use_ok('LedgerSMB::DBObject::Payment');
 use_ok('LedgerSMB::DBObject::Reconciliation');
 use_ok('LedgerSMB::DBObject::TaxForm');
-use_ok('LedgerSMB::DBObject::User');
+use_ok('LedgerSMB::Report');
 use_ok('LedgerSMB::Form');
 use_ok('LedgerSMB::GL');
 use_ok('LedgerSMB::IC');

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