include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Customer Inquiry"), false, false, "", $js);
+page(_("Customer Transactions"), false, false, "", $js);
if (isset($_GET['customer_id']))
if (!isset($_POST['filterType']))
$_POST['filterType'] = 0;
-cust_allocations_list_cells(null, 'filterType', $_POST['filterType']);
+cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
submit_cells('Refresh Inquiry', _("Search"));
$sql = "SELECT ".TB_PREF."debtor_trans.*,
".TB_PREF."debtors_master.name AS CustName, ".TB_PREF."debtors_master.curr_code AS CustCurrCode,
- (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount)
+ (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
+ .TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
((".TB_PREF."debtor_trans.type = 10)
AND ".TB_PREF."debtor_trans.due_date < '" . date2sql(Today()) . "') AS OverDue
{
$sql .= " AND ".TB_PREF."debtor_trans.type = 11 ";
}
+ elseif ($_POST['filterType'] == '5')
+ {
+ $sql .= " AND ".TB_PREF."debtor_trans.type = 13 ";
+ }
if ($_POST['filterType'] == '2')
{
$today = date2sql(Today());
$sql .= " AND ".TB_PREF."debtor_trans.due_date < '$today'
- AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc > 0) ";
+ AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
+ .TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_freight + "
+ .TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc > 0) ";
}
}
- $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date";
+ $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date DESC,
+ ".TB_PREF."debtor_trans.type,".TB_PREF."debtor_trans.trans_no ";
return db_query($sql,"No transactions were returned");
}
start_table("$table_style width='80%'");
-if ($_POST['customer_id'] == reserved_words::get_all())
$th = array(_("Type"), _("#"), _("Order"), _("Reference"), _("Date"), _("Due Date"),
- _("Customer"), _("Branch"), _("Currency"), _("Debit"), _("Credit"), "", "");
-else
- $th = array(_("Type"), _("#"), _("Order"), _("Reference"), _("Date"), _("Due Date"),
- _("Branch"), _("Debit"), _("Credit"), "", "");
+ _("Customer"), _("Branch"), _("Currency"), _("Debit"), _("Credit"), "", "",""
+ /*,"" print */);
+
+if ($_POST['customer_id'] != reserved_words::get_all()) {
+ unset($th[6], $th[8]);
+}
+
table_header($th);
else
alt_table_row_color($k);
+ $edit_page='';
+ $due_date_str = '';
+ $credit_me_str = '';
+
+ switch($myrow['type']) {
+ case 10:
+ $due_date_str = sql2date($myrow["due_date"]);
+ /*Show a link to allow an invoice to be credited */
+ // only allow crediting if it's not been totally allocated
+ if ($myrow["TotalAmount"] - $myrow["Allocated"] > 0)
+ $credit_me_str = "<a href='$path_to_root/sales/customer_credit_invoice.php?InvoiceNumber=" . $myrow["trans_no"] . "'>" . _("Credit This") . "</a>";
+ $edit_page= $path_to_root.'/sales/customer_invoice.php?ModifyInvoice='
+ . $myrow['trans_no'];
+ break;
+
+ case 11:
+ if ($myrow['order_']==0) // free-hand credit note
+ $edit_page= $path_to_root.'/sales/credit_note_entry.php?ModifyCredit='
+ . $myrow['trans_no'];
+ else // credit invoice
+ $edit_page= $path_to_root.'/sales/customer_credit_invoice.php?ModifyCredit='
+ . $myrow['trans_no'];
+ break;
+
+ case 13:
+ $edit_page= $path_to_root.'/sales/customer_delivery.php?ModifyDelivery='
+ . $myrow['trans_no']; break;
+ }
+
$date = sql2date($myrow["tran_date"]);
if ($myrow["order_"] > 0)
$gl_trans_str = get_gl_view_str_cell($myrow["type"], $myrow["trans_no"]);
- $credit_me_str = "";
-
- $credit_invoice_str = "<a href='$path_to_root/sales/customer_credit_invoice.php?InvoiceNumber=" . $myrow["trans_no"] . "'>" . _("Credit This") . "</a>";
-
- $due_date_str = "";
+// $print_str = "<a href='$path_to_root/reporting/print_invoice.php?InvoiceNumber=" . $myrow["trans_no"] . "'>" . _("Print") . "</a>";
- if ($myrow["type"] == 10)
- $due_date_str = sql2date($myrow["due_date"]);
-
- if ($myrow["type"] == 10)
- {
- /*Show a link to allow an invoice to be credited */
- // only allow crediting if it's not been totally allocated
- if ($myrow["TotalAmount"] - $myrow["Allocated"] > 0)
- $credit_me_str = $credit_invoice_str;
- }
$branch_name = "";
if ($myrow["branch_code"] > 0)
label_cell($branch_name);
if ($_POST['customer_id'] == reserved_words::get_all())
label_cell($myrow["CustCurrCode"]);
- display_debit_or_credit_cells($myrow["TotalAmount"]);
+ display_debit_or_credit_cells(
+ $myrow['type']==11 || $myrow['type']==12 ?
+ -$myrow["TotalAmount"] : $myrow["TotalAmount"]);
+
echo $gl_trans_str;
+
+ label_cell($edit_page=='' ? '' : "<a href='$edit_page'>" . _('Edit') . '</a>');
+// label_cell(print_document_link($myrow['trans_no'], _("Print")));
+
if ($credit_me_str != "")
label_cell($credit_me_str, "nowrap");
+ else
+ label_cell('');
-
+// if ($myrow["type"] == 10)
+// label_cell($print_str, 'nowrap');
+// else
+// label_cell('');
+
end_row();
$j++;
- If ($j == 12)
+ if ($j == 12)
{
$j = 1;
table_header($th);
- }
-//end of page full new headings if
-}
-//end of while loop
+ } //end of page full new headings if
+} //end of transaction while loop
end_table(1);
projects / fa-stable.git / blobdiff