X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=18d674c695722353a37fe0bcb1f064402de2a3a0;hb=fed6bc04a7b050a0b69136a332e92ee651812487;hp=afbd3513c9e3b205a70278d2a84784763ce3639e;hpb=8f6db6a1dc29f18e980a0b7ebee3319071aa2fb1;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index afbd3513..18d674c6 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -114,6 +114,12 @@ 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"<center><br><b>" . _("There in no delivery notes for this invoice.<br>
+		Most likely this invoice was created in Front Accounting version prior to 2.0
+		and therefore can not be modified.") . "</b></center>";
+		display_footer_exit();
+	}
 	processing_start();
 	$_SESSION['Items'] = new Cart(10, $_GET['ModifyInvoice']);
 
@@ -133,9 +139,9 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 } else {
 	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 (!check_num('Line'.$line_no, 0, ($itm->quantity - $itm->qty_done))) {
+				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
+				    input_num('Line'.$line_no);
 			}
 		}
 
@@ -153,7 +159,7 @@ 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'];
@@ -164,7 +170,7 @@ 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;
@@ -176,41 +182,47 @@ function check_data()
 {
 	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'])) {
 			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;
 	}
@@ -270,7 +282,7 @@ end_row();
 start_row();
 
 if ($_SESSION['Items']->trans_no == 0) {
-	ref_cells(_("Reference"), 'ref', $_SESSION['Items']->reference, "class='tableheader2'");
+	ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
 } else {
 	label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 }
@@ -296,13 +308,13 @@ if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
 	}
 }
 
-date_cells(_("Date"), 'InvoiceDate', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader'");
+date_cells(_("Date"), 'InvoiceDate', '', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'");
 
 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', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
 
 end_row();
 end_table();
@@ -314,12 +326,12 @@ $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _
 	_("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);
@@ -337,19 +349,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 '<td nowrap align=right>';
 		hidden('Line' . $line, $ln_itm->qty_dispatched );
-		echo number_format2($ln_itm->qty_dispatched, user_qty_dec()).'</td>';
+		echo number_format2($ln_itm->qty_dispatched, $dec).'</td>';
 	} 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));
 
@@ -378,13 +391,13 @@ 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);
 	}
 }
 
@@ -398,14 +411,14 @@ 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);