From d6f5e7b43d9d0adba0f6161dbdd7f07985b25bd4 Mon Sep 17 00:00:00 2001
From: aurynn_cmd <aurynn_cmd@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Tue, 1 Jul 2008 20:30:05 +0000
Subject: Bulk updarte for the entirety of Reconciliation code to date. All
 code, SQL, and templates as provided.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2180 4979c152-3d1c-0410-bac9-87ea11338e46
---
 LedgerSMB/AA.pm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'LedgerSMB/AA.pm')

diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index d5d8a1fe..93e64e61 100644
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -311,9 +311,14 @@ sub post_transaction {
         # 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 ), ?)|;
-- 
cgit v1.2.3