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

[..hidden..]

Revision: 3979
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3979&view=rev
Author:   einhverfr
Date:     2011-11-10 23:38:56 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
Upating changelog and merging Erik's fixes from trunk

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/OE.pm
    branches/1.3/LedgerSMB/PE.pm

Property Changed:
----------------
    branches/1.3/LedgerSMB/OE.pm
    branches/1.3/LedgerSMB/PE.pm

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-10 23:02:58 UTC (rev 3978)
+++ branches/1.3/Changelog	2011-11-10 23:38:56 UTC (rev 3979)
@@ -6,7 +6,13 @@
 * Fixing Menu and Permissions bug 3430820 (Chris T)
 * Fixing permissions bug 3433644 (Chris T)
 * Fixing file not found printing HTML invoice (Chris T)
+* Corrected join issues in generating sales orders (Erik H)
+* Removed commits in child subroutines (Herman V)
 
+Chris T is Chris Travers
+Erik H is Erik Huelsmann
+Herman V is Herman Vierendeels
+
 Changelog for LedgerSMB 1.3.4
 * Corrected case matching error in upgrade script (Chris T)
 * Corrected version number on new databases (Chris T)

Modified: branches/1.3/LedgerSMB/OE.pm
===================================================================
--- branches/1.3/LedgerSMB/OE.pm	2011-11-10 23:02:58 UTC (rev 3978)
+++ branches/1.3/LedgerSMB/OE.pm	2011-11-10 23:38:56 UTC (rev 3979)
@@ -364,7 +364,7 @@
     }
     my $did_insert = 0;
     if ( !$form->{id} ) {
-        $query = qq|SELECT nextval('id')|;
+        $query = qq|SELECT nextval('oe_id_seq')|;
         $sth   = $dbh->prepare($query);
         $sth->execute || $form->dberror($query);
         ( $form->{id} ) = $sth->fetchrow_array;


Property changes on: branches/1.3/LedgerSMB/OE.pm
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/LedgerSMB/OE.pm:3711-3978

Modified: branches/1.3/LedgerSMB/PE.pm
===================================================================
--- branches/1.3/LedgerSMB/PE.pm	2011-11-10 23:02:58 UTC (rev 3978)
+++ branches/1.3/LedgerSMB/PE.pm	2011-11-10 23:38:56 UTC (rev 3979)
@@ -635,21 +635,21 @@
 
     $query = qq|
 		SELECT count(*)
-		  FROM customer
+		  FROM entity_credit_account
 		 WHERE $where|;
     my ($count) = $dbh->selectrow_array($query);
 
     if ( $count < $myconfig->{vclimit} ) {
         $query = qq|
 			SELECT id, name
-			  FROM customer
+			  FROM entity_credit_account
 			 WHERE $where|;
 
         if ( $form->{customer_id} ) {
             $query .= qq|
 				UNION 
 				SELECT id,name
-				  FROM customer
+				  FROM entity_credit_account
 				 WHERE id = | . $dbh->quote( $form->{customer_id} );
         }
 
@@ -1720,10 +1720,10 @@
     my $self  = shift @_;
     my $form  = shift @_;
     my $dbh   = $form->{dbh};
-    my $query = qq|SELECT curr FROM customer WHERE id = ?|;
-    my $sth   = $dbh->prepare($query);
-    $sth->execute( $form->{customer_id} );
-    my ($curr) = $sth->fetchrow_array;
+    my $query = qq|SELECT curr FROM entity_credit_account WHERE id = ?|;
+    my $sth   = $dbh->prepare($query) || $form->dberror($query);
+    $sth->execute( $form->{customer_id} ) || $form->dberror($query);
+    my ($curr) = $sth->fetchrow_array || $form->dberror($query);
     $form->{currency} = $curr;
 }
 
@@ -1838,9 +1838,8 @@
 		          p.partnumber
 		     FROM jcitems j
 		     JOIN project pr ON (pr.id = j.project_id)
-		     JOIN employee e ON (e.id = j.employee_id)
 		     JOIN parts p ON (p.id = j.parts_id)
-		LEFT JOIN entity_credit_account eca ON (c.id = pr.credit_id)
+		LEFT JOIN entity_credit_account eca ON (eca.id = pr.credit_id)
                 LEFT JOIN company c ON eca.entity_id = c.entity_id
 		    WHERE pr.parts_id IS NULL
 		          AND j.allocated != j.qty $where


Property changes on: branches/1.3/LedgerSMB/PE.pm
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/LedgerSMB/PE.pm:3711-3978

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