Next fixes to db_pager usage/behaviour.

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

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 540b45156909215ddd2a1ef430e7ca5bb9c1fcb2..e795a30f4dc2b3e33f30490dd4ab7f140f0e90b5 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -40,32 +40,30 @@ if (isset($_GET['AddedID'])) {
 
        $invoice_no = $_GET['AddedID'];
        $trans_type = 10;
-       print_hidden_script(10);
 
        display_notification(_("Selected deliveries has been processed"), true);
 
-       display_note(get_customer_trans_view_str($trans_type, $invoice_no, _("View This Invoice")), 0, 1);
+       display_note(get_customer_trans_view_str($trans_type, $invoice_no, _("&View This Invoice")), 0, 1);
 
-       display_note(print_document_link($invoice_no, _("Print This Invoice"), true, 10));
+       display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
 
-       display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL Journal Entries for this Invoice")),1);
+       display_note(get_gl_view_str($trans_type, $invoice_no, _("View the GL &Journal Entries for this Invoice")),1);
 
-       hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another Delivery For Invoicing"), "OutstandingOnly=1");
+       hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
 
        display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID']))  {
 
        $invoice_no = $_GET['UpdatedID'];
-       print_hidden_script(10);
 
        display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no));
 
-       display_note(get_trans_view_str(10, $invoice_no, _("View This Invoice")));
+       display_note(get_trans_view_str(10, $invoice_no, _("&View This Invoice")));
        echo '<br>';
-       display_note(print_document_link($invoice_no, _("Print This Invoice"), true, 10));
+       display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
 
-       hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different Invoice to Modify"));
+       hyperlink_no_params($path_to_root . "/sales/inquiry/customer_inquiry.php", _("Select A Different &Invoice to Modify"));
 
        display_footer_exit();
 
@@ -136,13 +134,38 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 
        end_page();
        exit;
-} else {
+} elseif (!check_quantities()) {
+       display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
+}
+if (isset($_POST['Update'])) {
+       $Ajax->activate('Items');
+}
+if (isset($_POST['_InvoiceDate_changed'])) {
+       $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, 
+               $_POST['InvoiceDate']);
+       $Ajax->activate('due_date');
+}
+//-----------------------------------------------------------------------------
+function check_quantities()
+{
+       $ok =1;
        foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
                if (isset($_POST['Line'.$line_no])) {
-                       if (!check_num('Line'.$line_no, 0, ($itm->quantity - $itm->qty_done))) {
+                       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_no, $min, $max)) {
                                $_SESSION['Items']->line_items[$line_no]->qty_dispatched =
                                    input_num('Line'.$line_no);
                        }
+                       else {
+                               $ok = 0;
+                       }
+                               
                }
 
                if (isset($_POST['Line'.$line_no.'Desc'])) {
@@ -152,8 +175,8 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
                        }
                }
        }
+ return $ok;
 }
-//-----------------------------------------------------------------------------
 
 function copy_to_cart()
 {
@@ -227,6 +250,11 @@ function check_data()
                return false;
        }
 
+       if (!check_quantities()) {
+               display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
+               return false;
+       }
+
        return true;
 }
 
@@ -308,7 +336,7 @@ 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'", true);
 
 if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) {
        $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, $_POST['InvoiceDate']);
@@ -321,6 +349,7 @@ end_table();
 
 display_heading(_("Invoice Items"));
 
+div_start('Items');
 start_table("$table_style width=80%");
 $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
        _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
@@ -423,9 +452,9 @@ $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost')
 label_row(_("Invoice Total"), $display_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
 
 end_table(1);
+div_end();
 
 start_table($table_style2);
-
 textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);