summaryrefslogtreecommitdiff
path: root/LedgerSMB
diff options
context:
space:
mode:
Diffstat (limited to 'LedgerSMB')
-rw-r--r--LedgerSMB/AA.pm5
1 files changed, 0 insertions, 5 deletions
diff --git a/LedgerSMB/AA.pm b/LedgerSMB/AA.pm
index 93e64e61..d5d8a1fe 100644
--- a/LedgerSMB/AA.pm
+++ b/LedgerSMB/AA.pm
@@ -311,14 +311,9 @@ 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 ), ?)|;