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

[..hidden..]

Revision: 5238
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5238&view=rev
Author:   einhverfr
Date:     2012-11-22 03:32:14 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/Changelog
    trunk/LedgerSMB/IC.pm
    trunk/LedgerSMB.pm
    trunk/lsmb-request.pl
    trunk/sql/modules/Roles.sql

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


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

Modified: trunk/Changelog
===================================================================
--- trunk/Changelog	2012-11-22 03:20:36 UTC (rev 5237)
+++ trunk/Changelog	2012-11-22 03:32:14 UTC (rev 5238)
@@ -79,6 +79,11 @@
 Initial Release:  Monday, Oct 12 2011
 Supported Presently
 
+Changelog for 1.3.25
+* 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)
+
 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/LedgerSMB/IC.pm
===================================================================
--- trunk/LedgerSMB/IC.pm	2012-11-22 03:20:36 UTC (rev 5237)
+++ trunk/LedgerSMB/IC.pm	2012-11-22 03:32:14 UTC (rev 5238)
@@ -230,7 +230,7 @@
 			LEFT JOIN entity_credit_account c 
                                   ON (c.id = pc.credit_id)
 			LEFT JOIN pricegroup g ON (g.id = pc.pricegroup_id)
-                 JOIN entity e ON (e.id = c.entity_id)
+                        LEFT JOIN entity e ON (e.id = c.entity_id)
 			    WHERE pc.parts_id = ?
 			 ORDER BY e.name, g.pricegroup, pc.pricebreak|;
         $sth = $dbh->prepare($query);
@@ -588,6 +588,7 @@
 
             ( $null, $customer_id ) = split /--/, $form->{"customer_$i"};
             $customer_id *= 1;
+            $customer_id ||= undef; # 0 id is invalid anyway.
 
             ( $null, $pricegroup_id ) = split /--/, $form->{"pricegroup_$i"};
 

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2012-11-22 03:20:36 UTC (rev 5237)
+++ trunk/LedgerSMB.pm	2012-11-22 03:32:14 UTC (rev 5238)
@@ -234,6 +234,7 @@
 
     $type = "" unless defined $type;
     $argstr = "" unless defined $argstr;
+warn 'breakpoint:' . __LINE__;
 
     $logger->debug("Begin called from \$filename=$filename \$line=$line \$type=$type \$argstr=$argstr ref argstr=".ref $argstr);
 
@@ -368,7 +369,7 @@
        if (!LedgerSMB::Session::check( $cookie{${LedgerSMB::Sysconfig::cookie_name}}, $self) ) {
             $logger->error("Session did not check");
             $self->_get_password("Session Expired");
-            exit;
+            die;
        }
        $logger->debug("session_check completed OK \$self->{session_id}=$self->{session_id} caller=\$filename=$filename \$line=$line");
     }
@@ -447,7 +448,7 @@
     } else {
         LedgerSMB::Auth::credential_prompt();
     }
-    exit;
+    die;
 }
 
 sub debug {
@@ -561,7 +562,7 @@
     if ( $self->{callback} || !$msg ) {
 
         main::redirect();
-	exit;
+	die;
     }
     else {
 
@@ -831,7 +832,7 @@
              <p>dbversion: $self->{dbversion}, company: $self->{company}</p>
              </body>|;
 
-        exit;
+        die;
 
     }
     else {
@@ -983,7 +984,7 @@
            . "\n" . 
           $locale->text('More information has been reported in the error logs');
        $dbh->rollback;
-       exit;
+       die;
    }
    die $dbh->state . ":" . $dbh->errstr;
 }

Modified: trunk/lsmb-request.pl
===================================================================
--- trunk/lsmb-request.pl	2012-11-22 03:20:36 UTC (rev 5237)
+++ trunk/lsmb-request.pl	2012-11-22 03:32:14 UTC (rev 5238)
@@ -49,6 +49,7 @@
 $logger->debug("getting new LedgerSMB");
 
 my $request = new LedgerSMB;
+warn 'breakpoint:' . __LINE__;
 
 $logger->debug("Got \$request=$request");
 $logger->trace("\$request=".Data::Dumper::Dumper($request));

Modified: trunk/sql/modules/Roles.sql
===================================================================
--- trunk/sql/modules/Roles.sql	2012-11-22 03:20:36 UTC (rev 5237)
+++ trunk/sql/modules/Roles.sql	2012-11-22 03:32:14 UTC (rev 5238)
@@ -672,7 +672,7 @@
 CREATE ROLE "lsmb_<?lsmb dbname ?>__reconciliation_enter"
 WITH INHERIT NOLOGIN;
 
-GRANT SELECT ON recon_payee 
+GRANT SELECT ON recon_payee, cr_coa_to_account 
 TO "lsmb_<?lsmb dbname ?>__reconciliation_enter";
 
 GRANT UPDATE ON cr_report TO "lsmb_<?lsmb dbname ?>__reconciliation_enter";

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