From: Janusz Dobrowolski Date: Sun, 31 Jan 2010 22:12:52 +0000 (+0000) Subject: payment_tems retrieved from debtor_trans X-Git-Tag: v2.4.2~19^2~972 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=f2176954901fe9337bff19f2ff070f2f1d276e84;p=fa-stable.git payment_tems retrieved from debtor_trans --- diff --git a/reporting/rep102.php b/reporting/rep102.php index fc2457c4..70ed5671 100644 --- a/reporting/rep102.php +++ b/reporting/rep102.php @@ -50,7 +50,7 @@ function get_invoices($customer_id, $to) ".TB_PREF."debtor_trans WHERE ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY." - AND ".TB_PREF."debtors_master.payment_terms = ".TB_PREF."payment_terms.terms_indicator + AND ".TB_PREF."debtor_trans.payment_terms = ".TB_PREF."payment_terms.terms_indicator AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no AND ".TB_PREF."debtor_trans.debtor_no = $customer_id AND ".TB_PREF."debtor_trans.tran_date <= '$todate' diff --git a/reporting/rep108.php b/reporting/rep108.php index d5b1c022..dc5219d9 100644 --- a/reporting/rep108.php +++ b/reporting/rep108.php @@ -80,7 +80,7 @@ function print_statements() $rep->Info($params, $cols, null, $aligns); } - $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, email, curr_code, curdate() AS tran_date, payment_terms FROM ".TB_PREF."debtors_master"; + $sql = "SELECT debtor_no, name AS DebtorName, address, tax_id, email, curr_code, curdate() AS tran_date FROM ".TB_PREF."debtors_master"; if ($customer != ALL_NUMERIC) $sql .= " WHERE debtor_no = ".db_escape($customer); else