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

[..hidden..]

Revision: 5237
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5237&view=rev
Author:   einhverfr
Date:     2012-11-22 03:20:36 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
Fixing pricematrix rows not showing where pricegroups are used on parts screen

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/IC.pm
    branches/1.3/sql/modules/Roles.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-11-22 02:31:39 UTC (rev 5236)
+++ branches/1.3/Changelog	2012-11-22 03:20:36 UTC (rev 5237)
@@ -4,6 +4,8 @@
 
 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)

Modified: branches/1.3/LedgerSMB/IC.pm
===================================================================
--- branches/1.3/LedgerSMB/IC.pm	2012-11-22 02:31:39 UTC (rev 5236)
+++ branches/1.3/LedgerSMB/IC.pm	2012-11-22 03:20:36 UTC (rev 5237)
@@ -231,7 +231,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);
@@ -590,6 +590,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: branches/1.3/sql/modules/Roles.sql
===================================================================
--- branches/1.3/sql/modules/Roles.sql	2012-11-22 02:31:39 UTC (rev 5236)
+++ branches/1.3/sql/modules/Roles.sql	2012-11-22 03:20:36 UTC (rev 5237)
@@ -575,7 +575,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.