Bug in inst_lang.php

[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 57be11958de99cba29686777a7cf22882bc2576a..9daed892e5467bc1c7bad21ffc3a5afde6cf9d9d 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -90,6 +90,8 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        $order->set_sales_type($myrow['salestype'], $myrow['sales_type'], $myrow['tax_included'],
            $myrow['factor']);
 
+       $order->credit = $myrow['cur_credit'];
+
        if ($order->trans_type != ST_SALESORDER && $order->trans_type != ST_SALESQUOTE)
        {
                $order->dimension_id = $myrow['dimension_id'];
@@ -135,7 +137,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
 
 function display_order_summary($title, &$order, $editable_items=false)
 {
-       global $path_to_root, $SysPrefs;
+       global $SysPrefs;
 
        display_heading($title);
 
@@ -143,7 +145,7 @@ function display_order_summary($title, &$order, $editable_items=false)
        start_table(TABLESTYLE, "colspan=7 width=90%");
        $th = array(_("Item Code"), _("Item Description"), _("Quantity"),
                _("Delivered"),
-               _("Unit"), _("Price"), _("Discount %"), _("Total"), "");
+               _("Unit"), $order->tax_included ? _("Price after Tax") : _("Price before Tax"), _("Discount %"), _("Total"), "");
 
        if ($order->trans_no == 0) {
        unset( $th[3] );
@@ -238,7 +240,7 @@ function display_order_summary($title, &$order, $editable_items=false)
 
        start_row();
        label_cells(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
-       submit_cells('update', _("Update"), "colspan=2", _("Refresh"), true);
+       submit_cells('update', _("Update"), "colspan=2 align='center'", _("Refresh"), true);
        end_row();
 
        end_table();
@@ -363,14 +365,19 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
 
        ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
 
+       table_section(2);
+
        if (!is_company_currency($order->customer_currency))
        {
-           table_section(2);
-
                label_row(_("Customer Currency:"), $order->customer_currency);
                exchange_rate_display($order->customer_currency, get_company_currency(),
                        ($editable ? $_POST['OrderDate'] : $order->document_date));
        }
+
+       customer_credit_row($_POST['customer_id'], $order->credit);
+
+       label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
+
        table_section(3);
 
        if (($order->trans_type != ST_CUSTDELIVERY) && ($order->pos != -1)) { // editable payment type
@@ -406,8 +413,6 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                $change_prices = 1;
        }
 
-       label_row(_("Customer Discount:"), ($order->default_discount * 100) . "%");
-       
        table_section(4);
 
        if ($editable)
@@ -553,7 +558,7 @@ function sales_order_item_controls(&$order, &$rowcounter, $line_no=-1)
        }
        else
        {
-               submit_cells('AddItem', _("Add Item"), "colspan=2",
+               submit_cells('AddItem', _("Add Item"), "colspan=2 align='center'",
                    _('Add new item to document'), true);
        }