New CHANGELOG.txt

[fa-stable.git] / sales / includes / ui / sales_order_ui.inc

diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc
index a07ceba00c508c1a885d7a35bd61c857b72de47e..20509efcf373ba48fedd64c0148a925aac6acc5f 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -123,6 +123,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        }
        elseif ($order->trans_type == ST_SALESORDER)
                $order->due_date = add_days($order->document_date, $SysPrefs->default_delivery_required_by());
+       elseif ($order->trans_type == ST_SALESQUOTE)
+               $order->due_date = add_days($order->document_date, $SysPrefs->default_quote_valid_days());
        if($order->payment_terms['cash_sale']) {
                $order->set_location($order->pos["pos_location"], $order->pos["location_name"]);
        } else
@@ -135,12 +137,12 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
 function display_order_summary($title, &$order, $editable_items=false)
 {
-       global $SysPrefs;
 
        display_heading($title);
 
     div_start('items_table');
-       start_table(TABLESTYLE, "colspan=7 width=90%");
+       start_table(TABLESTYLE, "width='90%'");
+
        $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
                _("Delivered"),
                _("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), "");
@@ -243,7 +245,7 @@ function display_order_header(&$order, $editable, $date_text)
 {
        global $Ajax, $SysPrefs;
 
-       start_outer_table(TABLESTYLE2, "width=80%");
+       start_outer_table(TABLESTYLE2, "width='80%'");
 
        table_section(1);
        
@@ -375,6 +377,7 @@ function display_order_header(&$order, $editable, $date_text)
        label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
 
        table_section(3);
+       start_row();
        if ($order->pos['cash_sale'] || $order->pos['credit_sale']) {
                 // editable payment type 
                if (get_post('payment') !== $order->payment) {
@@ -397,6 +400,7 @@ function display_order_header(&$order, $editable, $date_text)
        } else {
                label_cells(_('Payment:'), $order->payment_terms['terms']);
        }
+       end_row();
 
        if($editable) {
                $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true);
@@ -569,7 +573,7 @@ function display_delivery_details(&$order)
        if ($order->payment_terms['cash_sale']) {       // Direct payment sale
                $Ajax->activate('items_table');
                display_heading(_('Cash payment'));
-               start_table(TABLESTYLE2, "width=60%");
+               start_table(TABLESTYLE2, "width='60%'");
 
                locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);
                if (list_updated('Location'))
@@ -600,7 +604,7 @@ function display_delivery_details(&$order)
                        $delname = _("Required Delivery Date").':';
                }
                display_heading($title);
-               start_outer_table(TABLESTYLE2, "width=90%");
+               start_outer_table(TABLESTYLE2, "width='90%'");
                table_section(1);
 
                locations_list_row(_("Deliver from Location:"), 'Location', null, false, true);