X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=e4ab5158322f95ef6fffea1a7f20fdf724a76317;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=b249948559332441319a3085620f5c5e09e20e90;hpb=acbb281bf6915bfccd6798b12eae1fd7d60f63c6;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index b2499485..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'])) {
@@ -63,6 +65,10 @@ if (isset($_GET['AddedID'])) {
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();
@@ -102,7 +108,7 @@ if (isset($_GET['AddedID'])) {
//-----------------------------------------------------------------------------
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
-|| isset($_GET['BatchInvoice'])) {
+ || isset($_GET['BatchInvoice'])) {
processing_start();
@@ -127,12 +133,8 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
} elseif (isset($_GET['ModifyInvoice']) && $_GET['ModifyInvoice'] > 0) {
- 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();
- }
+ check_is_editable(ST_SALESINVOICE, $_GET['ModifyInvoice']);
+
processing_start();
$_SESSION['Items'] = new Cart(ST_SALESINVOICE, $_GET['ModifyInvoice']);
@@ -141,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."));
@@ -149,9 +181,10 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
end_page();
exit;
-} elseif (!isset($_POST['process_invoice']) && !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');
}
@@ -159,11 +192,6 @@ 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']);
- $Ajax->activate('due_date');
-}
//-----------------------------------------------------------------------------
function check_quantities()
@@ -205,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);
@@ -219,34 +244,42 @@ 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 = $cart->document_date = $_POST['InvoiceDate'];
+ $cart->Comments = $_POST['Comments'];
$cart->due_date = $_POST['due_date'];
- if ($cart->pos['cash_sale'] || $cart->pos['credit_sale']) {
+ if (($cart->pos['cash_sale'] || $cart->pos['credit_sale']) && isset($_POST['payment'])) {
$cart->payment = $_POST['payment'];
$cart->payment_terms = get_payment_terms($_POST['payment']);
}
- $cart->Comments = $_POST['Comments'];
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['payment'] = $cart->payment;
+ $_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;
}
@@ -257,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');
@@ -264,43 +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 ($_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;
@@ -310,6 +354,7 @@ 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);
@@ -332,15 +377,20 @@ if (isset($_POST['process_invoice']) && check_data()) {
}
if(list_updated('payment')) {
- $order = &$_SESSION['Items'];
+ $order = &$_SESSION['Items'];
+ copy_to_cart();
$order->payment = get_post('payment');
$order->payment_terms = get_payment_terms($order->payment);
- $order->due_date = get_invoice_duedate($order->payment, $order->document_date);
+ $_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'];
}
}
+
// find delivery spans for batch invoice display
$dspans = array();
$lastdn = ''; $spanlen=1;
@@ -365,12 +415,13 @@ $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(TABLESTYLE2, "width=80%", 5);
+start_table(TABLESTYLE2, "width='80%'", 5);
start_row();
$colspan = 1;
@@ -379,7 +430,7 @@ 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'");
-if ($_SESSION['Items']->pos['credit_sale'] || $_SESSION['Items']->pos['cash_sale']) {
+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),
@@ -391,20 +442,17 @@ 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'");
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;
@@ -420,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();
@@ -437,12 +490,6 @@ 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_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;
@@ -462,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(TABLESTYLE, "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");
@@ -486,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 );
@@ -519,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("src_no."'>" . _("Remove") . "", "rowspan=$dn_line_cnt class=oddrow");
+ $ln_itm->src_no."'>" . _("Remove") . "", "rowspan=$dn_line_cnt class='oddrow'");
}
$dn_line_cnt--;
}
@@ -549,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');
}
@@ -565,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));
@@ -573,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);
-textarea_row(_("Memo"), 'Comments', null, 50, 4);
+if ($prepaid)
+{
-end_table(1);
+ label_row(_("Sales order:"), get_trans_view_str(ST_SALESORDER, $_SESSION['Items']->order_no, get_reference(ST_SALESORDER, $_SESSION['Items']->order_no)));
+ $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"),
@@ -588,4 +668,3 @@ end_form();
end_page();
-?>
|