X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=56d4312f5fb1c2fa0a40f4679ade924faf5d8770;hb=c82cbc67f22454e4afd30e53c40043b54a732be3;hp=5908ee5770354320253b5203a8dd99a5d65d49b2;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git
diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index 5908ee57..56d4312f 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -17,44 +17,38 @@ include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 500);
page(_($help_context = "Customer Allocations"), false, false, "", $js);
//--------------------------------------------------------------------------------
start_form();
- /* show all outstanding receipts and credits to be allocated */
+/* show all outstanding receipts and credits to be allocated */
- if (!isset($_POST['customer_id']))
- $_POST['customer_id'] = get_global_customer();
+if (!isset($_POST['customer_id']))
+ $_POST['customer_id'] = get_global_customer();
- echo "
" . _("Select a customer: ") . " ";
- echo customer_list('customer_id', $_POST['customer_id'], true, true);
- echo "
";
- check(_("Show Settled Items:"), 'ShowSettled', null, true);
- echo "
";
+echo "" . _("Select a customer: ") . " ";
+echo customer_list('customer_id', $_POST['customer_id'], true, true);
+echo "
";
+check(_("Show Settled Items:"), 'ShowSettled', null, true);
+echo "
";
- set_global_customer($_POST['customer_id']);
+set_global_customer($_POST['customer_id']);
- if (isset($_POST['customer_id']) && ($_POST['customer_id'] == ALL_TEXT))
- {
- unset($_POST['customer_id']);
- }
-
- /*if (isset($_POST['customer_id'])) {
- $custCurr = get_customer_currency($_POST['customer_id']);
- if (!is_company_currency($custCurr))
- echo _("Customer Currency:") . $custCurr;
- }*/
+if (isset($_POST['customer_id']) && ($_POST['customer_id'] == ALL_TEXT))
+{
+ unset($_POST['customer_id']);
+}
- $settled = false;
- if (check_value('ShowSettled'))
- $settled = true;
+$settled = false;
+if (check_value('ShowSettled'))
+ $settled = true;
- $customer_id = null;
- if (isset($_POST['customer_id']))
- $customer_id = $_POST['customer_id'];
+$customer_id = null;
+if (isset($_POST['customer_id']))
+ $customer_id = $_POST['customer_id'];
//--------------------------------------------------------------------------------
function systype_name($dummy, $type)
@@ -76,9 +70,14 @@ function alloc_link($row)
.$row["trans_no"] . "&trans_type=" . $row["type"]. "&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
}
+function amount_total($row)
+{
+ return price_format($row['type'] == ST_JOURNAL && $row["Total"] < 0 ? -$row["Total"] : $row["Total"]);
+}
+
function amount_left($row)
{
- return price_format($row["Total"]-$row["alloc"]);
+ return price_format(($row['type'] == ST_JOURNAL && $row["Total"] < 0 ? -$row["Total"] : $row["Total"])-$row["alloc"]);
}
function check_settled($row)
@@ -91,12 +90,12 @@ $sql = get_allocatable_from_cust_sql($customer_id, $settled);
$cols = array(
_("Transaction Type") => array('fun'=>'systype_name'),
- _("#") => array('fun'=>'trans_view'),
+ _("#") => array('fun'=>'trans_view', 'align'=>'right'),
_("Reference"),
_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
_("Customer") => array('ord'=>''),
_("Currency") => array('align'=>'center'),
- _("Total") => 'amount',
+ _("Total") => array('align'=>'right','fun'=>'amount_total'),
_("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'),
array('insert'=>true, 'fun'=>'alloc_link')
);
@@ -115,4 +114,3 @@ display_db_pager($table);
end_form();
end_page();
-?>
\ No newline at end of file