X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=d935978f202439f181dee5653b6228fe63367e21;hb=2e181b13aa722a43e78b897404912d6b13a0a937;hp=af67283bfcf9eb03a60046a02538d2fc11c51a92;hpb=c6147603044ff0981ed4fa4de419ae77fd3f1ef7;p=fa-stable.git
diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index af67283b..d935978f 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -1,4 +1,14 @@
.
+***********************************************************************/
//---------------------------------------------------------------------------
//
// Entry/Modify Sales Invoice against single delivery
@@ -35,6 +45,7 @@ if (isset($_GET['ModifyInvoice'])) {
page($_SESSION['page_title'], false, false, "", $js);
//-----------------------------------------------------------------------------
+check_edit_conflicts();
if (isset($_GET['AddedID'])) {
@@ -86,7 +97,7 @@ if (isset($_GET['AddedID'])) {
//-----------------------------------------------------------------------------
if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
- || isset($_GET['BatchInvoice'])) {
+|| isset($_GET['BatchInvoice'])) {
processing_start();
@@ -117,7 +128,7 @@ 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.
+ 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();
@@ -149,6 +160,7 @@ if (isset($_POST['_InvoiceDate_changed'])) {
$_POST['InvoiceDate']);
$Ajax->activate('due_date');
}
+
//-----------------------------------------------------------------------------
function check_quantities()
{
@@ -219,6 +231,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;
}
//-----------------------------------------------------------------------------
@@ -322,6 +335,7 @@ $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);
@@ -370,6 +384,15 @@ date_cells(_("Due Date"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='t
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');