X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=47360922f77a5f1cbb46cf9a1bc7d59a0df25138;hb=510d6e1925c4d1621ae3efd85e117cc9bb4320f0;hp=55e32abb14809ffb99b55c6f06392e8cb9bc874c;hpb=0e484731f1e6036625f5f22a59be003d0b409ef2;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 55e32abb..47360922 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -1,7 +1,17 @@
.
+***********************************************************************/
+$page_security = 'SA_SUPPLIERALLOC';
+$path_to_root = "../..";
+include($path_to_root . "/includes/db_pager.inc");
include_once($path_to_root . "/includes/session.inc");
include_once($path_to_root . "/includes/date_functions.inc");
@@ -17,18 +27,9 @@ page(_("Supplier 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['supplier_id']))
$_POST['supplier_id'] = get_global_supplier();
@@ -37,10 +38,10 @@ function display_allocatable_transactions()
echo "
";
check(_("Show Settled Items:"), 'ShowSettled', null, true);
echo "
";
-
+ end_form();
set_global_supplier($_POST['supplier_id']);
- if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == reserved_words::get_all()))
+ if (isset($_POST['supplier_id']) && ($_POST['supplier_id'] == ALL_TEXT))
{
unset($_POST['supplier_id']);
}
@@ -48,73 +49,73 @@ function display_allocatable_transactions()
$settled = false;
if (check_value('ShowSettled'))
$settled = true;
-
$supplier_id = null;
if (isset($_POST['supplier_id']))
$supplier_id = $_POST['supplier_id'];
- $trans_items = get_allocatable_from_supp_transactions($supplier_id, $settled);
- div_start('alloc_tbl');
- start_table($table_style);
- if (!isset($_POST['supplier_id']))
- $th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"), _("Supplier"),
- _("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['supplier_id']))
- {
- label_cell($myrow["supp_name"]);
- label_cell($myrow["curr_code"]);
- }
- amount_cell(-$myrow["Total"]);
- amount_cell(-$myrow["Total"]-$myrow["alloc"]);
- label_cell("" . _("Allocate") . "");
- end_row();
- }
+//--------------------------------------------------------------------------------
+function systype_name($dummy, $type)
+{
+ global $systypes_array;
- end_table();
+ return $systypes_array[$type];
+}
- if ($has_settled_items)
- display_note(_("Marked items are settled."), 0, 1, "class='settledfg'");
+function trans_view($trans)
+{
+ return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
- if (db_num_rows($trans_items) == 0)
- display_note(_("There are no allocations to be done."), 1, 2);
- div_end();
- end_form();
+function alloc_link($row)
+{
+ return pager_link(_("Allocate"),
+ "/purchasing/allocations/supplier_allocate.php?trans_no="
+ .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY );
}
-//--------------------------------------------------------------------------------
+function amount_left($row)
+{
+ return price_format(-$row["Total"]-$row["alloc"]);
+}
-if (get_post('_ShowSettled_update')) {
- $Ajax->activate('alloc_tbl');
+function amount_total($row)
+{
+ return price_format(-$row["Total"]);
}
-display_allocatable_transactions();
-//--------------------------------------------------------------------------------
+function check_settled($row)
+{
+ return $row['settled'] == 1;
+}
-end_page();
+$sql = get_allocatable_from_supp_sql($supplier_id, $settled);
+
+$cols = array(
+ _("Transaction Type") => array('fun'=>'systype_name'),
+ _("#") => array('fun'=>'trans_view'),
+ _("Reference"),
+ _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
+ _("Supplier") => array('ord'=>''),
+ _("Currency") => array('align'=>'center'),
+ _("Total") => array('align'=>'right', 'fun'=>'amount_total'),
+ _("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'),
+ array('insert'=>true, 'fun'=>'alloc_link')
+ );
+
+if (isset($_POST['customer_id'])) {
+ $cols[_("Supplier")] = '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 = "80%";
+start_form();
+
+display_db_pager($table);
+
+end_form();
+end_page();
?>
\ No newline at end of file