Merge pull request ledgersmb#453 from einhverfr/1.3

Fixing 1241, join projection in invoice detail form (1.3-only)

Changelog

@@ -11,6 +11,7 @@ Changelog for 1.3.45
 * Quieted some of the test cases (Chris T)
 * Fixed bug 1244, manually entered tax crashes invoice on edit (Chris T)
 * Fixed bug 1251, some backports failing due to misplacing db cnx (Chris T)
+* Fixed bug 1241, join projection, amounts in invoice details report (Chris T)
 
 Chris T is Chris Travers
 

LedgerSMB/AA.pm

@@ -890,12 +890,12 @@ sub transactions {
 
     if ( !$form->{summary} and !$form->{outstanding} ) {
         $acc_trans_flds = qq|
-			, c.accno, ac.source,
-			p.projectnumber, ac.memo AS description,
-			ac.amount AS linetotal,
+			, c.accno, 
+			p.projectnumber, 
+                        ((1 - i.discount) * i.qty * i.sellprice) as linetotal, 
 			i.description AS linedescription|;
-        $group_by_fields = qq|, c.accno, ac.source, p.projectnumber, ac.memo,
-                              ac.amount, i.description |;
+        $group_by_fields = qq|, c.accno, p.projectnumber,
+                              i.discount, i.qty, i.sellprice, i.description |;
 
         $acc_trans_join = qq| 
 			     JOIN acc_trans ac ON (a.id = ac.trans_id)