projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed Email Receipt to customer.
[fa-stable.git]
/
sales
/
inquiry
/
sales_orders_view.php
diff --git
a/sales/inquiry/sales_orders_view.php
b/sales/inquiry/sales_orders_view.php
index 35d71c6444a40b86e1838e1cba7c9482d43f119c..2241e1f9dc05a7fe9c157f64d8e738280ec16a9c 100644
(file)
--- a/
sales/inquiry/sales_orders_view.php
+++ b/
sales/inquiry/sales_orders_view.php
@@
-106,6
+106,9
@@
function edit_link($row)
{
global $page_nested;
{
global $page_nested;
+ if (is_prepaid_order_open($row['order_no']))
+ return '';
+
return $page_nested ? '' : trans_editor_link($row['trans_type'], $row['order_no']);
}
return $page_nested ? '' : trans_editor_link($row['trans_type'], $row['order_no']);
}
@@
-149,7
+152,8
@@
function order_link($row)
function tmpl_checkbox($row)
{
global $trans_type, $page_nested;
function tmpl_checkbox($row)
{
global $trans_type, $page_nested;
- if ($trans_type == ST_SALESQUOTE)
+
+ if ($trans_type == ST_SALESQUOTE || !check_sales_order_type($row['order_no']))
return '';
if ($page_nested)
return '';
if ($page_nested)
@@
-195,8
+199,8
@@
if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) //
$disable = get_post('OrderNumber') !== '' || get_post('OrderReference') !== '';
if ($show_dates) {
$disable = get_post('OrderNumber') !== '' || get_post('OrderReference') !== '';
if ($show_dates) {
-
$Ajax->addDisable(true, 'OrdersAfterDate', $disable);
-
$Ajax->addDisable(true, 'OrdersToDate', $disable);
+ $Ajax->addDisable(true, 'OrdersAfterDate', $disable);
+ $Ajax->addDisable(true, 'OrdersToDate', $disable);
}
$Ajax->activate('orders_tbl');
}
$Ajax->activate('orders_tbl');
@@
-245,7
+249,7
@@
$sql = get_sql_for_sales_orders_view($trans_type, get_post('OrderNumber'), get_p
if ($trans_type == ST_SALESORDER)
$cols = array(
if ($trans_type == ST_SALESORDER)
$cols = array(
- _("Order #") => array('fun'=>'view_link'),
+ _("Order #") => array('fun'=>'view_link'
, 'align'=>'right'
),
_("Ref") => array('type' => 'sorder.reference', 'ord' => '') ,
_("Customer") => array('type' => 'debtor.name' , 'ord' => '') ,
_("Branch"),
_("Ref") => array('type' => 'sorder.reference', 'ord' => '') ,
_("Customer") => array('type' => 'debtor.name' , 'ord' => '') ,
_("Branch"),
@@
-259,7
+263,7
@@
if ($trans_type == ST_SALESORDER)
);
else
$cols = array(
);
else
$cols = array(
- _("Quote #") => array('fun'=>'view_link'),
+ _("Quote #") => array('fun'=>'view_link'
, 'align'=>'right'
),
_("Ref"),
_("Customer"),
_("Branch"),
_("Ref"),
_("Customer"),
_("Branch"),
@@
-272,7
+276,6
@@
else
_("Currency") => array('align'=>'center')
);
if ($_POST['order_view_mode'] == 'OutstandingOnly') {
_("Currency") => array('align'=>'center')
);
if ($_POST['order_view_mode'] == 'OutstandingOnly') {
- //array_substitute($cols, 3, 1, _("Cust Order Ref"));
array_append($cols, array(
array('insert'=>true, 'fun'=>'dispatch_link'),
array('insert'=>true, 'fun'=>'edit_link')));
array_append($cols, array(
array('insert'=>true, 'fun'=>'dispatch_link'),
array('insert'=>true, 'fun'=>'edit_link')));