X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fsupp_trans_db.inc;h=aa9490afc707e048723376ab87c05c1704a1fff1;hb=2f3375b4493c1b1e0b17c2801298275f22f8d76e;hp=7790798696ba0ab77b8a5491e1693bf8fd7fad89;hpb=f3d80f9786ca39bf7894bc8797f524e57fae2bbe;p=fa-stable.git diff --git a/purchasing/includes/db/supp_trans_db.inc b/purchasing/includes/db/supp_trans_db.inc index 77907986..aa9490af 100644 --- a/purchasing/includes/db/supp_trans_db.inc +++ b/purchasing/includes/db/supp_trans_db.inc @@ -131,7 +131,7 @@ function get_supp_payment_before($supplier_id, $date) . TB_PREF . "bank_trans," . TB_PREF . "bank_accounts " . "WHERE " - . TB_PREF . "supp_trans.supplier_id=" . $supplier_id . " " + . TB_PREF . "supp_trans.supplier_id='" . $supplier_id . "' " . "AND " . TB_PREF . "supp_trans.tran_date<'" . $date . "' " . "AND " . TB_PREF . "supp_trans.type=" . ST_SUPPAYMENT . " " . "AND " . TB_PREF . "supp_trans.trans_no=" . TB_PREF . "bank_trans.trans_no " @@ -258,6 +258,8 @@ function get_sql_for_supplier_inquiry($filter, $after_date, $to_date, $supplier_ else { $sql .= " AND trans.tran_date >= '$date_after' AND trans.tran_date <= '$date_to'"; + $sql2 .= " AND trans.delivery_date >= '$date_after' + AND trans.delivery_date <= '$date_to'"; } if ($supplier_id != ALL_TEXT) {