X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=e795a30f4dc2b3e33f30490dd4ab7f140f0e90b5;hb=e39d77850382a1184502c596aae74f353de38774;hp=4b40b81de6b59bfeb5743d78548a320de8341f63;hpb=4e9e38f3f2eb3e645e04da23e10647fa61eac2e6;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 4b40b81d..e795a30f 100644 --- 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 '
'; - 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; } @@ -282,7 +310,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,19 +336,20 @@ 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']); } -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(); 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")); @@ -349,17 +378,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 ''; hidden('Line' . $line, $ln_itm->qty_dispatched ); - echo qty_format($ln_itm->qty_dispatched).''; + echo number_format2($ln_itm->qty_dispatched, $dec).''; } 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) . " %"; @@ -422,15 +452,17 @@ $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); -submit_center_first('Update', _("Update")); -submit_center_last('process_invoice', _("Process Invoice")); +submit_center_first('Update', _("Update"), + _('Refresh document page'), true); +submit_center_last('process_invoice', _("Process Invoice"), + _('Check entered data and save document'), true); end_form();