Reverting last last two commits mistakenly pushed to stable branch.

[fa-stable.git] / sales / customer_invoice.php

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 9c9e171bddd11612f00a90a3add294bb0939bd6b..ea4898790220e87230b9257d5de5d362a34a1027 100644 (file)
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -63,6 +63,15 @@ if (isset($_GET['AddedID'])) {
 
        hyperlink_params("$path_to_root/sales/inquiry/sales_deliveries_view.php", _("Select Another &Delivery For Invoicing"), "OutstandingOnly=1");
 
+       $sql = "SELECT trans_type_from, trans_no_from FROM ".TB_PREF."cust_allocations
+                       WHERE trans_type_to=".ST_SALESINVOICE." AND trans_no_to=".db_escape($invoice_no);
+       $result = db_query($sql, "could not retrieve customer allocation");
+       $row = db_fetch($result);
+
+       if ($row === false)
+               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();
@@ -281,12 +290,6 @@ function check_data()
                        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'] == "") {
@@ -314,19 +317,27 @@ 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 ($newinvoice) {
-               meta_forward($_SERVER['PHP_SELF'], "AddedID=$invoice_no");
-       } else {
-               meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$invoice_no");
+       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(list_updated('payment')) {