Rerun. Update button for change of shipping

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 91392d6afad4db1447f666d5c31edc0c7c5e76b5..b9d897bf8c9165be3d7efeca41c80550037f6ab5 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,7 @@ $ -> Affected files
 05-Nov-2009 Joe Hunt
 ! Display tax info in Sales Quotation, Order, Direct Delivery and Invoice.
 $ /sales/includes/ui/sales_order_ui.inc
+  /sales/sales_order_entry.php
 ! Include freight_cost in Sales Quotations, Orders in inquiries.
 $ /sales/inquiry/sales_orders_view.php
 

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index 52cfaa41e886e89cee800daed8c5a40b042b8e82..c79af8d6de8eee39a0513a18458c23fdf1c99f43 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -217,11 +217,6 @@ function display_order_summary($title, &$order, $editable_items=false)
        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", 2);
-*/
        $colspan = 6;
        small_amount_row(_("Shipping Charge"), 'freight_cost', price_format(get_post('freight_cost',0)), "colspan=$colspan align=right");
        $display_sub_total = price_format($total + input_num('freight_cost'));
@@ -233,7 +228,10 @@ function display_order_summary($title, &$order, $editable_items=false)
 
        $display_total = price_format(($total + input_num('freight_cost') + $tax_total));
 
-       label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
+       start_row();
+       label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
+       submit_cells('update', _("Update"), "colspan=2", _("Refresh"), true);
+       end_row();
 
        end_table();
        if ($has_marked) {

diff --git a/sales/sales_order_entry.php b/sales/sales_order_entry.php
index 3dcebf0345a194b6d049134920194c456be4d26c..c7255881b92864033b91df8305d2373ca9129513 100644 (file)
--- a/sales/sales_order_entry.php
+++ b/sales/sales_order_entry.php
@@ -400,6 +400,10 @@ if (isset($_POST['ProcessOrder']) && can_process()) {
        }
 }
 
+if (isset($_POST['update'])) {
+       $Ajax->activate('items_table');
+}
+
 //--------------------------------------------------------------------------------
 
 function check_item_data()