More fixes to changed access system, activated js confirm dialogs.

[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 9debc13835c463b78825e356b1f0cd6c9039d67c..1b98e41ea6c3742e95ca1c0ff90594e18d86833f 100644 (file)
--- a/sales/includes/ui/sales_order_ui.inc
+++ b/sales/includes/ui/sales_order_ui.inc
@@ -58,7 +58,7 @@ function add_to_order(&$order, $new_item, $new_item_qty, $price, $discount)
                        if (strcasecmp($order_item->stock_id, $item['stock_id']) == 0)
                        {
                                display_warning(_("For Part :").$item['stock_id']. " " 
-                                       . _("This item is already on this order. You have been warned."));
+                                       . _("This item is already on this document. You have been warned."));
                                break;
                        }
                }
@@ -114,7 +114,7 @@ function get_customer_details_to_order(&$order, $customer_id, $branch_id)
        if ($order->trans_type == 10) {
                $order->due_date = get_invoice_duedate($customer_id, $order->document_date);
                if ($order->pos != -1)
-                       $order->cash = date_diff($order->due_date, Today(), 'd')<2;
+                       $order->cash = date_diff2($order->due_date, Today(), 'd')<2;
        }
        if($order->cash ) {
                if($order->pos != -1) {
@@ -246,7 +246,8 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
        if (isset($order) && !$editable)
        {
                // can't change the customer/branch if items already received on this order
-               echo $order->customer_name . " - " . $order->deliver_to;
+               //echo $order->customer_name . " - " . $order->deliver_to;
+               label_row(null, $order->customer_name . " - " . $order->deliver_to);
                hidden('customer_id', $order->customer_id);
                hidden('branch_id', $order->Branch);
                hidden('sales_type', $order->sales_type);
@@ -257,7 +258,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
        }
        else
        {
-               customer_list_row(_("Customer:"), 'customer_id', null, false, true);
+               customer_list_row(_("Customer:"), 'customer_id', null, false, true, false, true);
 
                if ($order->customer_id != get_post('customer_id', -1))
                {
@@ -265,7 +266,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                        $Ajax->activate('branch_id');
                }
                customer_branches_list_row(_("Branch:"),
-                 $_POST['customer_id'], 'branch_id', null, false, true, true);
+                 $_POST['customer_id'], 'branch_id', null, false, true, true, true);
 
                if( ($order->customer_id != get_post('customer_id', -1)) ||
                        ($order->Branch != get_post('branch_id', -1)) ||
@@ -339,9 +340,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                }
        }
 
-       if ($order->trans_type != 30) {
-               ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
-       }
+       ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, '');
 
        if (!is_company_currency($order->customer_currency))
        {
@@ -410,7 +409,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group
                        $Ajax->activate('items_table');
                        $Ajax->activate('delivery_date');
                }
-               if ($order->trans_type != 30)
+               if ($order->trans_type != 30 && $order->trans_type != 32)
                {       // 2008-11-12 Joe Hunt added dimensions
                        $dim = get_company_pref('use_dimension');
                        if ($dim > 0)
@@ -562,6 +561,11 @@ function display_delivery_details(&$order)
                        $title = _("Invoice Delivery Details");
                        $delname = _("Invoice before").':';
                }
+               elseif ($order->trans_type==32)
+               {
+                       $title = _("Quotation Delivery Details");
+                       $delname = _("Valid until").':';
+               }
                else
                {
                        $title = _("Order Delivery Details");
@@ -578,7 +582,7 @@ function display_delivery_details(&$order)
 
 
                date_row($delname, 'delivery_date',
-                       $order->trans_type==30 ?  _('Enter requested day of delivery') : '');
+                       $order->trans_type==30 ?  _('Enter requested day of delivery') : $order->trans_type==32 ? _('Enter Valid until Date') : '');
                text_row(_("Deliver To:"), 'deliver_to', $order->deliver_to, 40, 40,
                        _('Additional identifier for delivery e.g. name of receiving person'));