X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fallocations%2Fsupplier_allocation_main.php;h=69be12080bf6e6ce0d782f699b22879366db9c07;hb=f894cd3d6fd2f6875382e5cd33020fb14245aa90;hp=4e9ca586057476a0a2ff5a4ebdfae81d44898558;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git
diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php
index 4e9ca586..69be1208 100644
--- a/purchasing/allocations/supplier_allocation_main.php
+++ b/purchasing/allocations/supplier_allocation_main.php
@@ -1,7 +1,17 @@
.
+***********************************************************************/
$path_to_root="../..";
$page_security = 3;
+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");
@@ -16,11 +26,17 @@ if ($use_popup_windows)
page(_("Supplier Allocations"), false, false, "", $js);
//--------------------------------------------------------------------------------
+if ($ret = context_restore()) {
+ if(isset($ret['supplier_id']))
+ $_POST['supplier_id'] = $ret['supplier_id'];
+}
+if (isset($_POST['_supplier_id_editor'])) {
+ context_call($path_to_root.'/purchasing/manage/suppliers.php?supplier_id='.$_POST['supplier_id'] );
+}
-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 */
@@ -37,7 +53,7 @@ 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()))
@@ -48,70 +64,74 @@ 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);
+//--------------------------------------------------------------------------------
+function systype_name($dummy, $type)
+{
+ return systypes::name($type);
+}
- 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);
+function trans_view($trans)
+{
+ return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
- $k = 0; //row colour counter
- $has_settled_items = false;
+function alloc_link($row)
+{
+ return pager_link(_("Allocate"),
+ "/purchasing/allocations/supplier_allocate.php?trans_no="
+ .$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY );
+}
- 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 amount_left($row)
+{
+ return -$row["Total"]-$row["alloc"];
+}
- end_table();
+function amount_total($row)
+{
+ return -$row["Total"];
+}
- if ($has_settled_items)
- display_note(_("Marked items are settled."), 0, 1, "class='settledfg'");
+function check_settled($row)
+{
+ return $row['settled'] == 1;
+}
- if (db_num_rows($trans_items) == 0)
- display_note(_("There are no allocations to be done."), 1, 2);
- end_form();
+$sql = get_allocatable_from_supp_sql($supplier_id, $settled);
+
+$cols = array(
+ _("Transaction Type") => array('fun'=>'systype_name'),
+ _("#") => array('fun'=>'trans_view'),
+ _("Reference"),
+ _("Date") => array('type'=>'date', 'ord'=>'asc'),
+ _("Supplier") => 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')
+ );
+
+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');
-display_allocatable_transactions();
+if (get_post('_ShowSettled_update') || get_post('_supplier_id_update') ) {
+ $table->set_sql($sql);
+ $table->set_columns($cols);
+}
+start_form();
-//--------------------------------------------------------------------------------
+display_db_pager($table);
+end_form();
end_page();
-
?>
\ No newline at end of file