Incorrect Journal Balance (sales invoice) when many decimals in tax and price.

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

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 422b93c0edff3a7d4cfeaf337fd253301af29cb8..c634a94e75109bf06a1fee1d597c014e29cb1db0 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -19,7 +19,6 @@ $path_to_root = "..";
 include_once($path_to_root . "/sales/includes/cart_class.inc");
 include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
-include_once($path_to_root . "/includes/manufacturing.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
@@ -174,7 +173,7 @@ function check_data()
        }
 
        if ($_SESSION['Items']->trans_no==0) {
-               if (!$Refs->is_valid($_POST['ref'])) {
+               if (!$Refs->is_valid($_POST['ref'], ST_CUSTDELIVERY)) {
                        display_error(_("You must enter a reference."));
                        set_focus('ref');
                        return false;
@@ -249,13 +248,14 @@ function check_quantities()
        // Update cart delivery quantities/descriptions
        foreach ($_SESSION['Items']->line_items as $line=>$itm) {
                if (isset($_POST['Line'.$line])) {
-               if($_SESSION['Items']->trans_no) {
-                       $min = $itm->qty_done;
-                       $max = $itm->quantity;
-               } else {
-                       $min = 0;
-                       $max = $itm->quantity - $itm->qty_done;
-               }
+                       if($_SESSION['Items']->trans_no) {
+                               $min = $itm->qty_done;
+                               $max = $itm->quantity;
+                       } else {
+                               $min = 0;
+                               // Fixing floating point problem in PHP.
+                               $max = round2($itm->quantity - $itm->qty_done, get_unit_dec($itm->stock_id));
+                       }
 
                        if (check_num('Line'.$line, $min, $max)) {
                                $_SESSION['Items']->line_items[$line]->qty_dispatched =
@@ -330,11 +330,11 @@ label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableh
 end_row();
 start_row();
 
-//if (!isset($_POST['ref']))
-//     $_POST['ref'] = $Refs->get_next(ST_CUSTDELIVERY);
-
 if ($_SESSION['Items']->trans_no==0) {
-       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_CUSTDELIVERY,
+       array('customer' => $_SESSION['Items']->customer_id,
+                       'branch' => $_SESSION['Items']->Branch,
+                       'date' => get_post('DispatchDate')));
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -377,7 +377,7 @@ if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
        $_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();