X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=ec42340284cd6beb9034caa4dcc067dae6bb711e;hb=11109ad9f0e6af3f59d72731a95e473e72fb308b;hp=1a4959d9182e0236c37fc01e8c6ca2d4e95074ea;hpb=96f82e64b766fa59a3ebc3176e4efd17736f6878;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index 1a4959d9..ec423402 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -19,7 +19,6 @@ $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");
@@ -27,10 +26,10 @@ 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();
 }
 
@@ -48,7 +47,7 @@ page($_SESSION['page_title'], false, false, "", $js);
 
 //-----------------------------------------------------------------------------
 
-check_edit_conflicts();
+check_edit_conflicts(get_post('cart_id'));
 
 if (isset($_GET['AddedID'])) {
 
@@ -66,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();
@@ -333,12 +336,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(!$prepaid) 
@@ -374,19 +371,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')) {
@@ -434,7 +439,7 @@ $is_edition = $_SESSION['Items']->trans_type == ST_SALESINVOICE && $_SESSION['It
 start_form();
 hidden('cart_id');
 
-start_table(TABLESTYLE2, "width=80%", 5);
+start_table(TABLESTYLE2, "width='80%'", 5);
 
 start_row();
 $colspan = 1;
@@ -534,13 +539,15 @@ if ($row['dissallow_invoices'] == 1)
 display_heading($prepaid ? _("Sales Order Items") : _("Invoice Items"));
 
 div_start('Items');
-start_table(TABLESTYLE, "width=80%");
+
+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");
     $th[] = "";
@@ -596,9 +603,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("<a href='" . $_SERVER['PHP_SELF'] . "?RemoveDN=".
-				$ln_itm->src_no."'>" . _("Remove") . "</a>", "rowspan=$dn_line_cnt class=oddrow");
+				$ln_itm->src_no."'>" . _("Remove") . "</a>", "rowspan=$dn_line_cnt class='oddrow'");
 		}
 		$dn_line_cnt--;
 	}
@@ -688,4 +695,3 @@ end_form();
 
 end_page();
 
-?>