X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=5ed2fcdc5808c56a2dc8acf81f4c153b78447735;hb=b0a033a1a2db727664018c496730a8be240879ec;hp=9329f81686c5732a06ce3168d0c34a8c99ab128e;hpb=d34add5e762a470a52fade37173b4491462ee22a;p=fa-stable.git
diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 9329f816..5ed2fcdc 100644
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -97,16 +97,14 @@ function display_order_summary($title, &$order, $editable_items=false)
$total = 0;
$k = 0; //row colour counter
+ $id = find_submit('Edit');
+
foreach ($order->line_items as $line_no=>$stock_item)
{
$line_total = round($stock_item->qty_dispatched * $stock_item->price * (1 - $stock_item->discount_percent),
user_price_dec());
- if (!isset($_GET['Edit']))
- $id = -1;
- else
- $id = $_GET['Edit'];
if (!$editable_items || $id != $line_no)
{
@@ -114,7 +112,7 @@ function display_order_summary($title, &$order, $editable_items=false)
view_stock_status_cell($stock_item->stock_id);
- label_cell($stock_item->item_description);
+ label_cell($stock_item->item_description, "nowrap" );
qty_cell($stock_item->qty_dispatched);
if ($order->trans_no!=0)
@@ -128,25 +126,25 @@ function display_order_summary($title, &$order, $editable_items=false)
if ($editable_items)
{
- edit_link_cell(SID . "Edit=$line_no");
- delete_link_cell(SID . "Delete=$line_no");
+ edit_button_cell("Edit$line_no", _("Edit"));
+ edit_button_cell("Delete$line_no", _("Delete"));
}
end_row();
}
else
{
- sales_order_item_controls($order, $line_no);
+ sales_order_item_controls($order, $k, $line_no);
}
$total += $line_total;
}
- if (!isset($_GET['Edit']) && $editable_items)
- sales_order_item_controls($order);
+ if ($id==-1 && $editable_items)
+ sales_order_item_controls($order, $k);
$display_total = price_format($total);
label_row(_("Total Excluding Shipping"), $display_total, "colspan=6 align=right",
- "nowrap align=right");
+ "nowrap align=right", 2);
end_table();
}
@@ -191,10 +189,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
if ($order->customer_id != $_POST['customer_id'])
{
// customer has changed
-
- // delete all the order items - drastic but necessary because of
- // change of currency, sales type, etc
- // $order->clear_items();
// clear the branch selection
unset($_POST['branch_id']);
}
@@ -299,17 +293,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
if ($display_tax_group)
{
-/* if ($editable)
- {
- if (!isset($_POST['tax_group_id']))
- $_POST['tax_group_id'] = $_SESSION['Items']->tax_group_id;
- tax_groups_list_row(_("Tax Group:"), 'tax_group_id', $_POST['tax_group_id'], true);
- }
- else
-*/ {
- label_row(_("Tax Group:"), $order->tax_group_name);
- hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
- }
+ label_row(_("Tax Group:"), $order->tax_group_name);
+ hidden('tax_group_id', $_SESSION['Items']->tax_group_id);
}
echo "";
@@ -322,38 +307,35 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
//--------------------------------------------------------------------------------
-function sales_order_item_controls(&$order, $line_no=-1)
+function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
{
- start_row();
- if (isset($_GET['Edit']) && $line_no != -1)
+ alt_table_row_color($rowcounter);
+
+ $id = find_submit('Edit');
+ if ($line_no!=-1 && $line_no == $id)
{
- if (!isset($_POST['stock_id']))
- $_POST['stock_id'] = $order->line_items[$_GET['Edit']]->stock_id;
- if (!isset($_POST['qty']) || ($_POST['qty'] == ""))
- $_POST['qty'] = qty_format($order->line_items[$_GET['Edit']]->qty_dispatched);
- if (!isset($_POST['price']) || ($_POST['price'] == ""))
- $_POST['price'] = price_format($order->line_items[$_GET['Edit']]->price);
- if (!isset($_POST['Disc']) || ($_POST['Disc'] == ""))
- $_POST['Disc'] = percent_format($order->line_items[$_GET['Edit']]->discount_percent*100);
-
- $_POST['units'] = $order->line_items[$_GET['Edit']]->units;
+ $_POST['stock_id'] = $order->line_items[$id]->stock_id;
+ $_POST['qty'] = qty_format($order->line_items[$id]->qty_dispatched);
+ $_POST['price'] = price_format($order->line_items[$id]->price);
+ $_POST['Disc'] = percent_format($order->line_items[$id]->discount_percent*100);
+ $_POST['units'] = $order->line_items[$id]->units;
hidden('stock_id', $_POST['stock_id']);
label_cell($_POST['stock_id']);
- label_cell($order->line_items[$line_no]->item_description);
+ label_cell($order->line_items[$line_no]->item_description, "nowrap");
}
else
{
- global $no_item_list;
- if ($no_item_list)
+
+ if (get_company_pref('no_item_list'))
{
- echo "| \n";
+ echo " | \n";
stock_items_list('stock_id', null, false, true);
echo " | \n";
}
else
{
- text_cells(null, "StockID2", "", 12, 10, "", "", "onkeyup='recalcAccounts();' onKeyDown='if (event.keyCode==13) event.keyCode=9;' onblur='return setAccount(0, true);'");
- stock_items_list_cells(null, 'stock_id', null, false, false, "onchange='return setAccount(1, true)'");
+ text_cells(null, "StockID2", '', 12, 10, "", "", "class='combo' rel='stock_id'"/* onblur='this.form.submit();'"*/);
+ stock_items_list_cells(null, 'stock_id', null, false, false, "class='combo' rel='StockID2'");
}
$item_info = get_item_edit_info($_POST['stock_id']);
$_POST['units'] = $item_info["units"];
@@ -378,11 +360,12 @@ function sales_order_item_controls(&$order, $line_no=-1)
$line_total = $_POST['qty'] * $_POST['price'] * (1 - $_POST['Disc'] / 100);
amount_cell($line_total);
- if (isset($_GET['Edit']))
+ if ($id!=-1)
{
- submit_cells('UpdateItem', _("Update"));
- submit_cells('CancelItemChanges', _("Cancel"));
+ edit_button_cell('UpdateItem', _("Update"));
+ edit_button_cell('CancelItemChanges', _("Cancel"));
hidden('LineNo', $line_no);
+ set_focus('qty');
}
else
{
@@ -439,7 +422,7 @@ function display_delivery_details(&$order)
text_row(_("Customer Reference:"), 'cust_ref', $order->cust_ref, 25, 25);
textarea_row(_("Comments:"), "Comments", $order->Comments, 31, 5);
- small_amount_row(_("Shipping Charge:"), 'freight_cost',
+ small_amount_row(_("Shipping Charge:"), 'freight_cost',
price_format($_POST['freight_cost']));
shippers_list_row(_("Shipping Company:"), 'ship_via', $order->ship_via);