include_once($path_to_root . "/sales/includes/sales_db.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
-if (!@$_GET['popup'])
-{
- $js = "";
- if ($use_popup_windows)
- $js .= get_js_open_window(900, 500);
- if ($use_date_picker)
- $js .= get_js_date_picker();
- page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
-}
+$js = "";
+if ($SysPrefs->use_popup_windows)
+ $js .= get_js_open_window(900, 500);
+if (user_use_date_picker())
+ $js .= get_js_date_picker();
+page(_($help_context = "Customer Transactions"), isset($_GET['customer_id']), false, "", $js);
if (isset($_GET['customer_id']))
{
//------------------------------------------------------------------------------------------------
-if (!@$_GET['popup'])
- start_form();
+start_form();
if (!isset($_POST['customer_id']))
$_POST['customer_id'] = get_global_customer();
start_table(TABLESTYLE_NOBORDER);
start_row();
-if (!@$_GET['popup'])
- customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, !@$_GET['popup']);
+if (!$page_nested)
+ customer_list_cells(_("Select a customer: "), 'customer_id', null, true, false, false, true);
-date_cells(_("From:"), 'TransAfterDate', '', null, -30);
-date_cells(_("To:"), 'TransToDate', '', null, 1);
+date_cells(_("From:"), 'TransAfterDate', '', null, -user_transaction_days());
+date_cells(_("To:"), 'TransToDate', '', null);
if (!isset($_POST['filterType']))
$_POST['filterType'] = 0;
$pastdue1 = $past1 + 1 . "-" . $past2 . " " . _('Days');
$pastdue2 = _('Over') . " " . $past2 . " " . _('Days');
- start_table(TABLESTYLE, "width=80%");
+ start_table(TABLESTYLE, "width='80%'");
$th = array(_("Currency"), _("Terms"), _("Current"), $nowdue,
$pastdue1, $pastdue2, _("Total Balance"));
table_header($th);
return get_gl_view_str($row["type"], $row["trans_no"]);
}
-function fmt_debit($row)
-{
- $value =
- $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT ?
- -$row["TotalAmount"] : $row["TotalAmount"];
- return $value>=0 ? price_format($value) : '';
-
-}
-
-function fmt_credit($row)
+function fmt_amount($row)
{
$value =
- !($row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT) ?
+ $row['type']==ST_CUSTCREDIT || $row['type']==ST_CUSTPAYMENT || $row['type']==ST_BANKDEPOSIT || $row['type']==ST_JOURNAL ?
-$row["TotalAmount"] : $row["TotalAmount"];
- return $value>0 ? price_format($value) : '';
+ return price_format($value);
}
function credit_link($row)
{
- if (@$_GET['popup'])
+ global $page_nested;
+
+ if ($page_nested)
return '';
return $row['type'] == ST_SALESINVOICE && $row["Outstanding"] > 0 ?
pager_link(_("Credit This") ,
function edit_link($row)
{
- $str = '';
+ global $page_nested;
- if (@$_GET['popup'])
+ $str = '';
+ if ($page_nested)
return '';
- switch($row['type']) {
- case ST_SALESINVOICE:
- if (get_voided_entry(ST_SALESINVOICE, $row["trans_no"]) === false && $row['Allocated'] == 0)
- $str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no'];
- break;
- case ST_CUSTCREDIT:
- if (get_voided_entry(ST_CUSTCREDIT, $row["trans_no"]) === false && $row['Allocated'] == 0) // 2008-11-19 Joe Hunt
- {
- if ($row['order_']==0) // free-hand credit note
- $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no'];
- else // credit invoice
- $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no'];
- }
- break;
- case ST_CUSTDELIVERY:
- if (get_voided_entry(ST_CUSTDELIVERY, $row["trans_no"]) === false)
- $str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no'];
- break;
- case ST_CUSTPAYMENT:
- if (get_voided_entry(ST_CUSTPAYMENT, $row["trans_no"]) === false)
- $str = "/sales/customer_payments.php?trans_no=".$row['trans_no'];
- break;
- }
- if ($str != "" && !is_closed_trans($row['type'], $row["trans_no"]))
- return pager_link(_('Edit'), $str, ICON_EDIT);
- return '';
+
+ return $row['type'] == ST_CUSTCREDIT && $row['order_'] ? '' : // allow only free hand credit notes edition
+ trans_editor_link($row['type'], $row['trans_no']);
}
function prt_link($row)
return print_document_link($row['trans_no']."-".$row['type'], _("Print Receipt"), true, ST_CUSTPAYMENT, ICON_PRINT);
elseif ($row['type'] == ST_BANKPAYMENT) // bank payment printout not defined yet.
return '';
- else
+ else
return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
}
function check_overdue($row)
{
return $row['OverDue'] == 1
- && (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
+ && floatcmp($row["TotalAmount"], $row["Allocated"]) != 0;
}
//------------------------------------------------------------------------------------------------
-$sql = get_sql_for_customer_inquiry();
+$sql = get_sql_for_customer_inquiry(get_post('TransAfterDate'), get_post('TransToDate'),
+ get_post('customer_id'), get_post('filterType'));
//------------------------------------------------------------------------------------------------
-db_query("set @bal:=0");
+//db_query("set @bal:=0");
$cols = array(
_("Type") => array('fun'=>'systype_name', 'ord'=>''),
- _("#") => array('fun'=>'trans_view', 'ord'=>''),
- _("Order") => array('fun'=>'order_view'),
+ _("#") => array('fun'=>'trans_view', 'ord'=>'', 'align'=>'right'),
+ _("Order") => array('fun'=>'order_view', 'align'=>'right'),
_("Reference"),
_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'),
_("Due Date") => array('type'=>'date', 'fun'=>'due_date'),
_("Customer") => array('ord'=>''),
_("Branch") => array('ord'=>''),
_("Currency") => array('align'=>'center'),
- _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'),
- _("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'),
- _("RB") => array('align'=>'right', 'type'=>'amount'),
+ _("Amount") => array('align'=>'right', 'fun'=>'fmt_amount'),
+// _("RB") => array('align'=>'right', 'type'=>'amount'),
array('insert'=>true, 'fun'=>'gl_view'),
array('insert'=>true, 'fun'=>'credit_link'),
array('insert'=>true, 'fun'=>'edit_link'),
display_db_pager($table);
-if (!@$_GET['popup'])
-{
- end_form();
- end_page(@$_GET['popup'], false, false);
-}
-?>
+end_form();
+end_page();
projects / fa-stable.git / blobdiff