projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed so Invoice Template gets the current day instead of original day.
[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 6ad10c1da95ec053cb3bea209fe875392637a3ca..82c103958d9c8b8e8ddb9d05174d4e7083a3afac 100644
(file)
--- a/
sales/inquiry/sales_orders_view.php
+++ b/
sales/inquiry/sales_orders_view.php
@@
-71,8
+71,8
@@
start_row();
ref_cells(_("#:"), 'OrderNumber');
if ($_POST['order_view_mode'] != 'DeliveryTemplates' && $_POST['order_view_mode'] != 'InvoiceTemplates')
{
ref_cells(_("#:"), 'OrderNumber');
if ($_POST['order_view_mode'] != 'DeliveryTemplates' && $_POST['order_view_mode'] != 'InvoiceTemplates')
{
- date_cells(_("from:"), 'OrdersAfterDate', null, -30);
- date_cells(_("to:"), 'OrdersToDate', null, 1);
+ date_cells(_("from:"), 'OrdersAfterDate',
'',
null, -30);
+ date_cells(_("to:"), 'OrdersToDate',
'',
null, 1);
}
locations_list_cells(_("Location:"), 'StockLocation', null, true);
}
locations_list_cells(_("Location:"), 'StockLocation', null, true);
@@
-172,12
+172,15
@@
if ($result)
start_table("$table_style colspan=6 width=95%");
$th = array(_("Order #"), _("Customer"), _("Branch"), _("Cust Order #"), _("Order Date"),
start_table("$table_style colspan=6 width=95%");
$th = array(_("Order #"), _("Customer"), _("Branch"), _("Cust Order #"), _("Order Date"),
- _("Required By"), _("Delivery To"), _("Order Total"), _("Currency"),
_("Tmpl"),"",
"");
+ _("Required By"), _("Delivery To"), _("Order Total"), _("Currency"), "");
if($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
{
$th[3] = _('Description');
if($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
{
$th[3] = _('Description');
- }
+ } elseif ($_POST['order_view_mode'] != 'OutstandingOnly') {
+ $th[9] = _('Tmpl');
+ $th[] =''; $th[] ='';
+ }
table_header($th);
start_form();
table_header($th);
start_form();
@@
-234,7
+237,7
@@
if ($result)
else
{
echo "<td><input ".($myrow["type"]==1 ? 'checked' : '')." type='checkbox' name='chgtpl" .$myrow["order_no"]. "' value='1'
else
{
echo "<td><input ".($myrow["type"]==1 ? 'checked' : '')." type='checkbox' name='chgtpl" .$myrow["order_no"]. "' value='1'
- onclick='
forms[1]
.ChangeTmpl.value= this.name.substr(6);
+ onclick='
this.form
.ChangeTmpl.value= this.name.substr(6);
this.form.submit();' ></td>";
$modify_page = $path_to_root . "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $myrow["order_no"];
this.form.submit();' ></td>";
$modify_page = $path_to_root . "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $myrow["order_no"];