Merged changes from main CVS up to 2.1.5
[fa-stable.git] / sales / customer_delivery.php
index fd20ebb05a88386572a802770ca8d8119d440389..23cbd79a10a2ed31f3bf1478eb9ee29660932012 100644 (file)
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //-----------------------------------------------------------------------------
 //
 //     Entry/Modify Delivery Note against Sales Order
@@ -36,13 +46,13 @@ page($_SESSION['page_title'], false, false, "", $js);
 
 if (isset($_GET['AddedID'])) {
        $dispatch_no = $_GET['AddedID'];
-       print_hidden_script(13);
 
-       display_notification(_("Dispatch processed:") . ' '.$_GET['AddedID'], true);
+       display_notification_centered(sprintf(_("Delivery # %d has been entered."),$dispatch_no));
 
-       display_note(get_customer_trans_view_str(13, $dispatch_no, _("View this dispatch")), 0, 1);
+       display_note(get_customer_trans_view_str(13, $dispatch_no, _("&View This Delivery")), 0, 1);
 
-       display_note(print_document_link($dispatch_no, _("Print this delivery"), true, 13));
+       display_note(print_document_link($dispatch_no, _("&Print Delivery Note"), true, 13));
+       display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, 13, false, "", "", 1),0, 1);
 
        display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
 
@@ -55,7 +65,6 @@ if (isset($_GET['AddedID'])) {
 } elseif (isset($_GET['UpdatedID'])) {
 
        $delivery_no = $_GET['UpdatedID'];
-       print_hidden_script(13);
 
        display_notification_centered(sprintf(_('Delivery Note # %d has been updated.'),$delivery_no));
 
@@ -73,7 +82,7 @@ if (isset($_GET['AddedID'])) {
 
 if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
-       $ord = new Cart(30,$_GET['OrderNumber'], true);
+       $ord = new Cart(30, $_GET['OrderNumber'], true);
 
        /*read in all the selected order into the Items cart  */
 
@@ -88,6 +97,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        $ord->order_no = key($ord->trans_no);
        $ord->trans_no = 0;
        $ord->reference = references::get_next(13);
+       $ord->document_date = new_doc_date();
        $_SESSION['Items'] = $ord;
        copy_from_cart();
 
@@ -104,7 +114,7 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        }
 
        copy_from_cart();
-
+       
 } elseif ( !processing_active() ) {
        /* This page can only be called with an order number for invoicing*/
 
@@ -115,14 +125,16 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
        end_page();
        exit;
 
-} elseif (!check_quantities()) {
-       display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
-               not dispatched on sales order."));
+} else {
+       check_edit_conflicts();
 
-} elseif(!check_num('ChargeFreightCost', 0))
-       display_error(_("Freight cost cannot be less than zero"));
-       set_focus('ChargeFreightCost');
+       if (!check_quantities()) {
+               display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity not dispatched on sales order."));
 
+       } elseif(!check_num('ChargeFreightCost', 0))
+               display_error(_("Freight cost cannot be less than zero"));
+               set_focus('ChargeFreightCost');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -188,7 +200,7 @@ function copy_to_cart()
        $cart = &$_SESSION['Items'];
        $cart->ship_via = $_POST['ship_via'];
        $cart->freight_cost = input_num('ChargeFreightCost');
-       $cart->document_date =  $_POST['DispatchDate'];
+       $cart->document_date = $_POST['DispatchDate'];
        $cart->due_date =  $_POST['due_date'];
        $cart->Location = $_POST['Location'];
        $cart->Comments = $_POST['Comments'];
@@ -203,10 +215,12 @@ function copy_from_cart()
        $cart = &$_SESSION['Items'];
        $_POST['ship_via'] = $cart->ship_via;
        $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
-       $_POST['DispatchDate']= $cart->document_date;
+       $_POST['DispatchDate'] = $cart->document_date;
        $_POST['due_date'] = $cart->due_date;
-       $_POST['Location']= $cart->Location;
-       $_POST['Comments']= $cart->Comments;
+       $_POST['Location'] = $cart->Location;
+       $_POST['Comments'] = $cart->Comments;
+       $_POST['cart_id'] = $cart->cart_id;
+       $_POST['ref'] = $cart->reference;
 }
 //------------------------------------------------------------------------------
 
@@ -216,10 +230,19 @@ function check_quantities()
        // Update cart delivery quantities/descriptions
        foreach ($_SESSION['Items']->line_items as $line=>$itm) {
                if (isset($_POST['Line'.$line])) {
-                       if (!check_num('Line'.$line, $itm->qty_done, $itm->quantity) == 0) {
+               if($_SESSION['Items']->trans_no) {
+                       $min = $itm->qty_done;
+                       $max = $itm->quantity;
+               } else {
+                       $min = 0;
+                       $max = $itm->quantity - $itm->qty_done;
+               }
+               
+                       if (check_num('Line'.$line, $min, $max)) {
                                $_SESSION['Items']->line_items[$line]->qty_dispatched =
                                  input_num('Line'.$line);
                        } else {
+                               set_focus('Line'.$line);
                                $ok = 0;
                        }
 
@@ -271,6 +294,7 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
        $newdelivery = ($dn->trans_no == 0);
 
        copy_to_cart();
+       if ($newdelivery) new_doc_date($dn->document_date);
        $delivery_no = $dn->write($bo_policy);
 
        processing_end();
@@ -281,8 +305,12 @@ if (isset($_POST['process_delivery']) && check_data() && check_qoh()) {
        }
 }
 
+if (isset($_POST['Update']) || isset($_POST['_Location_update'])) {
+       $Ajax->activate('Items');
+}
 //------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
+hidden('cart_id');
 
 start_table("$table_style2 width=80%", 5);
 echo "<tr><td>"; // outer table
@@ -299,7 +327,7 @@ start_row();
 //     $_POST['ref'] = references::get_next(13);
 
 if ($_SESSION['Items']->trans_no==0) {
-       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -314,7 +342,7 @@ if (!isset($_POST['Location'])) {
        $_POST['Location'] = $_SESSION['Items']->Location;
 }
 label_cell(_("Delivery From"), "class='tableheader2'");
-locations_list_cells(null, 'Location',$_POST['Location'], false, true);
+locations_list_cells(null, 'Location', null, false, true);
 
 if (!isset($_POST['ship_via'])) {
        $_POST['ship_via'] = $_SESSION['Items']->ship_via;
@@ -324,12 +352,12 @@ shippers_list_cells(null, 'ship_via', $_POST['ship_via']);
 
 // set this up here cuz it's used to calc qoh
 if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
-       $_POST['DispatchDate'] = Today();
+       $_POST['DispatchDate'] = new_doc_date();
        if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
                $_POST['DispatchDate'] = end_fiscalyear();
        }
 }
-date_cells(_("Date"), 'DispatchDate', '', $_POST['DispatchDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'DispatchDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'");
 end_row();
 
 end_table();
@@ -341,27 +369,35 @@ start_table("$table_style width=90%");
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
        $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['DispatchDate']);
 }
-date_row(_("Invoice Dead-line"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
+date_row(_("Invoice Dead-line"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
 end_table();
 
 echo "</td></tr>";
 end_table(1); // outer table
 
+$row = get_customer_to_order($_SESSION['Items']->customer_id);
+if ($row['dissallow_invoices'] == 1)
+{
+       display_error(_("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."));
+       end_form();
+       end_page();
+       exit();
+}      
 display_heading(_("Delivery Items"));
-
+div_start('Items');
 start_table("$table_style width=80%");
 $th = array(_("Item Code"), _("Item Description"), _("Ordered"), _("Units"), _("Delivered"),
        _("This Delivery"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
 table_header($th);
 $k = 0;
 $has_marked = false;
-$show_qoh = true;
 
 foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
        if ($ln_itm->quantity==$ln_itm->qty_done) {
                continue; //this line is fully delivered
        }
        // if it's a non-stock item (eg. service) don't show qoh
+       $show_qoh = true;
        if (sys_prefs::allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
                $ln_itm->qty_dispatched == 0) {
                $show_qoh = false;
@@ -400,11 +436,8 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
        end_row();
 }
 
-$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
-
-if (!check_num('ChargeFreightCost')) {
-               $_POST['ChargeFreightCost'] = price_format(0);
-}
+$_POST['ChargeFreightCost'] =  get_post('ChargeFreightCost', 
+       price_format($_SESSION['Items']->freight_cost));
 
 start_row();
 
@@ -435,11 +468,11 @@ policy_list_row(_("Action For Balance"), "bo_policy", null);
 textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);
-
+div_end();
 submit_center_first('Update', _("Update"),
   _('Refresh document page'), true);
 submit_center_last('process_delivery', _("Process Dispatch"),
-  _('Check entered data and save document'), true);
+  _('Check entered data and save document'), 'default');
 
 end_form();