diff options
| author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-07-01 20:56:40 +0000 |
|---|---|---|
| committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2008-07-01 20:56:40 +0000 |
| commit | d84bdb1bda86929356d218117c4992ab66f2246e (patch) | |
| tree | 543ab9546e0c43e895b68911ced4a7000c2f0c45 /LedgerSMB | |
| parent | d6f5e7b43d9d0adba0f6161dbdd7f07985b25bd4 (diff) | |
Correcting conflict from Aurynn's commit
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2181 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'LedgerSMB')
| -rw-r--r-- | LedgerSMB/AA.pm | 5 |
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 ), ?)|; |