X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=8d5a104a459e80029a88d176b21ea26f38814645;hb=8259c324f645a39cb847d5a4346b70e225e1b02c;hp=e9fb3a007b499f44bc6fe5055ee126484f3eafae;hpb=d67d5295b9342c011697ce4df325197e29898588;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index e9fb3a00..8d5a104a 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -144,7 +144,7 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
 	foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
 		if (isset($_POST['Line'.$line_no])) {
 			if (check_num('Line'.$line_no, ($itm->quantity - $itm->qty_done))) {
-				$_SESSION['Items']->line_items[$line_no]->qty_dispatched = 
+				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
 				  input_num('Line'.$line_no);
 			}
 	  	}
@@ -262,6 +262,7 @@ function display_credit_items()
 
 	end_table(1); // outer table
 
+	div_start('credit_items');
     start_table("$table_style width=80%");
     $th = array(_("Item Code"), _("Item Description"), _("Invoiced Quantity"), _("Units"),
     	_("Credit Quantity"), _("Price"), _("Discount %"), _("Total"));
@@ -279,13 +280,12 @@ function display_credit_items()
 		//	view_stock_status_cell($ln_itm->stock_id); alternative view
     	label_cell($ln_itm->stock_id);
 
-	text_cells(null, 'Line'.$line_no.'Desc', $ln_itm->item_description, 30, 50);
-
-    	qty_cell($ln_itm->quantity);
+		text_cells(null, 'Line'.$line_no.'Desc', $ln_itm->item_description, 30, 50);
+		$dec = get_qty_dec($ln_itm->stock_id);
+    	qty_cell($ln_itm->quantity, false, $dec);
     	label_cell($ln_itm->units);
-
-	amount_cells(null, 'Line'.$line_no, qty_format($ln_itm->qty_dispatched));
-
+		amount_cells(null, 'Line'.$line_no, number_format2($ln_itm->qty_dispatched, $dec),
+			null, null, $dec);
     	$line_total =($ln_itm->qty_dispatched * $ln_itm->price * (1 - $ln_itm->discount_percent));
 
     	amount_cell($ln_itm->price);
@@ -300,7 +300,7 @@ function display_credit_items()
 
 	start_row();
 	label_cell(_("Credit Shipping Cost"), "colspan=7 align=right");
-    amount_cells(null, "ChargeFreightCost", $_POST['ChargeFreightCost'], 6, 6);
+	amount_cells_ex(null, "ChargeFreightCost", 6, 8, $_POST['ChargeFreightCost']);
 	end_row();
 
     $inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
@@ -317,53 +317,56 @@ function display_credit_items()
     label_row(_("Credit Note Total"), $display_total, "colspan=7 align=right", "align=right");
 
     end_table();
+	div_end();
 }
 
 //-----------------------------------------------------------------------------
-
 function display_credit_options()
 {
-	global $table_style2;
-
-    echo "<br>";
-    start_table($table_style2);
-
-    echo "<tr><td>" . _("Credit Note Type") . "</td>";
-    echo "<td><select name='CreditType' onchange='this.form.submit();'>";
-    if (!isset($_POST['CreditType']) || $_POST['CreditType'] == "Return") {
-    	echo "<option value='WriteOff'>" . _("Items Written Off") . "</option>";
-    	echo "<option selected value='Return'>" . _("Items Returned to Inventory Location") . "</option>";
-    } else {
-    	echo "<option selected value='WriteOff'>" . _("Items Written Off") . "</option>";
-    	echo "<option value='Return'>" . _("Items Returned to Inventory Location") . "</option>";
-    }
-    echo "</select>";
-    echo"</td></tr>";
+	global $table_style2, $Ajax;
+	echo "<br>";
 
-    if (!isset($_POST['CreditType']) || $_POST['CreditType'] == "Return") {
+if (isset($_POST['_CreditType_update']))
+	$Ajax->activate('options');
 
-    	/*if the credit note is a return of goods then need to know which location to receive them into */
-    	if (!isset($_POST['Location'])) {
-    		$_POST['Location'] = $_SESSION['Items']->Location;
-    	}
+ div_start('options');
+	start_table("$table_style2");
 
-    	locations_list_row(_("Items Returned to Inventory Location"), 'Location', $_POST['Location']);
-    } else { 	/* the goods are to be written off to somewhere */
-    	gl_all_accounts_list_row(_("Write Off the Cost of the Items to"), 'WriteOffGLCode', $_POST['WriteOffGLCode']);
-    }
-    textarea_row(_("Memo"), "CreditText", null, 45, 3);
-    end_table();
+	credit_type_list_row(_("Credit Note Type"), 'CreditType', null, true);
+
+	if ($_POST['CreditType'] == "Return")
+	{
+
+		/*if the credit note is a return of goods then need to know which location to receive them into */
+		if (!isset($_POST['Location']))
+			$_POST['Location'] = $_SESSION['Items']->Location;
+	   	locations_list_row(_("Items Returned to Location"), 'Location', $_POST['Location']);
+	}
+	else
+	{
+		/* the goods are to be written off to somewhere */
+		gl_all_accounts_list_row(_("Write off the cost of the items to"), 'WriteOffGLCode', null);
+	}
+
+	textarea_row(_("Memo"), "CreditText", null, 51, 3);
+	echo "</table>";
+ div_end();
 }
 
+//-----------------------------------------------------------------------------
+if (get_post('Update')) 
+{
+	$Ajax->activate('credit_items');
+}
 //-----------------------------------------------------------------------------
 
 display_credit_items();
 display_credit_options();
 
 echo "<br><center>";
-submit('Update', _("Update"));
+submit('Update', _("Update"), true, _('Update credit value for quantities entered'), true);
 echo "&nbsp";
-submit('ProcessCredit', _("Process Credit Note"));
+submit('ProcessCredit', _("Process Credit Note"), true, '', true);
 echo "</center>";
 
 end_form();