[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

SF.net SVN: ledger-smb:[6431] trunk/LedgerSMB/PE.pm



Revision: 6431
          http://sourceforge.net/p/ledger-smb/code/6431
Author:   einhverfr
Date:     2014-01-10 09:55:06 +0000 (Fri, 10 Jan 2014)
Log Message:
-----------
time card to sales order generation now works

Modified Paths:
--------------
    trunk/LedgerSMB/PE.pm

Modified: trunk/LedgerSMB/PE.pm
===================================================================
--- trunk/LedgerSMB/PE.pm	2014-01-10 09:51:41 UTC (rev 6430)
+++ trunk/LedgerSMB/PE.pm	2014-01-10 09:55:06 UTC (rev 6431)
@@ -909,17 +909,18 @@
     $query = qq|
 		   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.legal_name AS customer, pr.projectnumber, 
+		          j.business_unit_id as project_id, 
+                          j.checkedin::date AS transdate, 
+		          j.notes, c.legal_name AS customer, 
+                          pr.description as projectnumber, 
 		          p.partnumber
 		     FROM jcitems j
-		     JOIN project pr ON (pr.id = j.project_id)
+		     JOIN business_unit pr ON (pr.id = j.business_unit_id)
 		     JOIN parts p ON (p.id = j.parts_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
-		 ORDER BY pr.projectnumber, c.legal_name, j.checkedin::date|;
+		    WHERE j.allocated != j.qty $where
+		 ORDER BY pr.description, c.legal_name, j.checkedin::date|;
     if ( $form->{summary} ) {
         $query =~ s/j\.description/p\.description/;
         $query =~ s/c\.name,/c\.name, j\.parts_id, /;

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


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits