diff options
| -rw-r--r-- | LedgerSMB/AA.pm | 5 | ||||
| -rw-r--r-- | sql/modules/Voucher.sql | 1 |
2 files changed, 0 insertions, 6 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 ), ?)|; diff --git a/sql/modules/Voucher.sql b/sql/modules/Voucher.sql index 5c236ed5..f4a30595 100644 --- a/sql/modules/Voucher.sql +++ b/sql/modules/Voucher.sql @@ -231,7 +231,6 @@ BEGIN 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 |