X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fui%2Fsales_order_ui.inc;h=ce0b8604c9f6d4e3fbc1472a766c23896cd6ac04;hb=e39803c300ad0071a20d0c1977b5db6d79aa91c4;hp=faa2a3c8e2c2283b7be83a6ad7a0e7efba442fdf;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index faa2a3c8..ce0b8604 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -142,7 +142,8 @@ function display_order_summary($title, &$order, $editable_items=false) 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"), ""); @@ -245,7 +246,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); @@ -377,6 +378,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']) && !$order->is_started()) { // editable payment type @@ -399,6 +401,7 @@ function display_order_header(&$order, $editable, $date_text) } else { label_cells(_('Payment:'), $order->payment_terms['terms'], "class='label'"); } + end_row(); if($editable) { $str = sales_types_list_row(_("Price List:"), 'sales_type', null, true); @@ -571,7 +574,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')) @@ -602,7 +605,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); @@ -621,7 +624,7 @@ function display_delivery_details(&$order) date_row($delname, 'delivery_date', $order->trans_type==ST_SALESORDER ? _('Enter requested day of delivery') : $order->trans_type==ST_SALESQUOTE ? _('Enter Valid until Date') : ''); - text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40, + text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 50, 60, _('Additional identifier for delivery e.g. name of receiving person')); textarea_row(_("Address:"), 'delivery_address', $order->delivery_address, 35, 5, @@ -642,4 +645,3 @@ function display_delivery_details(&$order) div_end(); } -?> \ No newline at end of file