SF.net SVN: ledger-smb: [1426] branches/1.2/LedgerSMB/IR.pm

[..hidden..]

Revision: 1426
          http://svn.sourceforge.net/ledger-smb/?rev=1426&view=rev
Author:   einhverfr
Date:     2007-07-18 19:56:07 -0700 (Wed, 18 Jul 2007)

Log Message:
-----------
Correcting a double-application of a patch

Modified Paths:
--------------
    branches/1.2/LedgerSMB/IR.pm

Modified: branches/1.2/LedgerSMB/IR.pm
===================================================================
--- branches/1.2/LedgerSMB/IR.pm	2007-07-18 20:44:53 UTC (rev 1425)
+++ branches/1.2/LedgerSMB/IR.pm	2007-07-19 02:56:07 UTC (rev 1426)
@@ -298,7 +298,6 @@
                         last if ( ( $totalqty -= $qty ) >= 0 );
             	    }
  		} else {
- 		    # start patch bug 1755355 ###############################################################################
  		    # check for unallocated entries atthe same price to match our entry
  		    $query = qq|
  		                SELECT i.id, i.qty, i.allocated, a.transdate
@@ -318,27 +317,6 @@
  		        $allocated += $qty;
  		        last if ( ( $totalqty -= $qty ) <= 0 );
  		    }
- 		} else {
- 		    # start patch bug 1755355 ###############################################################################
- 		    # check for unallocated entries atthe same price to match our entry
- 		    $query = qq|
- 		                SELECT i.id, i.qty, i.allocated, a.transdate
- 		                FROM invoice i
- 		                JOIN parts p ON (p.id = i.parts_id)
- 		                JOIN ap a ON (a.id = i.trans_id)
- 		                WHERE i.parts_id = ? AND (i.qty + i.allocated) > 0 AND i.sellprice = ?
- 		                ORDER BY transdate|;
-                     $sth = $dbh->prepare($query);
- 		    $sth->execute( $form->{"id_$i"}, $form->{"sellprice_$i"}) || $form->dberror($query);
- 		    while ( my $ref = $sth->fetchrow_hashref(NAME_lc) ) {
- 			$form->db_parse_numeric(sth=>$sth, hashref => $ref);
- 		        my $qty = $ref->{qty} + $ref->{allocated};
- 		        if ( ( $qty - $totalqty ) > 0 ) { $qty = $totalqty; }
- 		        # update allocated for sold item
- 			$form->update_balance( $dbh, "invoice", "allocated", qq|id = $ref->{id}|, $qty * -1 );
- 		        $allocated += $qty;
- 		        last if ( ( $totalqty -= $qty ) <= 0 );
- 		    }
                 }
 
         	# add purchase to inventory


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