X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=ef40147e2a8490753961653b0d1d4e1ab9e15b3b;hb=6f354d9b19615a82d948e0f6e5ef003cd1859c31;hp=4ba875bd9524161fa9ab081e0223281a28cbe007;hpb=e000d0b3fb245b02de604356b1f60c65b5f4962f;p=fa-stable.git
diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index 4ba875bd..ef40147e 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_SALESALLOC';
+$path_to_root = "../..";
include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
@@ -10,37 +19,25 @@ include_once($path_to_root . "/sales/includes/sales_db.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
-page(_("Customer Allocations"), false, false, "", $js);
+page(_($help_context = "Customer Allocations"), false, false, "", $js);
//--------------------------------------------------------------------------------
-if ($ret = context_restore()) {
- if(isset($ret['customer_id']))
- $_POST['customer_id'] = $ret['customer_id'];
-}
-if (isset($_POST['_customer_id_editor'])) {
- context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'] );
-}
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']))
+
+ 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 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'] == reserved_words::get_all()))
+ if (isset($_POST['customer_id']) && ($_POST['customer_id'] == ALL_TEXT))
{
unset($_POST['customer_id']);
}
@@ -62,7 +59,9 @@ start_form();
//--------------------------------------------------------------------------------
function systype_name($dummy, $type)
{
- return systypes::name($type);
+ global $systypes_array;
+
+ return $systypes_array[$type];
}
function trans_view($trans)
@@ -74,13 +73,12 @@ function alloc_link($row)
{
return pager_link(_("Allocate"),
"/sales/allocations/customer_allocate.php?trans_no="
- .$row["trans_no"] . "&trans_type=" . $row["type"]
- );
+ .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY);
}
function amount_left($row)
{
- return $row["Total"]-$row["alloc"];
+ return price_format($row["Total"]-$row["alloc"]);
}
function check_settled($row)
@@ -95,7 +93,7 @@ $cols = array(
_("Transaction Type") => array('fun'=>'systype_name'),
_("#") => array('fun'=>'trans_view'),
_("Reference"),
- _("Date") => array('type'=>'date', 'ord'=>'asc'),
+ _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
_("Customer") => array('ord'=>''),
_("Currency") => array('align'=>'center'),
_("Total") => 'amount',
@@ -111,10 +109,7 @@ if (isset($_POST['customer_id'])) {
$table =& new_db_pager('alloc_tbl', $sql, $cols);
$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
-if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) {
- $table->set_sql($sql);
- $table->set_columns($cols);
-}
+$table->width = "75%";
display_db_pager($table);
end_form();