Merged changes from main trunk 2.2.1-2.2.2
[fa-stable.git] / sales / customer_delivery.php
index eca3446868a64aa6cda2b774f445016d6a117204..cd7299a8d18d96c807129f913ce453edc8161f82 100644 (file)
@@ -1,10 +1,20 @@
 <?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
 //
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_SALESDELIVERY';
+$path_to_root = "..";
 
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
@@ -25,10 +35,10 @@ if ($use_date_picker) {
 
 if (isset($_GET['ModifyDelivery'])) {
        $_SESSION['page_title'] = sprintf(_("Modifying Delivery Note # %d."), $_GET['ModifyDelivery']);
-       $help_page_title = _("Modifying Delivery Note");
+       $help_context = "Modifying Delivery Note";
        processing_start();
 } elseif (isset($_GET['OrderNumber'])) {
-       $_SESSION['page_title'] = _("Deliver Items for a Sales Order");
+       $_SESSION['page_title'] = _($help_context = "Deliver Items for a Sales Order");
        processing_start();
 }
 
@@ -36,13 +46,15 @@ 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(ST_CUSTDELIVERY, $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, ST_CUSTDELIVERY));
+       display_note(print_document_link($dispatch_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
+       display_note(print_document_link($dispatch_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
+       display_note(print_document_link($dispatch_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
 
        display_note(get_gl_view_str(13, $dispatch_no, _("View the GL Journal Entries for this Dispatch")),1);
 
@@ -55,13 +67,15 @@ 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));
 
-       display_note(get_trans_view_str(13, $delivery_no, _("View this delivery")));
-       echo '<br>';
-       display_note(print_document_link($delivery_no, _("Print this delivery"), true, 13));
+       display_note(get_trans_view_str(ST_CUSTDELIVERY, $delivery_no, _("View this delivery")), 0, 1);
+
+       display_note(print_document_link($delivery_no, _("&Print Delivery Note"), true, ST_CUSTDELIVERY));
+       display_note(print_document_link($delivery_no, _("&Email Delivery Note"), true, ST_CUSTDELIVERY, false, "", "", 1), 1, 1);
+       display_note(print_document_link($delivery_no, _("P&rint as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 0, 1));
+       display_note(print_document_link($delivery_no, _("E&mail as Packing Slip"), true, ST_CUSTDELIVERY, false, "", "", 1, 1), 1);
 
        hyperlink_params($path_to_root . "/sales/customer_invoice.php", _("Confirm Delivery and Invoice"), "DeliveryNumber=$delivery_no");
 
@@ -73,7 +87,7 @@ if (isset($_GET['AddedID'])) {
 
 if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
 
-       $ord = new Cart(30,$_GET['OrderNumber'], true);
+       $ord = new Cart(ST_SALESORDER, $_GET['OrderNumber'], true);
 
        /*read in all the selected order into the Items cart  */
 
@@ -83,17 +97,18 @@ if (isset($_GET['OrderNumber']) && $_GET['OrderNumber'] > 0) {
                die ("<br><b>" . _("This order has no items. There is nothing to delivery.") . "</b>");
        }
 
-       $ord->trans_type = 13;
+       $ord->trans_type = ST_CUSTDELIVERY;
        $ord->src_docs = $ord->trans_no;
        $ord->order_no = key($ord->trans_no);
        $ord->trans_no = 0;
-       $ord->reference = references::get_next(13);
+       $ord->reference = $Refs->get_next(ST_CUSTDELIVERY);
+       $ord->document_date = new_doc_date();
        $_SESSION['Items'] = $ord;
        copy_from_cart();
 
 } elseif (isset($_GET['ModifyDelivery']) && $_GET['ModifyDelivery'] > 0) {
 
-       $_SESSION['Items'] = new Cart(13,$_GET['ModifyDelivery']);
+       $_SESSION['Items'] = new Cart(ST_CUSTDELIVERY,$_GET['ModifyDelivery']);
 
        if ($_SESSION['Items']->count_items() == 0) {
                hyperlink_params($path_to_root . "/sales/inquiry/sales_orders_view.php",
@@ -104,7 +119,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,41 +130,52 @@ 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"));
+       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');
+       }
+}
 
 //-----------------------------------------------------------------------------
 
 function check_data()
 {
+       global $Refs;
+
        if (!isset($_POST['DispatchDate']) || !is_date($_POST['DispatchDate'])) {
                display_error(_("The entered date of delivery is invalid."));
+               set_focus('DispatchDate');
                return false;
        }
 
        if (!is_date_in_fiscalyear($_POST['DispatchDate'])) {
                display_error(_("The entered date of delivery is not in fiscal year."));
+               set_focus('DispatchDate');
                return false;
        }
 
        if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
                display_error(_("The entered dead-line for invoice is invalid."));
+               set_focus('due_date');
                return false;
        }
 
        if ($_SESSION['Items']->trans_no==0) {
-               if (!references::is_valid($_POST['ref'])) {
+               if (!$Refs->is_valid($_POST['ref'])) {
                        display_error(_("You must enter a reference."));
+                       set_focus('ref');
                        return false;
                }
 
-               if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], 13)) {
+               if ($_SESSION['Items']->trans_no==0 && !is_new_reference($_POST['ref'], ST_CUSTDELIVERY)) {
                        display_error(_("The entered reference is already in use."));
+                       set_focus('ref');
                        return false;
                }
        }
@@ -159,6 +185,7 @@ function check_data()
 
        if (!check_num('ChargeFreightCost',0)) {
                display_error(_("The entered shipping value is not numeric."));
+               set_focus('ChargeFreightCost');
                return false;
        }
 
@@ -168,8 +195,6 @@ function check_data()
        }
 
        if (!check_quantities()) {
-               display_error(_("Selected quantity cannot be less than quantity invoiced nor more than quantity
-               not dispatched on sales order."));
                return false;
        }
 
@@ -181,12 +206,12 @@ 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'];
        if ($cart->trans_no == 0)
-               $dn->ref = $_POST['ref'];
+               $cart->reference = $_POST['ref'];
 
 }
 //------------------------------------------------------------------------------
@@ -196,10 +221,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;
 }
 //------------------------------------------------------------------------------
 
@@ -209,10 +236,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) {
-                               $_SESSION['Items']->line_items[$line]->qty_dispatched = 
+               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;
                        }
 
@@ -234,7 +270,9 @@ function check_quantities()
 
 function check_qoh()
 {
-       if (!sys_prefs::allow_negative_stock()) {
+       global $SysPrefs;
+
+       if (!$SysPrefs->allow_negative_stock()) {
                foreach ($_SESSION['Items']->line_items as $itm) {
 
                        if ($itm->qty_dispatched && has_stock_holding($itm->mb_flag)) {
@@ -264,6 +302,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();
@@ -274,8 +313,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
@@ -289,15 +332,15 @@ end_row();
 start_row();
 
 //if (!isset($_POST['ref']))
-//     $_POST['ref'] = references::get_next(13);
+//     $_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY);
 
 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'");
 }
 
-label_cells(_("For Sales Order"), get_customer_trans_view_str(systypes::sales_order(), $_SESSION['Items']->order_no), "class='tableheader2'");
+label_cells(_("For Sales Order"), get_customer_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no), "class='tableheader2'");
 
 label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
 end_row();
@@ -307,7 +350,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;
@@ -317,12 +360,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();
@@ -334,28 +377,40 @@ 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"),
+
+$new = $_SESSION['Items']->trans_no==0;
+$th = array(_("Item Code"), _("Item Description"), 
+       $new ? _("Ordered") : _("Max. delivery"), _("Units"), $new ? _("Delivered") : _("Invoiced"),
        _("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
-       if (sys_prefs::allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
+       $show_qoh = true;
+       if ($SysPrefs->allow_negative_stock() || !has_stock_holding($ln_itm->mb_flag) ||
                $ln_itm->qty_dispatched == 0) {
                $show_qoh = false;
        }
@@ -374,11 +429,12 @@ 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);
-       qty_cell($ln_itm->quantity);
+       $dec = get_qty_dec($ln_itm->stock_id);
+       qty_cell($ln_itm->quantity, false, $dec);
        label_cell($ln_itm->units);
-       qty_cell($ln_itm->qty_done);
+       qty_cell($ln_itm->qty_done, false, $dec);
 
-       small_amount_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched));
+       small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec);
 
        $display_discount_percent = percent_format($ln_itm->discount_percent*100) . "%";
 
@@ -392,28 +448,28 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
        end_row();
 }
 
-$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
+$_POST['ChargeFreightCost'] =  get_post('ChargeFreightCost', 
+       price_format($_SESSION['Items']->freight_cost));
 
-if (!check_num('ChargeFreightCost')) {
-               $_POST['ChargeFreightCost'] = price_format(0);
-}
+$colspan = 9;
 
 start_row();
-
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', $_SESSION['Items']->freight_cost, "colspan=9 align=right");
+label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
+small_amount_cells(null, 'ChargeFreightCost', $_SESSION['Items']->freight_cost);
+end_row();
 
 $inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
 
 $display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCost'));
 
-label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right");
+label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
 
 $taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
-$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included);
+$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included);
 
 $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
 
-label_row(_("Amount Total"), $display_total, "colspan=9 align=right","align=right");
+label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
 
 end_table(1);
 
@@ -427,9 +483,11 @@ policy_list_row(_("Action For Balance"), "bo_policy", null);
 textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);
-
-submit_center_first('Update', _("Update"));
-submit_center_last('process_delivery', _("Process Dispatch"));
+div_end();
+submit_center_first('Update', _("Update"),
+  _('Refresh document page'), true);
+submit_center_last('process_delivery', _("Process Dispatch"),
+  _('Check entered data and save document'), 'default');
 
 end_form();