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

[..hidden..]

Revision: 5685
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5685&view=rev
Author:   einhverfr
Date:     2013-03-12 08:06:27 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Fixing inventory activity report not showing descriptions

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/LedgerSMB/RP.pm

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680-5682
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524,5526,5528-5529,5533,5544-5546,5548-5549,5554-5555,5563,5565,5569,5576,5579,5589-5590,5597,5602-5603,5608,5610,5615,5617,5620,5622,5633-5634,5649-5650,5655-5657,5668,5670,5675,5677,5680-5682,5684

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-03-12 07:58:01 UTC (rev 5684)
+++ branches/1.3/Changelog	2013-03-12 08:06:27 UTC (rev 5685)
@@ -8,6 +8,7 @@
   in corner cases with no good solutions (Chris T)
 * R5680-1, (tentatively) fixes to shipping/invoice onhand numbers (Chris T)
 * Fixed customer search showing sales rather than billing addresses (Chris T)
+* Fixed parts descriptions not showing on inventory actibity report (Chris T)
 
 Changelog for 1.3.30
 * Documented behavior of Outstanding Summary report (Chris T, 3601314)


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680-5682
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524,5529,5548,5563,5565,5578-5579,5581,5583,5587,5590,5593,5595,5597,5608,5610,5612,5615,5617,5620,5622,5626,5633-5634,5649-5650,5652,5655,5668,5670,5675,5677,5680-5682,5684

Modified: branches/1.3/LedgerSMB/RP.pm
===================================================================
--- branches/1.3/LedgerSMB/RP.pm	2013-03-12 07:58:01 UTC (rev 5684)
+++ branches/1.3/LedgerSMB/RP.pm	2013-03-12 08:06:27 UTC (rev 5685)
@@ -71,8 +71,7 @@
     $where =~ s/^\s?AND/WHERE/;
 
     my $query = qq|
-		   SELECT min(p.description) AS description, 
-		          min(p.partnumber) AS partnumber, sum(
+		   SELECT p.description, p.partnumber, sum(
 		          CASE WHEN i.qty > 0 THEN i.qty ELSE 0 END) AS sold, 
 		          sum (CASE WHEN i.qty > 0 
 		                    THEN i.sellprice * i.qty 
@@ -87,7 +86,7 @@
 		LEFT JOIN ar ON (ar.id = i.trans_id)
 		LEFT JOIN ap ON (ap.id = i.trans_id)
 		   $where
-		 GROUP BY i.parts_id
+		 GROUP BY i.parts_id, p.partnumber, p.description
 		 ORDER BY $form->{sort_col}|;
     my $sth = $dbh->prepare($query) || $form->dberror($query);
     $sth->execute() || $form->dberror($query);

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