X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=ec42340284cd6beb9034caa4dcc067dae6bb711e;hb=7e8df3a179c05c51085349e139aac9ce88b9378d;hp=9836de48fad516e4330dcd2c0eb17b8a60b08a55;hpb=e8ae3516539a520338117f25d401c0fc234973a4;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 9836de48..ec423402 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -14,67 +14,78 @@
// Entry/Modify Sales Invoice against single delivery
// Entry/Modify Batch Sales Invoice against batch of deliveries
//
-$page_security = 2;
-$path_to_root="..";
+$page_security = 'SA_SALESINVOICE';
+$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();
}
if (isset($_GET['ModifyInvoice'])) {
$_SESSION['page_title'] = sprintf(_("Modifying Sales Invoice # %d.") ,$_GET['ModifyInvoice']);
- $help_page_title = _("Modifying Sales Invoice");
+ $help_context = "Modifying Sales Invoice";
} elseif (isset($_GET['DeliveryNumber'])) {
- $_SESSION['page_title'] = _("Issue an Invoice for Delivery Note");
+ $_SESSION['page_title'] = _($help_context = "Issue an Invoice for Delivery Note");
} elseif (isset($_GET['BatchInvoice'])) {
- $_SESSION['page_title'] = _("Issue Batch Invoice for Delivery Notes");
+ $_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'])) {
$invoice_no = $_GET['AddedID'];
- $trans_type = 10;
+ $trans_type = ST_SALESINVOICE;
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(print_document_link($invoice_no, _("&Print This Invoice"), true, 10));
+ 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(10, $invoice_no, _("&View This Invoice")));
+ 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, 10));
+ 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();
@@ -107,8 +118,9 @@ 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(13, $src, true);
+ $dn = new Cart(ST_CUSTDELIVERY, $src, true);
if ($dn->count_items() == 0) {
hyperlink_params($path_to_root . "/sales/inquiry/sales_deliveries_view.php",
@@ -116,32 +128,68 @@ 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 = 10;
- $dn->src_docs = $dn->trans_no;
- $dn->trans_no = 0;
- $dn->reference = references::get_next(10);
- $dn->due_date = get_invoice_duedate($dn->customer_id, $dn->document_date);
-
$_SESSION['Items'] = $dn;
copy_from_cart();
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
- if ( get_parent_trans(10, $_GET['ModifyInvoice']) == 0) { // 1.xx compatibility hack
+ check_is_editable(ST_SALESINVOICE, $_GET['ModifyInvoice']);
+/*
+ if ( get_sales_parent_numbers(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();
}
+*/
processing_start();
- $_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']);
+ $_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']);
if ($_SESSION['Items']->count_items() == 0) {
echo"
" . _("All quantities on this invoice has been credited. There is nothing to modify on this invoice") . "";
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'];
+ $payments = get_payments_for($_GET['InvoicePrepayments'], ST_SALESORDER);
+ }
+ 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']->prepayments = $payments;
+ // prepayment invoice has all line quantities as stated on order.
+// foreach($_SESSION['Items']->line_items as &$line)
+// {
+// $line->src_id = $line_id;
+// $line->qty_dispatched = $line->quantity;
+// }
+// unset($line);
+ $_SESSION['Items']->update_payments();
+
+// $_SESSION['Items']->alloc = $this_amount;
+ 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."));
@@ -149,15 +197,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']->customer_id,
- $_POST['InvoiceDate']);
+ $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
$Ajax->activate('due_date');
}
@@ -215,29 +263,54 @@ 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->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['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;
}
//-----------------------------------------------------------------------------
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');
@@ -245,49 +318,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 (!references::is_valid($_POST['ref'])) {
+ if (!$Refs->is_valid($_POST['ref'])) {
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'] < 0) && !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;
@@ -295,16 +371,41 @@ 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);
+
$invoice_no = $_SESSION['Items']->write();
+ 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");
+ }
+ }
+}
- processing_end();
- 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'];
}
}
@@ -332,31 +433,55 @@ $dspans[] = $spanlen;
//-----------------------------------------------------------------------------
$is_batch_invoice = count($_SESSION['Items']->src_docs) > 1;
+$prepaid = $_SESSION['Items']->is_prepaid();
-$is_edition = $_SESSION['Items']->trans_type == 10 && $_SESSION['Items']->trans_no != 0;
+$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', '', $_SESSION['Items']->reference, "class='tableheader2'");
+ ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
} else {
label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
}
-label_cells(_("Delivery Notes:"),
-get_customer_trans_view_str(systypes::cust_dispatch(), array_keys($_SESSION['Items']->src_docs)), "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'");
+label_cells(_("Currency"), $_SESSION['Items']->customer_currency, "class='tableheader2'");
+// 2010-09-03 Joe Hunt
+//if ($dim > 0)
+// label_cells(_("Dimension"), get_dimension_string($_SESSION['Items']->dimension_id), "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
+ hidden('dimension_id', 0);
+
end_row();
start_row();
@@ -364,23 +489,41 @@ 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'] = Today();
+ $_POST['InvoiceDate'] = new_doc_date();
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
$_POST['InvoiceDate'] = end_fiscalyear();
}
}
-date_cells(_("Date"), 'InvoiceDate', '', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'", true);
+date_cells(_("Date"), 'InvoiceDate', '', $_SESSION['Items']->trans_no == 0,
+ 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']);
+ $_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->payment, $_POST['InvoiceDate']);
}
-date_cells(_("Due Date"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
-
+date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
+/*
+if ($dim > 1)
+ label_cells(_("Dimension"). " 2", get_dimension_string($_SESSION['Items']->dimension2_id), "class='tableheader2'");
+else if ($dim > 0)
+ label_cell(" ", "colspan=2");
+*/
+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();
@@ -393,12 +536,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");
@@ -417,19 +565,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 );
@@ -450,9 +603,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("src_no."'>" . _("Remove") . "", "rowspan=$dn_line_cnt class=oddrow");
+ $ln_itm->src_no."'>" . _("Remove") . "", "rowspan=$dn_line_cnt class='oddrow'");
}
$dn_line_cnt--;
}
@@ -480,9 +633,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 = $prepaid ? 7:9;
start_row();
-
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', null, "colspan=9 align=right");
+label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
+if ($prepaid)
+ label_cell($_POST['ChargeFreightCost'], 'align=right');
+else
+ small_amount_cells(null, 'ChargeFreightCost', null);
if ($is_batch_invoice) {
label_cell('', 'colspan=2');
}
@@ -492,30 +649,49 @@ $inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
$display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCost'));
-label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
+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, 9, $_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));
-label_row(_("Invoice Total"), $display_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
+label_row(_("Invoice Total"), $display_total, "colspan=$colspan align=right","align=right", $is_batch_invoice ? 2 : 0);
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"),
- _('Check entered data and save document'), true);
+ _('Check entered data and save document'), 'default');
end_form();
end_page();
-?>
|