SF.net SVN: ledger-smb: [2181] trunk

[..hidden..]

Revision: 2181
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=2181&view=rev
Author:   einhverfr
Date:     2008-07-01 13:56:40 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
Correcting conflict from Aurynn's commit

Modified Paths:
--------------
    trunk/LedgerSMB/AA.pm
    trunk/sql/modules/Voucher.sql

Modified: trunk/LedgerSMB/AA.pm
===================================================================
--- trunk/LedgerSMB/AA.pm	2008-07-01 20:30:05 UTC (rev 2180)
+++ trunk/LedgerSMB/AA.pm	2008-07-01 20:56:40 UTC (rev 2181)
@@ -311,14 +311,9 @@
         # AR/AP Transaction.
         # ~A
         $query = qq|
-<<<<<<< .mine
-			INSERT INTO $table (invnumber, person_id)
-			     VALUES (?, (select e.id from person p, entity e, users u
-=======
 			INSERT INTO $table (invnumber, person_id, 
 				entity_credit_account)
 			     VALUES (?, (select e.id from person p, entity e, users u
->>>>>>> .r2156
 			                 where u.username = ?
 			                 AND e.id = u.entity_id
 			                 AND p.entity_id = e.id ), ?)|;

Modified: trunk/sql/modules/Voucher.sql
===================================================================
--- trunk/sql/modules/Voucher.sql	2008-07-01 20:30:05 UTC (rev 2180)
+++ trunk/sql/modules/Voucher.sql	2008-07-01 20:56:40 UTC (rev 2181)
@@ -231,7 +231,6 @@
 		FROM batch b
 		JOIN batch_class c ON (b.batch_class_id = c.id)
 		LEFT JOIN users u ON (u.entity_id = b.created_by)
-		JOIN voucher v ON (v.batch_id = b.id)
 		WHERE (c.id = in_class_id OR in_class_id IS NULL) AND 
 			(b.description LIKE 
 				'%' || in_description || '%' OR


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