X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Finquiry%2Fsales_orders_view.php;h=53de2699fbf05f87d8ee84d2084972640247423c;hb=9af96a2e461b905dbb20f2b87ffb5c28f9b3461c;hp=0c9fd701a137c01f3c9b8f48741dfcdf7da02569;hpb=016ad02fdf681d761cd8e4572270a4b7a3edee1f;p=fa-stable.git
diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 0c9fd701..53de2699 100644
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -1,12 +1,29 @@
.
+***********************************************************************/
+$path_to_root = "../..";
-$page_security = 2;
-$path_to_root="../..";
-
-include($path_to_root . "/sales/includes/sales_ui.inc");
include($path_to_root . "/includes/db_pager.inc");
-include_once($path_to_root . "/reporting/includes/reporting.inc");
include($path_to_root . "/includes/session.inc");
+include($path_to_root . "/sales/includes/sales_ui.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
+
+$page_security = 'SA_SALESTRANSVIEW';
+
+set_page_security( @$_POST['order_view_mode'],
+ array( 'OutstandingOnly' => 'SA_SALESDELIVERY',
+ 'InvoiceTemplates' => 'SA_SALESINVOICE'),
+ array( 'OutstandingOnly' => 'SA_SALESDELIVERY',
+ 'InvoiceTemplates' => 'SA_SALESINVOICE')
+);
$js = "";
if ($use_popup_windows)
@@ -14,27 +31,41 @@ if ($use_popup_windows)
if ($use_date_picker)
$js .= get_js_date_picker();
-if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true))
-{
- $_POST['order_view_mode'] = 'OutstandingOnly';
- $_SESSION['page_title'] = _("Search Outstanding Sales Orders");
-}
-elseif (isset($_GET['InvoiceTemplates']) && ($_GET['InvoiceTemplates'] == true))
-{
- $_POST['order_view_mode'] = 'InvoiceTemplates';
- $_SESSION['page_title'] = _("Search Template for Invoicing");
-}
-elseif (isset($_GET['DeliveryTemplates']) && ($_GET['DeliveryTemplates'] == true))
+if (get_post('type'))
+ $trans_type = $_POST['type'];
+elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
+ $trans_type = ST_SALESQUOTE;
+else
+ $trans_type = ST_SALESORDER;
+
+if ($trans_type == ST_SALESORDER)
{
- $_POST['order_view_mode'] = 'DeliveryTemplates';
- $_SESSION['page_title'] = _("Select Template for Delivery");
+ if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true))
+ {
+ $_POST['order_view_mode'] = 'OutstandingOnly';
+ $_SESSION['page_title'] = _($help_context = "Search Outstanding Sales Orders");
+ }
+ elseif (isset($_GET['InvoiceTemplates']) && ($_GET['InvoiceTemplates'] == true))
+ {
+ $_POST['order_view_mode'] = 'InvoiceTemplates';
+ $_SESSION['page_title'] = _($help_context = "Search Template for Invoicing");
+ }
+ elseif (isset($_GET['DeliveryTemplates']) && ($_GET['DeliveryTemplates'] == true))
+ {
+ $_POST['order_view_mode'] = 'DeliveryTemplates';
+ $_SESSION['page_title'] = _($help_context = "Select Template for Delivery");
+ }
+ elseif (!isset($_POST['order_view_mode']))
+ {
+ $_POST['order_view_mode'] = false;
+ $_SESSION['page_title'] = _($help_context = "Search All Sales Orders");
+ }
}
-elseif (!isset($_POST['order_view_mode']))
+else
{
- $_POST['order_view_mode'] = false;
- $_SESSION['page_title'] = _("Search All Sales Orders");
+ $_POST['order_view_mode'] = "Quotations";
+ $_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
}
-
page($_SESSION['page_title'], false, false, "", $js);
if (isset($_GET['selected_customer']))
@@ -51,7 +82,7 @@ else
//---------------------------------------------------------------------------------------------
if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
- ($_POST['SelectStockFromList'] != reserved_words::get_all()))
+ ($_POST['SelectStockFromList'] != ALL_TEXT))
{
$selected_stock_item = $_POST['SelectStockFromList'];
}
@@ -64,57 +95,81 @@ else
//
function check_overdue($row)
{
- return ($row['type'] == 0
- && date1_greater_date2(Today(), sql2date($row['ord_date']))
- && ($row['TotDelivered'] < $row['TotQuantity']));
+ global $trans_type;
+ if ($trans_type == ST_SALESQUOTE)
+ return (date1_greater_date2(Today(), sql2date($row['delivery_date'])));
+ else
+ return ($row['type'] == 0
+ && date1_greater_date2(Today(), sql2date($row['ord_date']))
+ && ($row['TotDelivered'] < $row['TotQuantity']));
}
function view_link($dummy, $order_no)
{
- return get_customer_trans_view_str(systypes::sales_order(), $order_no);
+ global $trans_type;
+ return get_customer_trans_view_str($trans_type, $order_no);
}
function prt_link($row)
{
- return print_document_link($row['order_no'], _("Print"), true, 30);
+ global $trans_type;
+ return print_document_link($row['order_no'], _("Print"), true, $trans_type, ICON_PRINT);
}
function edit_link($row)
{
+ global $trans_type;
+ $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
return pager_link( _("Edit"),
- "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $row['order_no']);
+ "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT);
}
function dispatch_link($row)
{
- return pager_link( _("Dispatch"),
- "/sales/customer_delivery.php?" . SID . "OrderNumber=" .$row['order_no']);
+ global $trans_type;
+ if ($trans_type == ST_SALESORDER)
+ return pager_link( _("Dispatch"),
+ "/sales/customer_delivery.php?OrderNumber=" .$row['order_no'], ICON_DOC);
+ else
+ return pager_link( _("Sales Order"),
+ "/sales/sales_order_entry.php?OrderNumber=" .$row['order_no'], ICON_DOC);
}
function invoice_link($row)
{
- return pager_link( _("Invoice"),
- "/sales/sales_order_entry.php?" . SID . "NewInvoice=" .$row["order_no"]);
+ global $trans_type;
+ if ($trans_type == ST_SALESORDER)
+ return pager_link( _("Invoice"),
+ "/sales/sales_order_entry.php?NewInvoice=" .$row["order_no"], ICON_DOC);
+ else
+ return '';
}
function delivery_link($row)
{
return pager_link( _("Delivery"),
- "/sales/sales_order_entry.php?" . SID . "NewDelivery=" .$row['order_no']);
+ "/sales/sales_order_entry.php?NewDelivery=" .$row['order_no'], ICON_DOC);
+}
+
+function order_link($row)
+{
+ return pager_link( _("Sales Order"),
+ "/sales/sales_order_entry.php?NewQuoteToSalesOrder=" .$row['order_no'], ICON_DOC);
}
function tmpl_checkbox($row)
{
+ global $trans_type;
+ if ($trans_type == ST_SALESQUOTE)
+ return '';
$name = "chgtpl" .$row['order_no'];
- $value = $row['type'] ? ' checked' : '';
-
- return ""
-// add also old checkbox name+value for check after 'Update'
- ."\n";
+ $value = $row['type'] ? 1:0;
+
+// save also in hidden field for testing during 'Update'
+
+ return checkbox(null, $name, $value, true,
+ _('Set this order as a template for direct deliveries/invoices'))
+ . hidden('last['.$row['order_no'].']', $value, false);
}
//---------------------------------------------------------------------------------------------
// Update db record if respective checkbox value has changed.
@@ -133,7 +188,7 @@ $id = find_submit('_chgtpl');
if ($id != -1)
change_tpl_flag($id);
-if (isset($_POST['Update'])) {
+if (isset($_POST['Update']) && isset($_POST['last'])) {
foreach($_POST['last'] as $id => $value)
if ($value != check_value('chgtpl'.$id))
change_tpl_flag($id);
@@ -163,142 +218,104 @@ if (get_post('_OrderNumber_changed')) // enable/disable selection controls
$Ajax->activate('orders_tbl');
}
-start_form(false, false, $_SERVER['PHP_SELF'] .SID);
+start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
start_row();
ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
if ($_POST['order_view_mode'] != 'DeliveryTemplates' && $_POST['order_view_mode'] != 'InvoiceTemplates')
{
+ ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
date_cells(_("to:"), 'OrdersToDate', '', 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);
+if ($trans_type == ST_SALESQUOTE)
+ check_cells(_("Show All:"), 'show_all');
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
hidden('order_view_mode', $_POST['order_view_mode']);
+hidden('type', $trans_type);
end_row();
end_table(1);
-end_form();
-
//---------------------------------------------------------------------------------------------
// Orders inquiry table
//
-$sql = "SELECT
- sorder.order_no,
- debtor.name,
- branch.br_name,"
- .($_POST['order_view_mode']=='InvoiceTemplates'
- || $_POST['order_view_mode']=='DeliveryTemplates' ?
- "sorder.comments, " : "sorder.customer_ref, ")
- ."sorder.ord_date,
- sorder.delivery_date,
- sorder.deliver_to,
- Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue,
- sorder.type,
- debtor.curr_code,
- Sum(line.qty_sent) AS TotDelivered,
- Sum(line.quantity) AS TotQuantity
- FROM ".TB_PREF."sales_orders as sorder, "
- .TB_PREF."sales_order_details as line, "
- .TB_PREF."debtors_master as debtor, "
- .TB_PREF."cust_branch as branch
- WHERE sorder.order_no = line.order_no
- AND sorder.debtor_no = debtor.debtor_no
- AND sorder.branch_code = branch.branch_code
- AND debtor.debtor_no = branch.debtor_no";
-
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
-{
- // search orders with number like ...
- $sql .= " AND sorder.order_no LIKE '%". $_POST['OrderNumber'] ."'"
- ." GROUP BY sorder.order_no";
-}
-else // ... or select inquiry constraints
-{
- if ($_POST['order_view_mode']!='DeliveryTemplates' && $_POST['order_view_mode']!='InvoiceTemplates')
- {
- $date_after = date2sql($_POST['OrdersAfterDate']);
- $date_before = date2sql($_POST['OrdersToDate']);
-
- $sql .= " AND sorder.ord_date >= '$date_after'"
- ." AND sorder.ord_date <= '$date_before'";
- }
- if ($selected_customer != -1)
- $sql .= " AND sorder.debtor_no='" . $selected_customer . "'";
-
- if (isset($selected_stock_item))
- $sql .= " AND line.stk_code='". $selected_stock_item ."'";
-
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all())
- $sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' ";
-
- if ($_POST['order_view_mode']=='OutstandingOnly')
- $sql .= " AND line.qty_sent < line.quantity";
- elseif ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
- $sql .= " AND sorder.type=1";
-
- $sql .= " GROUP BY sorder.order_no,
- sorder.debtor_no,
- sorder.branch_code,
- sorder.customer_ref,
- sorder.ord_date,
- sorder.deliver_to";
-}
-
-$cols = array(
- _("Order #") => array('type'=>'spec', 'fun'=>'view_link'),
- _("Customer"),
- _("Branch"),
- _("Comments"),
- _("Order Date") => 'date',
- _("Required By") =>array('type'=>'date', 'ord'=>''),
- _("Delivery To"),
- _("Order Total") => array('type'=>'amount', 'ord'=>''),
- 'Type' => 'skip',
- _("Currency")
-);
-
+$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type);
+
+if ($trans_type == ST_SALESORDER)
+ $cols = array(
+ _("Order #") => array('fun'=>'view_link'),
+ _("Ref"),
+ _("Customer"),
+ _("Branch"),
+ _("Cust Order Ref"),
+ _("Order Date") => 'date',
+ _("Required By") =>array('type'=>'date', 'ord'=>''),
+ _("Delivery To"),
+ _("Order Total") => array('type'=>'amount', 'ord'=>''),
+ 'Type' => 'skip',
+ _("Currency") => array('align'=>'center')
+ );
+else
+ $cols = array(
+ _("Quote #") => array('fun'=>'view_link'),
+ _("Ref"),
+ _("Customer"),
+ _("Branch"),
+ _("Cust Order Ref"),
+ _("Quote Date") => 'date',
+ _("Valid until") =>array('type'=>'date', 'ord'=>''),
+ _("Delivery To"),
+ _("Quote Total") => array('type'=>'amount', 'ord'=>''),
+ 'Type' => 'skip',
+ _("Currency") => array('align'=>'center')
+ );
if ($_POST['order_view_mode'] == 'OutstandingOnly') {
- array_replace($cols, 3, 1, _("Cust Order Ref"));
- array_append($cols, array(array('type'=>'insert', 'fun'=>'dispatch_link')));
+ //array_substitute($cols, 3, 1, _("Cust Order Ref"));
+ array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link')));
} elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
- array_replace($cols, 3, 1, _("Description"));
- array_append($cols, array( array('type'=>'insert', 'fun'=>'invoice_link')));
+ array_substitute($cols, 3, 1, _("Description"));
+ array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link')));
} else if ($_POST['order_view_mode'] == 'DeliveryTemplates') {
- array_replace($cols, 3, 1, _("Description"));
+ array_substitute($cols, 3, 1, _("Description"));
array_append($cols, array(
- array('type'=>'insert', 'fun'=>'delivery_link'))
+ array('insert'=>true, 'fun'=>'delivery_link'))
);
-} else {
+} elseif ($trans_type == ST_SALESQUOTE) {
+ array_append($cols,array(
+ array('insert'=>true, 'fun'=>'edit_link'),
+ array('insert'=>true, 'fun'=>'order_link'),
+ array('insert'=>true, 'fun'=>'prt_link')));
+} elseif ($trans_type == ST_SALESORDER) {
array_append($cols,array(
- _("Tmpl") => array('type'=>'insert', 'fun'=>'tmpl_checkbox'),
- array('type'=>'insert', 'fun'=>'edit_link'),
- array('type'=>'insert', 'fun'=>'prt_link')));
+ _("Tmpl") => array('insert'=>true, 'fun'=>'tmpl_checkbox'),
+ array('insert'=>true, 'fun'=>'edit_link'),
+ array('insert'=>true, 'fun'=>'prt_link')));
};
$table =& new_db_pager('orders_tbl', $sql, $cols);
$table->set_marker('check_overdue', _("Marked items are overdue."));
+$table->width = "80%";
-if (get_post('SearchOrders'))
-{
- $table->set_sql($sql);
- $Ajax->activate('orders_tbl');
-}
- start_form();
- display_db_pager($table);
+display_db_pager($table);
+submit_center('Update', _("Update"), true, '', null);
- submit_center('Update', _("Update"), true, '', null);
- end_form();
+end_form();
end_page();
?>
\ No newline at end of file