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

[..hidden..]

Revision: 3982
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3982&view=rev
Author:   einhverfr
Date:     2011-11-11 06:40:34 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
Corrected company name representation in timecard->sales order (Chris T)

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/PE.pm
    branches/1.3/bin/pe.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-11-11 02:24:51 UTC (rev 3981)
+++ branches/1.3/Changelog	2011-11-11 06:40:34 UTC (rev 3982)
@@ -10,6 +10,7 @@
 * Removed commits in child subroutines (Herman V)
 * Correcting warnings about HOME not set (Chris T)
 * Corrected debian-specific db creation issue (Pongracz I)
+* Corrected company name representation in timecard->sales order (Chris T)
 
 Chris T is Chris Travers
 Erik H is Erik Huelsmann

Modified: branches/1.3/LedgerSMB/PE.pm
===================================================================
--- branches/1.3/LedgerSMB/PE.pm	2011-11-11 02:24:51 UTC (rev 3981)
+++ branches/1.3/LedgerSMB/PE.pm	2011-11-11 06:40:34 UTC (rev 3982)
@@ -1834,7 +1834,7 @@
 		   SELECT j.id, j.description, j.qty - j.allocated AS qty,
 		          j.sellprice, j.parts_id, pr.credit_id as customer_id, 
 		          j.project_id, j.checkedin::date AS transdate, 
-		          j.notes, c.name AS customer, pr.projectnumber, 
+		          j.notes, c.legal_name AS customer, pr.projectnumber, 
 		          p.partnumber
 		     FROM jcitems j
 		     JOIN project pr ON (pr.id = j.project_id)
@@ -1844,12 +1844,11 @@
 		    WHERE pr.parts_id IS NULL
 		          AND j.allocated != j.qty $where
 		 ORDER BY pr.projectnumber, c.name, j.checkedin::date|;
-
     if ( $form->{summary} ) {
         $query =~ s/j\.description/p\.description/;
         $query =~ s/c\.name,/c\.name, j\.parts_id, /;
     }
-
+    
     $sth = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
 

Modified: branches/1.3/bin/pe.pl
===================================================================
--- branches/1.3/bin/pe.pl	2011-11-11 02:24:51 UTC (rev 3981)
+++ branches/1.3/bin/pe.pl	2011-11-11 06:40:34 UTC (rev 3982)
@@ -2571,7 +2571,6 @@
     # flatten array
     $i = 1;
     foreach $ref ( @{ $form->{jcitems} } ) {
-
         if ( $form->{summary} ) {
 
             $thisitem =

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