Changed the Quantity routines to use the Item Units decimals if any. A lot of files.

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

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index 5d0aaa1cbda6bab31974b0cf2b2b767173139fce..9fa1a2a211ead4650b17e56d579e6384c0f9133c 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -217,7 +217,7 @@ function check_quantities()
        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 = 
+                               $_SESSION['Items']->line_items[$line]->qty_dispatched =
                                  input_num('Line'.$line);
                        } else {
                                $ok = 0;
@@ -381,11 +381,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_qty_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) . "%";