X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=e4ab5158322f95ef6fffea1a7f20fdf724a76317;hb=7e6e0807990447d2977b970c3a0fd28dc9250194;hp=66e3c6b927ad863b22b325d54fa7a36afa57fe30;hpb=8127089373814523c323e3e60cd48ea547c1c0f5;p=fa-stable.git diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php index 66e3c6b9..e4ab5158 100644 --- a/sales/customer_invoice.php +++ b/sales/customer_invoice.php @@ -19,17 +19,17 @@ $path_to_root = ".."; include_once($path_to_root . "/sales/includes/cart_class.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/includes/data_checks.inc"); -include_once($path_to_root . "/includes/manufacturing.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); include_once($path_to_root . "/taxes/tax_calc.inc"); +include_once($path_to_root . "/admin/db/shipping_db.inc"); $js = ""; -if ($use_popup_windows) { +if ($SysPrefs->use_popup_windows) { $js .= get_js_open_window(900, 500); } -if ($use_date_picker) { +if (user_use_date_picker()) { $js .= get_js_date_picker(); } @@ -40,12 +40,14 @@ if (isset($_GET['ModifyInvoice'])) { $_SESSION['page_title'] = _($help_context = "Issue an Invoice for Delivery Note"); } elseif (isset($_GET['BatchInvoice'])) { $_SESSION['page_title'] = _($help_context = "Issue Batch Invoice for Delivery Notes"); +} elseif (isset($_GET['AllocationNumber']) || isset($_GET['InvoicePrepayments'])) { + $_SESSION['page_title'] = _($help_context = "Prepayment or Final Invoice Entry"); } - page($_SESSION['page_title'], false, false, "", $js); //----------------------------------------------------------------------------- -check_edit_conflicts(); + +check_edit_conflicts(get_post('cart_id')); if (isset($_GET['AddedID'])) { @@ -56,26 +58,34 @@ if (isset($_GET['AddedID'])) { 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, ST_SALESINVOICE)); - display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "", "", 1),1); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Print This Invoice"), true, ST_SALESINVOICE)); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),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"); + if (!db_num_rows(get_allocatable_from_cust_transactions(null, $invoice_no, $trans_type))) + hyperlink_params("$path_to_root/sales/customer_payments.php", _("Entry &customer payment for this invoice"), + "SInvoice=".$invoice_no); + + hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$invoice_no"); + display_footer_exit(); } elseif (isset($_GET['UpdatedID'])) { $invoice_no = $_GET['UpdatedID']; + $trans_type = ST_SALESINVOICE; display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no)); display_note(get_trans_view_str(ST_SALESINVOICE, $invoice_no, _("&View This Invoice"))); echo '
'; - display_note(print_document_link($invoice_no, _("&Print This Invoice"), true, ST_SALESINVOICE)); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Print This Invoice"), true, ST_SALESINVOICE)); + display_note(print_document_link($invoice_no."-".$trans_type, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "printlink", "", 1),1); - 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 Another &Invoice to Modify")); display_footer_exit(); @@ -98,7 +108,7 @@ if (isset($_GET['AddedID'])) { //----------------------------------------------------------------------------- if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) -|| isset($_GET['BatchInvoice'])) { + || isset($_GET['BatchInvoice'])) { processing_start(); @@ -108,6 +118,7 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) } else { $src = array($_GET['DeliveryNumber']); } + /*read in all the selected deliveries into the Items cart */ $dn = new Cart(ST_CUSTDELIVERY, $src, true); @@ -117,23 +128,13 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) die ("
" . _("There are no delivered items with a quantity left to invoice. There is nothing left to invoice.") . ""); } - $dn->trans_type = ST_SALESINVOICE; - $dn->src_docs = $dn->trans_no; - $dn->trans_no = 0; - $dn->reference = $Refs->get_next(ST_SALESINVOICE); - $dn->due_date = get_invoice_duedate($dn->payment, $dn->document_date); - $_SESSION['Items'] = $dn; copy_from_cart(); } elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) { - if ( get_parent_trans(ST_SALESINVOICE, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack - echo"

" . _("There are 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(); - } + check_is_editable(ST_SALESINVOICE, $_GET['ModifyInvoice']); + processing_start(); $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']); @@ -142,7 +143,37 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) display_footer_exit(); } copy_from_cart(); -} elseif (!processing_active()) { +} elseif (isset($_GET['AllocationNumber']) || isset($_GET['InvoicePrepayments'])) { + + check_deferred_income_act(_("You have to set Deferred Income Account in GL Setup to entry prepayment invoices.")); + + if (isset($_GET['AllocationNumber'])) + { + $payments = array(get_cust_allocation($_GET['AllocationNumber'])); + + if (!$payments || ($payments[0]['trans_type_to'] != ST_SALESORDER)) + { + display_error(_("Please select correct Sales Order Prepayment to be invoiced and try again.")); + display_footer_exit(); + } + $order_no = $payments[0]['trans_no_to']; + } + else { + $order_no = $_GET['InvoicePrepayments']; + } + processing_start(); + + $_SESSION['Items'] = new cart(ST_SALESORDER, $order_no, ST_SALESINVOICE); + $_SESSION['Items']->order_no = $order_no; + $_SESSION['Items']->src_docs = array($order_no); + $_SESSION['Items']->trans_no = 0; + $_SESSION['Items']->trans_type = ST_SALESINVOICE; + + $_SESSION['Items']->update_payments(); + + copy_from_cart(); +} +elseif (!processing_active()) { /* This page can only be called with a delivery for invoicing or invoice no for edit */ display_error(_("This page can only be opened after delivery selection. Please select delivery to invoicing first.")); @@ -150,21 +181,15 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) ) end_page(); exit; -} elseif (!check_quantities()) { +} elseif (!isset($_POST['process_invoice']) && (!$_SESSION['Items']->is_prepaid() && !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']->payment, - $_POST['InvoiceDate']); - $Ajax->activate('due_date'); -} -if (list_updated('payment')) { - $_SESSION['Items']->payment = get_post('payment'); - $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, - $_POST['InvoiceDate']); + $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']); $Ajax->activate('due_date'); } @@ -208,11 +233,8 @@ function set_delivery_shipping_sum($delivery_notes) 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']; + $myrow = get_customer_trans($delivery_num, ST_CUSTDELIVERY); + $shipping += $myrow['ov_freight']; } $_POST['ChargeFreightCost'] = price_format($shipping); @@ -222,28 +244,44 @@ function set_delivery_shipping_sum($delivery_notes) function copy_to_cart() { $cart = &$_SESSION['Items']; - $cart->ship_via = $_POST['ship_via']; - $cart->freight_cost = input_num('ChargeFreightCost'); - $cart->document_date = $_POST['InvoiceDate']; - $cart->due_date = $_POST['due_date']; - $cart->payment = $_POST['payment']; + $cart->due_date = $cart->document_date = $_POST['InvoiceDate']; $cart->Comments = $_POST['Comments']; + $cart->due_date = $_POST['due_date']; + if (($cart->pos['cash_sale'] || $cart->pos['credit_sale']) && isset($_POST['payment'])) { + $cart->payment = $_POST['payment']; + $cart->payment_terms = get_payment_terms($_POST['payment']); + } if ($_SESSION['Items']->trans_no == 0) $cart->reference = $_POST['ref']; + if (!$cart->is_prepaid()) + { + $cart->ship_via = $_POST['ship_via']; + $cart->freight_cost = input_num('ChargeFreightCost'); + } + $cart->update_payments(); + + $cart->dimension_id = $_POST['dimension_id']; + $cart->dimension2_id = $_POST['dimension2_id']; } //----------------------------------------------------------------------------- function copy_from_cart() { $cart = &$_SESSION['Items']; - $_POST['ship_via'] = $cart->ship_via; - $_POST['ChargeFreightCost'] = price_format($cart->freight_cost); + $_POST['Comments']= $cart->Comments; $_POST['InvoiceDate']= $cart->document_date; - $_POST['due_date'] = $cart->due_date; - $_POST['Comments']= $cart->Comments; + $_POST['ref'] = $cart->reference; $_POST['cart_id'] = $cart->cart_id; - $_POST['ref'] = $cart->reference; + $_POST['due_date'] = $cart->due_date; + $_POST['payment'] = $cart->payment; + if (!$_SESSION['Items']->is_prepaid()) + { + $_POST['ship_via'] = $cart->ship_via; + $_POST['ChargeFreightCost'] = price_format($cart->freight_cost); + } + $_POST['dimension_id'] = $cart->dimension_id; + $_POST['dimension2_id'] = $cart->dimension2_id; } //----------------------------------------------------------------------------- @@ -252,6 +290,8 @@ function check_data() { global $Refs; + $prepaid = $_SESSION['Items']->is_prepaid(); + if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) { display_error(_("The entered invoice date is invalid.")); set_focus('InvoiceDate'); @@ -259,49 +299,52 @@ function check_data() } if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) { - display_error(_("The entered invoice date is not in fiscal year.")); + display_error(_("The entered date is out of fiscal year or is closed for further data entry.")); set_focus('InvoiceDate'); return false; } - if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { + + if (!$prepaid &&(!isset($_POST['due_date']) || !is_date($_POST['due_date']))) { display_error(_("The entered invoice due date is invalid.")); set_focus('due_date'); return false; } if ($_SESSION['Items']->trans_no == 0) { - if (!$Refs->is_valid($_POST['ref'])) { + if (!$Refs->is_valid($_POST['ref'], ST_SALESINVOICE)) { display_error(_("You must enter a reference.")); set_focus('ref'); return false; } - - if (!is_new_reference($_POST['ref'], 10)) { - display_error(_("The entered reference is already in use.")); - set_focus('ref'); - return false; - } } - if ($_POST['ChargeFreightCost'] == "") { - $_POST['ChargeFreightCost'] = price_format(0); - } + if(!$prepaid) + { + if ($_POST['ChargeFreightCost'] == "") { + $_POST['ChargeFreightCost'] = price_format(0); + } - if (!check_num('ChargeFreightCost', 0)) { - display_error(_("The entered shipping value is not numeric.")); - set_focus('ChargeFreightCost'); - return false; - } + if (!check_num('ChargeFreightCost', 0)) { + display_error(_("The entered shipping value is not numeric.")); + set_focus('ChargeFreightCost'); + return false; + } - if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) { - display_error(_("There are no item quantities on this invoice.")); - return false; - } + if ($_SESSION['Items']->has_items_dispatch() == 0 && input_num('ChargeFreightCost') == 0) { + display_error(_("There are no item quantities on this invoice.")); + return false; + } - if (!check_quantities()) { - display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet.")); - return false; + if (!check_quantities()) { + display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet.")); + return false; + } + } else { + if (($_SESSION['Items']->payment_terms['days_before_due'] == -1) && !count($_SESSION['Items']->prepayments)) { + display_error(_("There is no non-invoiced payments for this order. If you want to issue final invoice, select delayed or cash payment terms.")); + return false; + } } return true; @@ -309,18 +352,42 @@ function check_data() //----------------------------------------------------------------------------- if (isset($_POST['process_invoice']) && check_data()) { - $newinvoice= $_SESSION['Items']->trans_no == 0; copy_to_cart(); - if ($newinvoice) new_doc_date($_SESSION['Items']->document_date); + + if ($newinvoice) + new_doc_date($_SESSION['Items']->document_date); $invoice_no = $_SESSION['Items']->write(); - processing_end(); + if ($invoice_no == -1) + { + display_error(_("The entered reference is already in use.")); + set_focus('ref'); + } + else + { + processing_end(); + + if ($newinvoice) { + meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no"); + } else { + meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no"); + } + } +} - if ($newinvoice) { - meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no"); - } else { - meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no"); +if(list_updated('payment')) { + $order = &$_SESSION['Items']; + copy_to_cart(); + $order->payment = get_post('payment'); + $order->payment_terms = get_payment_terms($order->payment); + $_POST['due_date'] = $order->due_date = get_invoice_duedate($order->payment, $order->document_date); + $_POST['Comments'] = ''; + $Ajax->activate('due_date'); + $Ajax->activate('options'); + if ($order->payment_terms['cash_sale']) { + $_POST['Location'] = $order->Location = $order->pos['pos_location']; + $order->location_name = $order->pos['location_name']; } } @@ -348,35 +415,51 @@ $dspans[] = $spanlen; //----------------------------------------------------------------------------- $is_batch_invoice = count($_SESSION['Items']->src_docs) > 1; +$prepaid = $_SESSION['Items']->is_prepaid(); $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['Items']->trans_no != 0; start_form(); hidden('cart_id'); -start_table("$table_style2 width=80%", 5); +start_table(TABLESTYLE2, "width='80%'", 5); start_row(); +$colspan = 1; +$dim = get_company_pref('use_dimension'); +if ($dim > 0) + $colspan = 3; label_cells(_("Customer"), $_SESSION['Items']->customer_name, "class='tableheader2'"); label_cells(_("Branch"), get_branch_name($_SESSION['Items']->Branch), "class='tableheader2'"); -label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'"); +if (($_SESSION['Items']->pos['credit_sale'] || $_SESSION['Items']->pos['cash_sale'])) { + $paymcat = !$_SESSION['Items']->pos['cash_sale'] ? PM_CREDIT : + (!$_SESSION['Items']->pos['credit_sale'] ? PM_CASH : PM_ANY); + label_cells(_("Payment terms:"), sale_payment_list('payment', $paymcat), + "class='tableheader2'", "colspan=$colspan"); +} else + label_cells(_('Payment:'), $_SESSION['Items']->payment_terms['terms'], "class='tableheader2'", "colspan=$colspan"); + end_row(); start_row(); if ($_SESSION['Items']->trans_no == 0) { - ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'"); + ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'", false, ST_SALESINVOICE, + array('customer' => $_SESSION['Items']->customer_id, + 'branch' => $_SESSION['Items']->Branch, + 'date' => get_post('InvoiceDate'))); } else { label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'"); } -//label_cells(_("Delivery Notes:"), -//get_customer_trans_view_str(ST_CUSTDELIVERY, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'"); - label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'"); -if ($_SESSION['Items']->pos != -1) // editable payment type - label_cells(_("Payment terms:"), sale_payment_list('payment'), "class='tableheader2'"); +label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'"); +if ($dim > 0) { + label_cell(_("Dimension").":", "class='tableheader2'"); + $_POST['dimension_id'] = $_SESSION['Items']->dimension_id; + dimensions_list_cells(null, 'dimension_id', null, true, ' ', false, 1, false); +} else - label_cells(_('Payment:'), $_SESSION['Items']->payment_terms['terms'], "class='tableheader2'"); + hidden('dimension_id', 0); end_row(); start_row(); @@ -385,7 +468,12 @@ if (!isset($_POST['ship_via'])) { $_POST['ship_via'] = $_SESSION['Items']->ship_via; } label_cell(_("Shipping Company"), "class='tableheader2'"); -shippers_list_cells(null, 'ship_via', $_POST['ship_via']); +if ($prepaid) +{ + $shipper = get_shipper($_SESSION['Items']->ship_via); + label_cells(null, $shipper['shipper_name']); +} else + shippers_list_cells(null, 'ship_via', $_POST['ship_via']); if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) { $_POST['InvoiceDate'] = new_doc_date(); @@ -402,7 +490,13 @@ if (!isset($_POST['due_date']) || !is_date($_POST['due_date'])) { } date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'"); - +if ($dim > 1) { + label_cell(_("Dimension")." 2:", "class='tableheader2'"); + $_POST['dimension2_id'] = $_SESSION['Items']->dimension2_id; + dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false); +} +else + hidden('dimension2_id', 0); end_row(); end_table(); @@ -415,12 +509,17 @@ if ($row['dissallow_invoices'] == 1) exit(); } -display_heading(_("Invoice Items")); +display_heading($prepaid ? _("Sales Order Items") : _("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")); + +start_table(TABLESTYLE, "width='80%'"); +if ($prepaid) + $th = array(_("Item Code"), _("Item Description"), _("Units"), _("Quantity"), + _("Price"), _("Tax Type"), _("Discount"), _("Total")); +else + $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"), + _("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total")); if ($is_batch_invoice) { $th[] = _("DN"); @@ -439,19 +538,24 @@ $show_qoh = true; $dn_line_cnt = 0; foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { - if ($ln_itm->quantity == $ln_itm->qty_done) { + if (!$prepaid && ($ln_itm->quantity == $ln_itm->qty_done)) { continue; // this line was fully invoiced } alt_table_row_color($k); view_stock_status_cell($ln_itm->stock_id); - text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50); + if ($prepaid) + label_cell($ln_itm->item_description); + else + text_cells(null, 'Line'.$line.'Desc', $ln_itm->item_description, 30, 50); $dec = get_qty_dec($ln_itm->stock_id); - qty_cell($ln_itm->quantity, false, $dec); + if (!$prepaid) + qty_cell($ln_itm->quantity, false, $dec); label_cell($ln_itm->units); - qty_cell($ln_itm->qty_done, false, $dec); + if (!$prepaid) + qty_cell($ln_itm->qty_done, false, $dec); - if ($is_batch_invoice) { + if ($is_batch_invoice || $prepaid) { // for batch invoices we can only remove whole deliveries echo ''; hidden('Line' . $line, $ln_itm->qty_dispatched ); @@ -472,9 +576,9 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) { if ($dn_line_cnt == 0) { $dn_line_cnt = $dspans[0]; $dspans = array_slice($dspans, 1); - label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class=oddrow"); + label_cell($ln_itm->src_no, "rowspan=$dn_line_cnt class='oddrow'"); label_cell("" . _("Remove") . "", "rowspan=$dn_line_cnt class=oddrow"); + $ln_itm->src_no."'>" . _("Remove") . "", "rowspan=$dn_line_cnt class='oddrow'"); } $dn_line_cnt--; } @@ -502,10 +606,13 @@ $accumulate_shipping = get_company_pref('accumulate_shipping'); if ($is_batch_invoice && $accumulate_shipping) set_delivery_shipping_sum(array_keys($_SESSION['Items']->src_docs)); -$colspan = 9; +$colspan = $prepaid ? 7:9; start_row(); label_cell(_("Shipping Cost"), "colspan=$colspan align=right"); -small_amount_cells(null, 'ChargeFreightCost', null); +if ($prepaid) + label_cell($_POST['ChargeFreightCost'], 'align=right'); +else + small_amount_cells(null, 'ChargeFreightCost', null); if ($is_batch_invoice) { label_cell('', 'colspan=2'); } @@ -518,7 +625,7 @@ $display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCos label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", $is_batch_invoice ? 2 : 0); $taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost')); -$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2:0); +$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included, $is_batch_invoice ? 2 : 0); $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total)); @@ -526,12 +633,32 @@ label_row(_("Invoice Total"), $display_total, "colspan=$colspan align=right","al end_table(1); div_end(); +div_start('options'); +start_table(TABLESTYLE2); +if ($prepaid) +{ -start_table($table_style2); -textarea_row(_("Memo"), 'Comments', null, 50, 4); + label_row(_("Sales order:"), get_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no, get_reference(ST_SALESORDER, $_SESSION['Items']->order_no))); -end_table(1); + $list = array(); $allocs = 0; + if (count($_SESSION['Items']->prepayments)) + { + foreach($_SESSION['Items']->prepayments as $pmt) + { + $list[] = get_trans_view_str($pmt['trans_type_from'], $pmt['trans_no_from'], get_reference($pmt['trans_type_from'], $pmt['trans_no_from'])); + $allocs += $pmt['amt']; + } + } + label_row(_("Payments received:"), implode(',', $list)); + label_row(_("Invoiced here:"), price_format($_SESSION['Items']->prep_amount), 'class=label'); + label_row(_("Left to be invoiced:"), price_format($_SESSION['Items']->get_trans_total()-max($_SESSION['Items']->prep_amount, $allocs)), 'class=label'); +} + +textarea_row(_("Memo:"), 'Comments', null, 50, 4); + +end_table(1); +div_end(); submit_center_first('Update', _("Update"), _('Refresh document page'), true); submit_center_last('process_invoice', _("Process Invoice"), @@ -541,4 +668,3 @@ end_form(); end_page(); -?>