X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=7995696d20ea86fece0aeb446d28b29022830315;hb=8f7ac519b7aaf8ec219862597e878d3a28316ac6;hp=7362010feb63790ffe008f450410ae063160c7c3;hpb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;p=fa-stable.git
diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 7362010f..7995696d 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -1,5 +1,14 @@
.
+***********************************************************************/
$page_security = 2;
$path_to_root="../..";
include($path_to_root . "/includes/db_pager.inc");
@@ -87,7 +96,7 @@ if (get_post('_DeliveryNumber_changed'))
//-----------------------------------------------------------------------------------
-start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=" . $_POST['OutstandingOnly'] .SID);
+start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=".$_POST['OutstandingOnly']);
start_table("class='tablestyle_noborder'");
start_row();
@@ -99,14 +108,14 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true);
stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
hidden('OutstandingOnly', $_POST['OutstandingOnly']);
end_row();
end_table();
-
+end_form();
//---------------------------------------------------------------------------------------------
if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
@@ -129,7 +138,7 @@ function batch_checkbox($row)
{
$name = "Sel_" .$row['trans_no'];
return $row['Done'] ? '' :
- "
"
+ ""
// add also trans_no => branch code for checking after 'Batch' submit
."\n";
@@ -139,19 +148,19 @@ function edit_link($row)
{
return $row["Outstanding"]==0 ? '' :
pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery="
- .$row['trans_no']);
+ .$row['trans_no'], ICON_EDIT);
}
function prt_link($row)
{
- return print_document_link($row['trans_no'], _("Print"), true, 13);
+ return print_document_link($row['trans_no'], _("Print"), true, 13, ICON_PRINT);
}
function invoice_link($row)
{
return $row["Outstanding"]==0 ? '' :
pager_link(_('Invoice'), "/sales/customer_invoice.php?DeliveryNumber="
- .$row['trans_no']);
+ .$row['trans_no'], ICON_DOC);
}
function check_overdue($row)
@@ -217,22 +226,22 @@ else
} //end no delivery number selected
$cols = array(
- _("Delivery #") => array('type'=>'spec', 'fun'=>'trans_view'),
+ _("Delivery #") => array('fun'=>'trans_view'),
_("Customer"),
'branch_code' => 'skip',
- _("Branch"),
+ _("Branch") => array('ord'=>''),
_("Contact"),
_("Reference"),
_("Cust Ref"),
- _("Delivery Date") => 'date',
+ _("Delivery Date") => array('type'=>'date', 'ord'=>''),
_("Due By") => 'date',
- _("Delivery Total") => 'amount',
- _("Currency"),
- submit('BatchInvoice','Batch Inv', false)
- => array('type'=>'insert', 'fun'=>'batch_checkbox'),
- array('type'=>'insert', 'fun'=>'edit_link'),
- array('type'=>'insert', 'fun'=>'invoice_link'),
- array('type'=>'insert', 'fun'=>'prt_link')
+ _("Delivery Total") => array('type'=>'amount', 'ord'=>''),
+ _("Currency") => array('align'=>'center'),
+ submit('BatchInvoice',_("Batch"), false, _("Batch Invoicing"))
+ => array('insert'=>true, 'fun'=>'batch_checkbox', 'align'=>'center'),
+ array('insert'=>true, 'fun'=>'edit_link'),
+ array('insert'=>true, 'fun'=>'invoice_link'),
+ array('insert'=>true, 'fun'=>'prt_link')
);
//-----------------------------------------------------------------------------------
@@ -243,25 +252,20 @@ if (isset($_SESSION['Batch']))
unset($_SESSION['Batch']);
}
-/*
-dla ka¿dego rz±dku
- $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"],
- 'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] );
-*/
-
$table =& new_db_pager('deliveries_tbl', $sql, $cols);
$table->set_marker('check_overdue', _("Marked items are overdue."));
-
-if(get_post('SearchOrders'))
-{
+if (get_post('SearchOrders')) {
$table->set_sql($sql);
- $Ajax->activate('doc_tbl');
+ $table->set_columns($cols);
}
+//$table->width = "92%";
+
+start_form();
+
+display_db_pager($table);
- start_form();
- display_db_pager($table);
- end_form();
+end_form();
end_page();
?>