ov_freight=".db_escape($Freight).", ov_freight_tax=$FreightTax, rate=$rate,
ship_via=".db_escape($ship_via).", alloc=$AllocAmt,
dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).",
- payment_terms=".db_escape($payment_terms).",
- tax_included=".db_escape($tax_included)."
+ payment_terms=".db_escape($payment_terms, true).",
+ tax_included=".db_escape($tax_included).",
prep_amount =".db_escape($prep_amount)."
WHERE trans_no=".db_escape($trans_no)." AND type=".db_escape($trans_type);
}
."cust.name AS DebtorName, cust.address, "
."cust.curr_code, "
."cust.tax_id,
- trans.prep_amount>0 as prepaid";
+ trans.prep_amount>0 as prepaid,"
+ ."com.memo_";
- if ($trans_type == ST_CUSTPAYMENT) {
+ if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
// it's a payment so also get the bank account
// Chaitanya : Added bank_act to support Customer Payment Edit
$sql .= ",bank_act,".TB_PREF."bank_accounts.bank_name, ".TB_PREF."bank_accounts.bank_account_name,
- ".TB_PREF."bank_accounts.account_type AS BankTransType ";
+ ".TB_PREF."bank_accounts.account_type AS BankTransType,
+ ".TB_PREF."bank_accounts.bank_curr_code,
+ ".TB_PREF."bank_trans.amount as bank_amount";
}
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
.TB_PREF."tax_groups.id AS tax_group_id ";
}
- $sql .= " FROM ".TB_PREF."debtor_trans trans, ".TB_PREF."debtors_master cust";
+ $sql .= " FROM ".TB_PREF."debtor_trans trans
+ LEFT JOIN ".TB_PREF."comments com ON trans.type=com.type AND trans.trans_no=com.id
+ LEFT JOIN ".TB_PREF."shippers ON ".TB_PREF."shippers.shipper_id=trans.ship_via,
+ ".TB_PREF."debtors_master cust";
- if ($trans_type == ST_CUSTPAYMENT) {
+ if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
// it's a payment so also get the bank account
$sql .= ", ".TB_PREF."bank_trans, ".TB_PREF."bank_accounts";
}
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
// it's an invoice so also get the shipper, salestypes
- $sql .= ", ".TB_PREF."shippers, "
- .TB_PREF."sales_types, "
+ $sql .= ", ".TB_PREF."sales_types, "
.TB_PREF."cust_branch branch, "
.TB_PREF."tax_groups ";
}
AND trans.type=".db_escape($trans_type)."
AND trans.debtor_no=cust.debtor_no";
- if ($trans_type == ST_CUSTPAYMENT) {
+ if ($trans_type == ST_CUSTPAYMENT || $trans_type == ST_BANKDEPOSIT) {
// it's a payment so also get the bank account
$sql .= " AND ".TB_PREF."bank_trans.trans_no =".db_escape($trans_id)."
AND ".TB_PREF."bank_trans.type=$trans_type
}
if ($trans_type == ST_SALESINVOICE || $trans_type == ST_CUSTCREDIT || $trans_type == ST_CUSTDELIVERY) {
// it's an invoice so also get the shipper
- $sql .= " AND ".TB_PREF."shippers.shipper_id=trans.ship_via
- AND ".TB_PREF."sales_types.id = trans.tpe
+ $sql .= " AND ".TB_PREF."sales_types.id = trans.tpe
AND branch.branch_code = trans.branch_code
AND branch.tax_group_id = ".TB_PREF."tax_groups.id ";
}
display_db_error("no debtor trans found for given params", $sql, true);
exit;
}
-
if (db_num_rows($result) > 1) {
// can't return multiple
if($go_debug)
//----------------------------------------------------------------------------------------
-function get_customer_trans_from_ref($type, $ref)
-{
- $sql = "SELECT trans_no FROM ".TB_PREF."debtor_trans WHERE type=".db_escape($type)."
- AND reference=".db_escape($ref);
-
- $result = db_query($sql, "Cannot retreive a debtor transaction");
-
- $row = db_fetch_row($result);
- return $row[0];
-}
-
-//----------------------------------------------------------------------------------------
-
// retreives the related sales order for a given trans
function get_customer_trans_order($type, $type_no)
}
//----------------------------------------------------------------------------------------
-
-function get_sql_for_customer_inquiry()
+function get_sql_for_customer_inquiry($from, $to, $cust_id = ALL_TEXT, $filter = ALL_TEXT)
{
- $date_after = date2sql($_POST['TransAfterDate']);
- $date_to = date2sql($_POST['TransToDate']);
+ $date_after = date2sql($from);
+ $date_to = date2sql($to);
$sql = "SELECT
trans.type,
debtor.curr_code,
(trans.ov_amount + trans.ov_gst + trans.ov_freight
+ trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, ";
- if ($_POST['filterType'] != ALL_TEXT)
+ if ($filter != ALL_TEXT)
$sql .= "@bal := @bal+(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount), ";
// else
AND trans.tran_date <= '$date_to'
AND trans.branch_code = branch.branch_code";
- if ($_POST['customer_id'] != ALL_TEXT)
- $sql .= " AND trans.debtor_no = ".db_escape($_POST['customer_id']);
+ if ($cust_id != ALL_TEXT)
+ $sql .= " AND trans.debtor_no = ".db_escape($cust_id);
- if ($_POST['filterType'] != ALL_TEXT)
+ if ($filter != ALL_TEXT)
{
- if ($_POST['filterType'] == '1')
+ if ($filter == '1')
{
$sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
}
- elseif ($_POST['filterType'] == '2')
+ elseif ($filter == '2')
{
$sql .= " AND (trans.type = ".ST_SALESINVOICE.") ";
}
- elseif ($_POST['filterType'] == '3')
+ elseif ($filter == '3')
{
$sql .= " AND (trans.type = " . ST_CUSTPAYMENT
." OR trans.type = ".ST_BANKDEPOSIT." OR trans.type = ".ST_BANKPAYMENT.") ";
}
- elseif ($_POST['filterType'] == '4')
+ elseif ($filter == '4')
{
$sql .= " AND trans.type = ".ST_CUSTCREDIT." ";
}
- elseif ($_POST['filterType'] == '5')
+ elseif ($filter == '5')
{
$sql .= " AND trans.type = ".ST_CUSTDELIVERY." ";
}
- if ($_POST['filterType'] == '2')
+ if ($filter == '2')
{
$today = date2sql(Today());
$sql .= " AND trans.due_date < '$today'
return $sql;
}
-function get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item=null)
+function get_sql_for_sales_deliveries_view($from, $to, $customer_id, $stock_item, $location, $delivery, $outstanding=false)
{
$sql = "SELECT trans.trans_no,
debtor.name,
AND trans.branch_code = branch.branch_code
AND trans.debtor_no = branch.debtor_no ";
- if ($_POST['OutstandingOnly'] == true) {
+ if ($outstanding == true) {
$sql .= " AND line.qty_done < line.quantity ";
}
//figure out the sql required from the inputs available
- if (isset($_POST['DeliveryNumber']) && $_POST['DeliveryNumber'] != "")
+ if ($delivery)
{
- $delivery = "%".$_POST['DeliveryNumber'];
- $sql .= " AND trans.trans_no LIKE ".db_escape($delivery);
+ $sql .= " AND trans.trans_no LIKE %".db_escape($delivery);
$sql .= " GROUP BY trans.trans_no";
}
else
{
- $sql .= " AND trans.tran_date >= '".date2sql($_POST['DeliveryAfterDate'])."'";
- $sql .= " AND trans.tran_date <= '".date2sql($_POST['DeliveryToDate'])."'";
+ $sql .= " AND trans.tran_date >= '".date2sql($from)."'";
+ $sql .= " AND trans.tran_date <= '".date2sql($to)."'";
- if ($selected_customer != -1)
- $sql .= " AND trans.debtor_no=".db_escape($selected_customer)." ";
+ if ($stock_item)
+ $sql .= " AND line.stock_id=".db_escape($stock_item)." ";
- if (isset($selected_stock_item))
- $sql .= " AND line.stock_id=".db_escape($selected_stock_item)." ";
+ if ($location != ALL_TEXT)
+ $sql .= " AND sorder.from_stk_loc = ".db_escape($location)." ";
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT)
- $sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation'])." ";
+ if ($customer_id != ALL_TEXT)
+ $sql .= " AND trans.debtor_no = ".db_escape($customer_id);
$sql .= " GROUP BY trans.trans_no ";
projects / fa-stable.git / blobdiff