X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=ea4898790220e87230b9257d5de5d362a34a1027;hb=4c09b19388f22b15edee7024a392055418275188;hp=4068fea53c36f125e4035c0e0764d743a377cc47;hpb=0952c82fc90f8ff443335d371ba32bbea6aba946;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 4068fea5..ea489879 100644
--- 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();
@@ -230,6 +239,8 @@ function copy_to_cart()
 	$cart->Comments = $_POST['Comments'];
 	if ($_SESSION['Items']->trans_no == 0)
 		$cart->reference = $_POST['ref'];
+	$cart->dimension_id =  $_POST['dimension_id'];
+	$cart->dimension2_id =  $_POST['dimension2_id'];
 
 }
 //-----------------------------------------------------------------------------
@@ -245,6 +256,8 @@ function copy_from_cart()
 	$_POST['cart_id'] = $cart->cart_id;
 	$_POST['ref'] = $cart->reference;
 	$_POST['payment'] = $cart->payment;
+	$_POST['dimension_id'] = $cart->dimension_id;
+	$_POST['dimension2_id'] = $cart->dimension2_id;
 }
 
 //-----------------------------------------------------------------------------
@@ -277,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'] == "") {
@@ -310,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')) {
@@ -397,8 +412,15 @@ label_cells(_("Sales Type"), $_SESSION['Items']->sales_type_name, "class='tableh
 
 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_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();
@@ -424,11 +446,19 @@ 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;
+	dimensions_list_cells(null, 'dimension2_id', null, true, ' ', false, 2, false);
+}		
+else
+	hidden('dimension2_id', 0);
 end_row();
 end_table();