New files from unstable branch

[fa-stable.git] / sales / customer_delivery.php

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 36574efa45c68391f9cbd34d4eabcb591bef18b0..ee19660c95aef179f922430fe509dfa8a4cac48b 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -103,6 +103,10 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        $ord->trans_no = 0;
        $ord->reference = $Refs->get_next(ST_CUSTDELIVERY);
        $ord->document_date = new_doc_date();
+       $cust = get_customer($ord->customer_id);
+       // 2010-09-03 Joe Hunt
+       $ord->dimension_id = $cust['dimension_id'];
+       $ord->dimension2_id = $cust['dimension2_id'];
        $_SESSION['Items'] = $ord;
        copy_from_cart();
 
@@ -210,6 +214,8 @@ function copy_to_cart()
        $cart->due_date =  $_POST['due_date'];
        $cart->Location = $_POST['Location'];
        $cart->Comments = $_POST['Comments'];
+       $cart->dimension_id = $_POST['dimension_id'];
+       $cart->dimension2_id = $_POST['dimension2_id'];
        if ($cart->trans_no == 0)
                $cart->reference = $_POST['ref'];
 
@@ -225,6 +231,8 @@ function copy_from_cart()
        $_POST['due_date'] = $cart->due_date;
        $_POST['Location'] = $cart->Location;
        $_POST['Comments'] = $cart->Comments;
+       $_POST['dimension_id'] = $cart->dimension_id;
+       $_POST['dimension2_id'] = $cart->dimension2_id;
        $_POST['cart_id'] = $cart->cart_id;
        $_POST['ref'] = $cart->reference;
 }
@@ -320,10 +328,10 @@ if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
 start_form();
 hidden('cart_id');
 
-start_table("$table_style2 width=80%", 5);
+start_table(TABLESTYLE2, "width=80%", 5);
 echo "<tr><td>"; // outer table
 
-start_table("$table_style width=100%");
+start_table(TABLESTYLE, "width=100%");
 start_row();
 label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'");
 label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'");
@@ -372,11 +380,31 @@ end_table();
 
 echo "</td><td>";// outer table
 
-start_table("$table_style width=90%");
+start_table(TABLESTYLE, "width=90%");
 
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
-       $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
+       $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['DispatchDate']);
 }
+customer_credit_row($_SESSION['Items']->customer_id, $_SESSION['Items']->credit, "class='tableheader2'");
+// 2010-09-03 Joe Hunt
+$dim = get_company_pref('use_dimension');
+if ($dim > 0) {
+       start_row();
+       label_cell(_("Dimension").":", "class='tableheader2'");
+       dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false);
+       end_row();
+}              
+else
+       hidden('dimension_id', 0);
+if ($dim > 1) {
+       start_row();
+       label_cell(_("Dimension")." 2:", "class='tableheader2'");
+       dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false);
+       end_row();
+}              
+else
+       hidden('dimension2_id', 0);
+//---------
 start_row();
 date_cells(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
 end_row();
@@ -395,7 +423,7 @@ if ($row['dissallow_invoices'] == 1)
 }      
 display_heading(_("Delivery Items"));
 div_start('Items');
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width=80%");
 
 $new = $_SESSION['Items']->trans_no==0;
 $th = array(_("Item Code"), _("Item Description"), 
@@ -430,7 +458,11 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
        }
        view_stock_status_cell($ln_itm->stock_id);
 
-       text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+       if ($ln_itm->descr_editable)
+               text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50);
+       else
+               label_cell($ln_itm->item_description);
+
        $dec = get_qty_dec($ln_itm->stock_id);
        qty_cell($ln_itm->quantity, false, $dec);
        label_cell($ln_itm->units);
@@ -478,7 +510,7 @@ end_table(1);
 if ($has_marked) {
        display_note(_("Marked items have insufficient quantities in stock as on day of delivery."), 0, 1, "class='red'");
 }
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 policy_list_row(_("Action For Balance"), "bo_policy", null);