Added ajax and some smaller fixes in sales module files

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

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 4b40b81de6b59bfeb5743d78548a320de8341f63..18d674c695722353a37fe0bcb1f064402de2a3a0 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -282,7 +282,7 @@ end_row();
 start_row();
 
 if ($_SESSION['Items']->trans_no == 0) {
-       ref_cells(_("Reference"), 'ref', $_SESSION['Items']->reference, "class='tableheader2'");
+       ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
 } else {
        label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -308,13 +308,13 @@ if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
        }
 }
 
-date_cells(_("Date"), 'InvoiceDate', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'InvoiceDate', '', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'");
 
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
        $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['InvoiceDate']);
 }
 
-date_cells(_("Due Date"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Due Date"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
 
 end_row();
 end_table();
@@ -349,17 +349,18 @@ 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);
 
        if ($is_batch_invoice) {
                // for batch invoices we can only remove whole deliveries
                echo '<td nowrap align=right>';
                hidden('Line' . $line, $ln_itm->qty_dispatched );
-               echo qty_format($ln_itm->qty_dispatched).'</td>';
+               echo number_format2($ln_itm->qty_dispatched, $dec).'</td>';
        } else {
-               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) . " %";