X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=fed8094e05337bdd8035ac7f50f1ab9964569b31;hb=c2f32b7b39e8c21c29f66fee832938b2ad2f31cb;hp=ded481faf5e56747b229d3d00f7bbd3aab45baa4;hpb=6183e9450dcd7e4c747889c10903f6ff1b0add33;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index ded481fa..fed8094e 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -35,37 +35,36 @@ if (isset($_GET['ModifyInvoice'])) { page($_SESSION['page_title'], false, false, "", $js); //----------------------------------------------------------------------------- +check_edit_conflicts(); 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(); @@ -79,12 +78,16 @@ if (isset($_GET['AddedID'])) { } } unset($line); + + // Remove also src_doc delivery note + $sources = &$_SESSION['Items']->src_docs; + unset($sources[$_GET['RemoveDN']]); } //----------------------------------------------------------------------------- if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) - || isset($_GET['BatchInvoice'])) { +|| isset($_GET['BatchInvoice'])) { processing_start(); @@ -114,6 +117,12 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) } elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) { + if ( get_parent_trans(10, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack + echo"

" . _("There in no delivery notes for this invoice.
+ Most likely this invoice was created in Front Accounting version prior to 2.0 + and therefore can not be modified.") . "
"; + display_footer_exit(); + } processing_start(); $_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']); @@ -130,13 +139,39 @@ 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'])) { @@ -146,8 +181,26 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) } } } + return $ok; } -//----------------------------------------------------------------------------- + +function set_delivery_shipping_sum($delivery_notes) +{ + + $shipping = 0; + + foreach($delivery_notes as $delivery_num) + { + $myrow = get_customer_trans($delivery_num, 13); + //$branch = get_branch($myrow["branch_code"]); + //$sales_order = get_sales_order_header($myrow["order_"]); + + //$shipping += $sales_order['freight_cost']; + $shipping += $myrow['ov_freight']; + } + $_POST['ChargeFreightCost'] = price_format($shipping); +} + function copy_to_cart() { @@ -168,6 +221,7 @@ function copy_from_cart() $_POST['InvoiceDate']= $cart->document_date; $_POST['due_date'] = $cart->due_date; $_POST['Comments']= $cart->Comments; + $_POST['cart_id'] = $cart->cart_id; } //----------------------------------------------------------------------------- @@ -221,6 +275,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; } @@ -263,8 +322,10 @@ $dspans[] = $spanlen; //----------------------------------------------------------------------------- $is_batch_invoice = count($_SESSION['Items']->src_docs) > 1; + $is_edition = $_SESSION['Items']->trans_type == 10 && $_SESSION['Items']->trans_no != 0; start_form(false, true); +hidden('cart_id'); start_table("$table_style2 width=80%", 5); @@ -276,7 +337,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'"); } @@ -302,19 +363,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")); @@ -343,17 +405,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) . " %"; @@ -394,6 +457,10 @@ if (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] == "") { } } +$accumulate_shipping = get_company_pref('accumulate_shipping'); +if ($is_batch_invoice && $accumulate_shipping) + set_delivery_shipping_sum(array_keys($_SESSION['Items']->src_docs)); + start_row(); small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', null, "colspan=9 align=right"); @@ -416,15 +483,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();