X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=3b318997cf8e43323e29ad1f7c327497f45e944d;hb=61f9532cca30809d96eea56effbad09b000b94de;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..3b318997 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -1,7 +1,16 @@
.
+***********************************************************************/
+$page_security = 'SA_SALESINVOICE';
+$path_to_root = "../..";
include($path_to_root . "/includes/db_pager.inc");
include($path_to_root . "/includes/session.inc");
@@ -9,54 +18,53 @@ include($path_to_root . "/sales/includes/sales_ui.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
$js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
$js .= get_js_open_window(900, 600);
-if ($use_date_picker)
+if (user_use_date_picker())
$js .= get_js_date_picker();
if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true))
{
$_POST['OutstandingOnly'] = true;
- page(_("Search Not Invoiced Deliveries"), false, false, "", $js);
+ page(_($help_context = "Search Not Invoiced Deliveries"), false, false, "", $js);
}
else
{
$_POST['OutstandingOnly'] = false;
- page(_("Search All Deliveries"), false, false, "", $js);
+ page(_($help_context = "Search All Deliveries"), false, false, "", $js);
}
if (isset($_GET['selected_customer']))
{
- $selected_customer = $_GET['selected_customer'];
+ $_POST['customer_id'] = $_GET['selected_customer'];
}
elseif (isset($_POST['selected_customer']))
{
- $selected_customer = $_POST['selected_customer'];
+ $_POST['customer_id'] = $_POST['selected_customer'];
}
-else
- $selected_customer = -1;
if (isset($_POST['BatchInvoice']))
{
// checking batch integrity
$del_count = 0;
- foreach($_POST['Sel_'] as $delivery => $branch) {
- $checkbox = 'Sel_'.$delivery;
- if (check_value($checkbox)) {
- if (!$del_count) {
- $del_branch = $branch;
- }
- else {
- if ($del_branch != $branch) {
- $del_count=0;
- break;
+ if (isset($_POST['Sel_'])) {
+ foreach($_POST['Sel_'] as $delivery => $branch) {
+ $checkbox = 'Sel_'.$delivery;
+ if (check_value($checkbox)) {
+ if (!$del_count) {
+ $del_branch = $branch;
}
- }
- $selected[] = $delivery;
- $del_count++;
- }
- }
-
+ else {
+ if ($del_branch != $branch) {
+ $del_count=0;
+ break;
+ }
+ }
+ $selected[] = $delivery;
+ $del_count++;
+ }
+ }
+ }
if (!$del_count) {
display_error(_('For batch invoicing you should
select at least one delivery. All items must be dispatched to
@@ -87,49 +95,44 @@ 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_table(TABLESTYLE_NOBORDER);
start_row();
ref_cells(_("#:"), 'DeliveryNumber', '',null, '', true);
-date_cells(_("from:"), 'DeliveryAfterDate', '', null, -30);
+date_cells(_("from:"), 'DeliveryAfterDate', '', null, -user_transaction_days());
date_cells(_("to:"), 'DeliveryToDate', '', null, 1);
locations_list_cells(_("Location:"), 'StockLocation', null, true);
+end_row();
+
+end_table();
+start_table(TABLESTYLE_NOBORDER);
+start_row();
stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
+
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
hidden('OutstandingOnly', $_POST['OutstandingOnly']);
end_row();
-end_table();
-
+end_table(1);
//---------------------------------------------------------------------------------------------
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
- ($_POST['SelectStockFromList'] != reserved_words::get_all()))
-{
- $selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
- unset($selected_stock_item);
-}
-
-//---------------------------------------------------------------------------------------------
function trans_view($trans, $trans_no)
{
- return get_customer_trans_view_str(13, $trans['trans_no']);
+ return get_customer_trans_view_str(ST_CUSTDELIVERY, $trans['trans_no']);
}
function batch_checkbox($row)
{
$name = "Sel_" .$row['trans_no'];
return $row['Done'] ? '' :
- "
"
+ ""
// add also trans_no => branch code for checking after 'Batch' submit
."\n";
@@ -138,20 +141,19 @@ function batch_checkbox($row)
function edit_link($row)
{
return $row["Outstanding"]==0 ? '' :
- pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery="
- .$row['trans_no']);
+ trans_editor_link(ST_CUSTDELIVERY, $row['trans_no']);
}
function prt_link($row)
{
- return print_document_link($row['trans_no'], _("Print"), true, 13);
+ return print_document_link($row['trans_no'], _("Print"), true, ST_CUSTDELIVERY, 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)
@@ -160,79 +162,26 @@ function check_overdue($row)
$row["Outstanding"]!=0;
}
//------------------------------------------------------------------------------------------------
-$sql = "SELECT trans.trans_no,
- debtor.name,
- branch.branch_code,
- branch.br_name,
- sorder.deliver_to,
- trans.reference,
- sorder.customer_ref,
- trans.tran_date,
- trans.due_date,
- (ov_amount+ov_gst+ov_freight+ov_freight_tax) AS DeliveryValue,
- debtor.curr_code,
- Sum(line.quantity-line.qty_done) AS Outstanding,
- Sum(line.qty_done) AS Done
- FROM "
- .TB_PREF."sales_orders as sorder, "
- .TB_PREF."debtor_trans as trans, "
- .TB_PREF."debtor_trans_details as line, "
- .TB_PREF."debtors_master as debtor, "
- .TB_PREF."cust_branch as branch
- WHERE
- sorder.order_no = trans.order_ AND
- trans.debtor_no = debtor.debtor_no
- AND trans.type = 13
- AND line.debtor_trans_no = trans.trans_no
- AND line.debtor_trans_type = trans.type
- AND trans.branch_code = branch.branch_code
- AND trans.debtor_no = branch.debtor_no ";
-
-if ($_POST['OutstandingOnly'] == true) {
- $sql .= " AND line.qty_done < line.quantity ";
-}
-
-//figure out the sql required from the inputs available
-if (isset($_POST['DeliveryNumber']) && $_POST['DeliveryNumber'] != "")
-{
- $sql .= " AND trans.trans_no LIKE '%". $_POST['DeliveryNumber'] ."'";
- $sql .= " GROUP BY trans.trans_no";
-}
-else
-{
- $sql .= " AND trans.tran_date >= '".date2sql($_POST['DeliveryAfterDate'])."'";
- $sql .= " AND trans.tran_date <= '".date2sql($_POST['DeliveryToDate'])."'";
-
- if ($selected_customer != -1)
- $sql .= " AND trans.debtor_no='" . $selected_customer . "' ";
-
- if (isset($selected_stock_item))
- $sql .= " AND line.stock_id='". $selected_stock_item ."' ";
-
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
- $sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' ";
-
- $sql .= " GROUP BY trans.trans_no ";
-
-} //end no delivery number selected
+$sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post('DeliveryToDate'), get_post('customer_id'),
+ get_post('SelectStockFromList'), get_post('StockLocation'), get_post('DeliveryNumber'), get_post('OutstandingOnly'));
$cols = array(
- _("Delivery #") => array('type'=>'spec', 'fun'=>'trans_view'),
+ _("Delivery #") => array('fun'=>'trans_view', 'align'=>'right'),
_("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,26 +192,13 @@ 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."));
+//$table->width = "92%";
-if(get_post('SearchOrders'))
-{
- $table->set_sql($sql);
- $Ajax->activate('doc_tbl');
-}
+display_db_pager($table);
- start_form();
- display_db_pager($table);
- end_form();
+end_form();
end_page();
-?>
-