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

[..hidden..]

Revision: 4259
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=4259&view=rev
Author:   ehuelsmann
Date:     2012-01-08 21:58:07 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Fix sales orders showing up in Receive search results and vice versa.

Modified Paths:
--------------
    branches/1.3/LedgerSMB/OE.pm
    branches/1.3/bin/oe.pl

Modified: branches/1.3/LedgerSMB/OE.pm
===================================================================
--- branches/1.3/LedgerSMB/OE.pm	2012-01-08 21:35:21 UTC (rev 4258)
+++ branches/1.3/LedgerSMB/OE.pm	2012-01-08 21:58:07 UTC (rev 4259)
@@ -199,8 +199,9 @@
 			WHERE o.quotation = '0'
 			AND (p.inventory_accno_id > 0 OR p.assembly = '1')
 			AND oi.qty != oi.ship
+                        AND o.oe_class_id = ?
 			$department|;
-        @queryargs = @dptargs;    #reset @queryargs
+        @queryargs = ( $form->{oe_class_id} );
 
         if ( $warehouse_id && $form->{type} eq 'ship_order' ) {
             $query .= qq| 

Modified: branches/1.3/bin/oe.pl
===================================================================
--- branches/1.3/bin/oe.pl	2012-01-08 21:35:21 UTC (rev 4258)
+++ branches/1.3/bin/oe.pl	2012-01-08 21:58:07 UTC (rev 4259)
@@ -1199,6 +1199,7 @@
         $ordlabel      = $locale->text('Order Number');
         $ordnumber     = 'ordnumber';
         $employee      = $locale->text('Employee');
+        $form->{oe_class_id} = 2;
     }
 
     if ( $form->{type} eq 'generate_sales_order' ) {
@@ -1244,6 +1245,7 @@
         $ordlabel      = $locale->text('Order Number');
         $ordnumber     = 'ordnumber';
         $employee      = $locale->text('Salesperson');
+        $form->{oe_class_id} = 1;
     }
 
     if ( $form->{type} eq 'sales_quotation' ) {

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