X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=5059735f6a9d8019d9992d488468e1e5d94e3273;hb=8d3c6352a53d725389de634469ca2383a4baa867;hp=ad03135337284fbcadd5dc73d1d688888f2089ab;hpb=f0f460043b9bcb6153c0f6f82d4a74433efe4ad8;p=fa-stable.git
diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index ad031353..5059735f 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -17,49 +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(_("Customer Allocations"), false, false, "", $js);
+page(_($help_context = "Customer Allocations"), false, false, "", $js);
//--------------------------------------------------------------------------------
start_form();
- /* show all outstanding receipts and credits to be allocated */
- /*Clear any previous allocation records */
- if (isset($_SESSION['alloc']))
- {
- unset($_SESSION['alloc']->allocs);
- unset($_SESSION['alloc']);
- }
- if (!isset($_POST['customer_id']))
- $_POST['customer_id'] = get_global_customer();
-
- echo "
" . _("Select a customer: ") . " ";
- customer_list('customer_id', $_POST['customer_id'], true, true);
- echo "
";
- check(_("Show Settled Items:"), 'ShowSettled', null, true);
- echo "
";
-
- 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;
- }*/
-
- $settled = false;
- if (check_value('ShowSettled'))
- $settled = true;
-
- $customer_id = null;
- if (isset($_POST['customer_id']))
- $customer_id = $_POST['customer_id'];
+/* show all outstanding receipts and credits to be allocated */
+
+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 "
";
+
+set_global_customer($_POST['customer_id']);
+
+if (isset($_POST['customer_id']) && ($_POST['customer_id'] == ALL_TEXT))
+{
+ unset($_POST['customer_id']);
+}
+
+$settled = false;
+if (check_value('ShowSettled'))
+ $settled = true;
+
+$customer_id = null;
+if (isset($_POST['customer_id']))
+ $customer_id = $_POST['customer_id'];
//--------------------------------------------------------------------------------
function systype_name($dummy, $type)
@@ -78,7 +67,7 @@ function alloc_link($row)
{
return pager_link(_("Allocate"),
"/sales/allocations/customer_allocate.php?trans_no="
- .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY);
+ .$row["trans_no"] . "&trans_type=" . $row["type"]. "&debtor_no=" . $row["debtor_no"], ICON_ALLOC);
}
function amount_left($row)
@@ -96,7 +85,7 @@ $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'=>''),
@@ -120,4 +109,3 @@ display_db_pager($table);
end_form();
end_page();
-?>
\ No newline at end of file