X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_invoice.php;h=acf3013712aad45cf9a4cfcf98a77db49843226c;hb=cc36638b65572da4867b7622723d6ed0135525b8;hp=51c38d2fad729cebed7a8d8d4addececdfecc8cc;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 51c38d2f..acf30137 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -1,11 +1,21 @@
.
+***********************************************************************/
//---------------------------------------------------------------------------
//
// 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");
@@ -35,37 +45,37 @@ 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);
+ $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(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, ST_SALESINVOICE));
+ display_note(print_document_link($invoice_no, _("&Email This Invoice"), true, ST_SALESINVOICE, false, "", "", 1),1);
- 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(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, _("&Print This Invoice"), true, ST_SALESINVOICE));
- 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 +89,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();
@@ -95,7 +109,7 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
$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",
@@ -103,18 +117,25 @@ 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->trans_type = ST_SALESINVOICE;
$dn->src_docs = $dn->trans_no;
$dn->trans_no = 0;
- $dn->reference = references::get_next(10);
+ $dn->reference = $Refs->get_next(ST_SALESINVOICE);
+ $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(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") . "";
@@ -129,13 +150,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])) {
- $line_qty = $_POST['Line'.$line_no];
- if (is_numeric($line_qty) && $_POST['Line'.$line_no] <= ($itm->quantity - $itm->qty_done)) {
- $_SESSION['Items']->line_items[$line_no]->qty_dispatched = $line_qty;
+ 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'])) {
@@ -145,17 +192,37 @@ 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()
{
$cart = &$_SESSION['Items'];
$cart->ship_via = $_POST['ship_via'];
- $cart->freight_cost = $_POST['ChargeFreightCost'];
+ $cart->freight_cost = input_num('ChargeFreightCost');
$cart->document_date = $_POST['InvoiceDate'];
$cart->due_date = $_POST['due_date'];
$cart->Comments = $_POST['Comments'];
+ if ($_SESSION['Items']->trans_no == 0)
+ $cart->reference = $_POST['ref'];
}
//-----------------------------------------------------------------------------
@@ -163,57 +230,72 @@ function copy_from_cart()
{
$cart = &$_SESSION['Items'];
$_POST['ship_via'] = $cart->ship_via;
- $_POST['ChargeFreightCost'] = $cart->freight_cost;
+ $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
$_POST['InvoiceDate']= $cart->document_date;
$_POST['due_date'] = $cart->due_date;
$_POST['Comments']= $cart->Comments;
+ $_POST['cart_id'] = $cart->cart_id;
+ $_POST['ref'] = $cart->reference;
}
//-----------------------------------------------------------------------------
function check_data()
{
+ global $Refs;
+
if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is invalid."));
+ set_focus('InvoiceDate');
return false;
}
if (!is_date_in_fiscalyear($_POST['InvoiceDate'])) {
display_error(_("The entered invoice date is not in fiscal year."));
+ set_focus('InvoiceDate');
return false;
}
if (!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'] = 0;
+ $_POST['ChargeFreightCost'] = price_format(0);
}
- if (!is_numeric($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] < 0) {
+ 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 && $_POST['ChargeFreightCost'] == 0) {
+ 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;
+ }
+
return true;
}
@@ -222,6 +304,7 @@ 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();
processing_end();
@@ -256,8 +339,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);
+
+$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);
@@ -269,20 +354,15 @@ 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'");
+get_customer_trans_view_str(ST_CUSTDELIVERY, array_keys($_SESSION['Items']->src_docs)), "class='tableheader2'");
-if (!isset($_POST['sales_type_id'])) {
- $_POST['sales_type_id'] = $_SESSION['Items']->default_sales_type;
-}
-
-label_cell(_("Sales Type"), "class='tableheader2'");
-sales_types_list_cells(null, 'sales_type_id', $_POST['sales_type_id']);
+label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableheader2'");
end_row();
start_row();
@@ -294,36 +374,47 @@ label_cell(_("Shipping Company"), "class='tableheader2'");
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='tableheader'");
+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']);
}
-date_cells(_("Due Date"), 'due_date', $_POST['due_date'], 0, 0, 0, "class='tableheader'");
+date_cells(_("Due Date"), 'due_date', '', null, 0, 0, 0, "class='tableheader2'");
end_row();
end_table();
+$row = get_customer_to_order($_SESSION['Items']->customer_id);
+if ($row['dissallow_invoices'] == 1)
+{
+ display_error(_("The selected customer account is currently on hold. Please contact the credit control personnel to discuss."));
+ end_form();
+ end_page();
+ exit();
+}
+
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"));
if ($is_batch_invoice) {
-$th[] = _("DN");
-$th[] = "";
+ $th[] = _("DN");
+ $th[] = "";
}
if ($is_edition) {
-$th[4] = _("Credited");
+ $th[4] = _("Credited");
}
table_header($th);
@@ -341,19 +432,20 @@ 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 number_format2($ln_itm->qty_dispatched, user_qty_dec()).' | ';
+ echo number_format2($ln_itm->qty_dispatched, $dec).'';
} else {
- text_cells(null, 'Line'.$line, $ln_itm->qty_dispatched, 10, 10);
+ small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec);
}
- $display_discount_percent = number_format2($ln_itm->discount_percent*100, user_percent_dec()) . "%";
+ $display_discount_percent = percent_format($ln_itm->discount_percent*100) . " %";
$line_total = ($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
@@ -382,16 +474,20 @@ was not fully delivered the first time ?? */
if (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] == "") {
if ($_SESSION['Items']->any_already_delivered() == 1) {
- $_POST['ChargeFreightCost'] = 0;
+ $_POST['ChargeFreightCost'] = price_format(0);
} else {
- $_POST['ChargeFreightCost'] = $_SESSION['Items']->freight_cost;
+ $_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
}
- if (!is_numeric($_POST['ChargeFreightCost'])) {
- $_POST['ChargeFreightCost'] = 0;
+ if (!check_num('ChargeFreightCost')) {
+ $_POST['ChargeFreightCost'] = price_format(0);
}
}
+$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");
@@ -402,27 +498,29 @@ label_cell('', 'colspan=2');
end_row();
$inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
-$display_sub_total = number_format2($inv_items_total + $_POST['ChargeFreightCost'],user_price_dec());
+$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);
-$taxes = $_SESSION['Items']->get_taxes($_POST['ChargeFreightCost']);
+$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);
-$display_total = number_format2(($inv_items_total + $_POST['ChargeFreightCost'] + $tax_total), user_price_dec());
+$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);
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'), 'default');
end_form();