X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_invoice.php;h=ca3df67fb3a1693b3bfee5dd8e030b3c9563481e;hb=13aa48ccc9265df336a1805d2e4709365f19c956;hp=e8dadd9aeb81b9ccd9e4b485c8f18256510cdce9;hpb=de3a75773afa86df1739d14f24399d6f7a46f809;p=fa-stable.git

diff --git a/sales/customer_invoice.php b/sales/customer_invoice.php
index e8dadd9a..ca3df67f 100644
--- a/sales/customer_invoice.php
+++ b/sales/customer_invoice.php
@@ -40,7 +40,6 @@ if (isset($_GET['AddedID'])) {
 
 	$invoice_no = $_GET['AddedID'];
 	$trans_type = 10;
-	print_hidden_script(10);
 
 	display_notification(_("Selected deliveries has been processed"), true);
 
@@ -57,7 +56,6 @@ if (isset($_GET['AddedID'])) {
 } elseif (isset($_GET['UpdatedID']))  {
 
 	$invoice_no = $_GET['UpdatedID'];
-	print_hidden_script(10);
 
 	display_notification_centered(sprintf(_('Sales Invoice # %d has been updated.'),$invoice_no));
 
@@ -114,6 +112,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']);
 
@@ -130,13 +134,38 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 
 	end_page();
 	exit;
-} else {
+} elseif (!check_quantities()) {
+	display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
+}
+if (isset($_POST['Update'])) {
+	$Ajax->activate('Items');
+}
+if (isset($_POST['_InvoiceDate_changed'])) {
+	$_POST['due_date'] = get_invoice_duedate($_SESSION['Items']->customer_id, 
+		$_POST['InvoiceDate']);
+	$Ajax->activate('due_date');
+}
+//-----------------------------------------------------------------------------
+function check_quantities()
+{
+	$ok =1;
 	foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
 		if (isset($_POST['Line'.$line_no])) {
-			if (!check_num('Line'.$line_no, 0, ($itm->quantity - $itm->qty_done))) {
+			if($_SESSION['Items']->trans_no) {
+				$min = $itm->qty_done;
+				$max = $itm->quantity;
+			} else {
+				$min = 0;
+				$max = $itm->quantity - $itm->qty_done;
+			}
+			if (check_num('Line'.$line_no, $min, $max)) {
 				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
 				    input_num('Line'.$line_no);
 			}
+			else {
+				$ok = 0;
+			}
+				
 		}
 
 		if (isset($_POST['Line'.$line_no.'Desc'])) {
@@ -146,8 +175,8 @@ if ( (isset($_GET['DeliveryNumber']) && ($_GET['DeliveryNumber'] > 0) )
 			}
 		}
 	}
+ return $ok;
 }
-//-----------------------------------------------------------------------------
 
 function copy_to_cart()
 {
@@ -176,27 +205,32 @@ 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;
 		}
 	}
@@ -207,6 +241,7 @@ function check_data()
 
 	if (!check_num('ChargeFreightCost', 0)) {
 		display_error(_("The entered shipping value is not numeric."));
+		set_focus('ChargeFreightCost');
 		return false;
 	}
 
@@ -215,6 +250,11 @@ function check_data()
 		return false;
 	}
 
+	if (!check_quantities()) {
+		display_error(_("Selected quantity cannot be less than quantity credited nor more than quantity not invoiced yet."));
+		return false;
+	}
+
 	return true;
 }
 
@@ -270,7 +310,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,19 +336,20 @@ if (!isset($_POST['InvoiceDate']) || !is_date($_POST['InvoiceDate'])) {
 	}
 }
 
-date_cells(_("Date"), 'InvoiceDate', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'");
+date_cells(_("Date"), 'InvoiceDate', '', $_POST['InvoiceDate'], 0, 0, 0, "class='tableheader2'", true);
 
 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='tableheader2'");
+date_cells(_("Due Date"), 'due_date', '', $_POST['due_date'], 0, 0, 0, "class='tableheader2'");
 
 end_row();
 end_table();
 
 display_heading(_("Invoice Items"));
 
+div_start('Items');
 start_table("$table_style width=80%");
 $th = array(_("Item Code"), _("Item Description"), _("Delivered"), _("Units"), _("Invoiced"),
 	_("This Invoice"), _("Price"), _("Tax Type"), _("Discount"), _("Total"));
@@ -337,17 +378,18 @@ 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 qty_format($ln_itm->qty_dispatched).'</td>';
+		echo number_format2($ln_itm->qty_dispatched, $dec).'</td>';
 	} else {
-		small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched));
+		small_qty_cells(null, 'Line'.$line, qty_format($ln_itm->qty_dispatched, $ln_itm->stock_id, $dec), null, null, $dec);
 	}
 	$display_discount_percent = percent_format($ln_itm->discount_percent*100) . " %";
 
@@ -410,15 +452,17 @@ $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost')
 label_row(_("Invoice Total"), $display_total, "colspan=9 align=right","align=right", $is_batch_invoice ? 2 : 0);
 
 end_table(1);
+div_end();
 
 start_table($table_style2);
-
 textarea_row(_("Memo"), 'Comments', null, 50, 4);
 
 end_table(1);
 
-submit_center_first('Update', _("Update"));
-submit_center_last('process_invoice', _("Process Invoice"));
+submit_center_first('Update', _("Update"),
+  _('Refresh document page'), true);
+submit_center_last('process_invoice', _("Process Invoice"),
+  _('Check entered data and save document'), true);
 
 end_form();