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=20baf5cace8b7002ffda2d6527091886b8308ef3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index 20baf5ca..ef40147e 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -1,7 +1,17 @@
.
+***********************************************************************/
+$page_security = 'SA_SALESALLOC';
+$path_to_root = "../..";
+include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/sales/includes/sales_ui.inc");
@@ -9,34 +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);
//--------------------------------------------------------------------------------
-function display_allocatable_transactions()
-{
- global $table_style, $path_to_root;
- start_form();
-
+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']);
}
@@ -55,67 +56,63 @@ function display_allocatable_transactions()
if (isset($_POST['customer_id']))
$customer_id = $_POST['customer_id'];
- $trans_items = get_allocatable_from_cust_transactions($customer_id, $settled);
+//--------------------------------------------------------------------------------
+function systype_name($dummy, $type)
+{
+ global $systypes_array;
- start_table($table_style);
- if (!isset($_POST['customer_id']))
- $th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"), _("Customer"),
- _("Currency"), _("Total"), _("Left To Allocate"), "");
- else
- $th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"),
- _("Total"), _("Left To Allocate"), "");
- table_header($th);
- $k = 0; //row colour counter
- $has_settled_items = false;
-
- while ($myrow = db_fetch($trans_items))
- {
- if ($myrow["settled"] == 1)
- {
- start_row("class='settledbg'");
- $has_settled_items = true;
- }
- else
- {
- alt_table_row_color($k);
- }
-
- label_cell(systypes::name($myrow["type"]));
- label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
- label_cell($myrow["reference"]);
- label_cell(sql2date($myrow["tran_date"]));
-
- if (!isset($_POST['customer_id']))
- {
- label_cell($myrow["DebtorName"]);
- label_cell($myrow["curr_code"]);
- }
- amount_cell(-$myrow["Total"]);
- amount_cell(-$myrow["Total"] - $myrow["alloc"]);
- if (-$myrow["Total"] - $myrow["alloc"] != 0.0)
- label_cell("" . _("Allocate") . "");
- else
- label_cell("");
- end_row();
- }
+ return $systypes_array[$type];
+}
- end_table();
+function trans_view($trans)
+{
+ return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
- if ($has_settled_items)
- display_note(_("Marked items are settled."), 0, 1, "class='settledfg'");
+function alloc_link($row)
+{
+ return pager_link(_("Allocate"),
+ "/sales/allocations/customer_allocate.php?trans_no="
+ .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY);
+}
- if (db_num_rows($trans_items) == 0)
- display_note(_("There are no allocations to be done."), 1, 2);
+function amount_left($row)
+{
+ return price_format($row["Total"]-$row["alloc"]);
+}
- end_form();
+function check_settled($row)
+{
+ return $row['settled'] == 1;
}
-//--------------------------------------------------------------------------------
-display_allocatable_transactions();
+$sql = get_allocatable_from_cust_sql($customer_id, $settled);
-//--------------------------------------------------------------------------------
+$cols = array(
+ _("Transaction Type") => array('fun'=>'systype_name'),
+ _("#") => array('fun'=>'trans_view'),
+ _("Reference"),
+ _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
+ _("Customer") => array('ord'=>''),
+ _("Currency") => array('align'=>'center'),
+ _("Total") => 'amount',
+ _("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'),
+ array('insert'=>true, 'fun'=>'alloc_link')
+ );
-end_page();
+if (isset($_POST['customer_id'])) {
+ $cols[_("Customer")] = 'skip';
+ $cols[_("Currency")] = 'skip';
+}
+
+$table =& new_db_pager('alloc_tbl', $sql, $cols);
+$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
+$table->width = "75%";
+
+display_db_pager($table);
+end_form();
+
+end_page();
?>
\ No newline at end of file