X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_allocation_inquiry.php;h=252e961154d203d08386a0b17d575e2eca3e0704;hb=f48dce88b74eb81e3398d9f36eee19394c4f023c;hp=51749f2cc1c50c7d70df628e167b1683c15f72af;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index 51749f2c..252e9611 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -98,7 +98,7 @@ function alloc_link($row) "/sales/allocations/customer_allocate.php?trans_no=" . $row["trans_no"] ."&trans_type=" . $row["type"], ICON_MONEY); - if ($row["type"] == 11 && $row['TotalAmount'] > 0) + if ($row["type"] == ST_CUSTCREDIT && $row['TotalAmount'] > 0) { /*its a credit note which could have an allocation */ return $link; @@ -119,7 +119,7 @@ function alloc_link($row) function fmt_debit($row) { $value = - $row['type']==11 || $row['type']==12 || $row['type']==2 ? + $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ? -$row["TotalAmount"] : $row["TotalAmount"]; return $value>=0 ? price_format($value) : ''; @@ -128,7 +128,7 @@ function fmt_debit($row) function fmt_credit($row) { $value = - !($row['type']==11 || $row['type']==12 || $row['type']==2) ? + !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ? -$row["TotalAmount"] : $row["TotalAmount"]; return $value>0 ? price_format($value) : ''; } @@ -149,7 +149,7 @@ function fmt_credit($row) (trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax + trans.ov_discount) AS TotalAmount, trans.alloc AS Allocated, - ((trans.type = 10) + ((trans.type = ".ST_SALESINVOICE.") AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue FROM " .TB_PREF."debtor_trans as trans, " @@ -167,7 +167,7 @@ function fmt_credit($row) { if ($_POST['filterType'] == '1' || $_POST['filterType'] == '2') { - $sql .= " AND trans.type = 10 "; + $sql .= " AND trans.type = ".ST_SALESINVOICE." "; } elseif ($_POST['filterType'] == '3') { @@ -175,7 +175,7 @@ function fmt_credit($row) } elseif ($_POST['filterType'] == '4') { - $sql .= " AND trans.type = 11 "; + $sql .= " AND trans.type = ".ST_CUSTCREDIT." "; } if ($_POST['filterType'] == '2') @@ -188,7 +188,7 @@ function fmt_credit($row) } }else { - $sql .= " AND trans.type != 13 "; + $sql .= " AND trans.type <> ".ST_CUSTDELIVERY." "; } @@ -224,10 +224,6 @@ if ($_POST['customer_id'] != ALL_TEXT) { $table =& new_db_pager('doc_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if (get_post('RefreshInquiry')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "80%"; start_form();