X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=f27bf8f0ad8617c4c9f9f81bbb6b58179253c707;hb=5dec41f0d87e407e1c9ffcb8eb63b92e4e471a9b;hp=e64bc8cd1b2e70d73a139f08149695d9d403ba7b;hpb=425942b6c30c1722da6d7e5bf99462e07249bc45;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index e64bc8cd..f27bf8f0 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 //---------------------------------------------------------------------------
 //
 //	Entry/Modify free hand Credit Note
@@ -69,7 +79,9 @@ if (isset($_GET['AddedID'])) {
 	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Credit Note"), "NewCredit=yes");
 
 	display_footer_exit();
-}
+} else
+	check_edit_conflicts();
+
 //--------------------------------------------------------------------------------
 
 function line_start_focus() {
@@ -82,30 +94,33 @@ function line_start_focus() {
 
 function copy_to_cn()
 {
-	$_SESSION['Items']->Comments = $_POST['CreditText'];
-	$_SESSION['Items']->document_date = $_POST['OrderDate'];
-	$_SESSION['Items']->freight_cost = input_num('ChargeFreightCost');
-	$_SESSION['Items']->Location = $_POST["Location"];
-	$_SESSION['Items']->sales_type = $_POST['sales_type_id'];
-	$_SESSION['Items']->reference = $_POST['ref'];
-	$_SESSION['Items']->ship_via = $_POST['ShipperID'];
-	$_SESSION['Items']->dimension_id = $_POST['dimension_id'];
-	$_SESSION['Items']->dimension2_id = $_POST['dimension2_id'];
+	$cart = &$_SESSION['Items'];
+	$cart->Comments = $_POST['CreditText'];
+	$cart->document_date = $_POST['OrderDate'];
+	$cart->freight_cost = input_num('ChargeFreightCost');
+	$cart->Location = $_POST["Location"];
+	$cart->sales_type = $_POST['sales_type_id'];
+	$cart->reference = $_POST['ref'];
+	$cart->ship_via = $_POST['ShipperID'];
+	$cart->dimension_id = $_POST['dimension_id'];
+	$cart->dimension2_id = $_POST['dimension2_id'];
 }
 
 //-----------------------------------------------------------------------------
 
 function copy_from_cn()
 {
-	$_POST['CreditText'] = $_SESSION['Items']->Comments;
-	$_POST['OrderDate'] = $_SESSION['Items']->document_date;
-	$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
-	$_POST['Location'] = $_SESSION['Items']->Location;
-	$_POST['sales_type_id'] = $_SESSION['Items']->sales_type;
-	$_POST['ref'] = $_SESSION['Items']->reference;
-	$_POST['ShipperID'] = $_SESSION['Items']->ship_via;
-	$_POST['dimension_id'] = $_SESSION['Items']->dimension_id;
-	$_POST['dimension2_id'] = $_SESSION['Items']->dimension2_id;
+	$cart = &$_SESSION['Items'];
+	$_POST['CreditText'] = $cart->Comments;
+	$_POST['OrderDate'] = $cart->document_date;
+	$_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+	$_POST['Location'] = $cart->Location;
+	$_POST['sales_type_id'] = $cart->sales_type;
+	$_POST['ref'] = $cart->reference;
+	$_POST['ShipperID'] = $cart->ship_via;
+	$_POST['dimension_id'] = $cart->dimension_id;
+	$_POST['dimension2_id'] = $cart->dimension2_id;
+	$_POST['cart_id'] = $cart->cart_id;
 }
 
 //-----------------------------------------------------------------------------
@@ -163,7 +178,9 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
 	if (!isset($_POST['WriteOffGLCode'])) {
 		$_POST['WriteOffGLCode'] = 0;
 	}
+	copy_to_cn();
 	$credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
+	new_doc_date($_SESSION['Items']->document_date);
 	processing_end();
 	meta_forward($_SERVER['PHP_SELF'], "AddedID=$credit_no");
 
@@ -244,7 +261,8 @@ if (!processing_active()) {
 
 //-----------------------------------------------------------------------------
 
-start_form(false, true);
+start_form();
+hidden('cart_id');
 
 $customer_error = display_credit_header($_SESSION['Items']);
 
@@ -252,7 +270,7 @@ if ($customer_error == "") {
 	start_table("$table_style width=80%", 10);
 	echo "<tr><td>";
 	display_credit_items(_("Credit Note Items"), $_SESSION['Items']);
-	credit_options_controls();
+	credit_options_controls($_SESSION['Items']);
 	echo "</td></tr>";
 	end_table();
 } else {
@@ -261,7 +279,7 @@ if ($customer_error == "") {
 
 echo "<br><center><table><tr>";
 submit_cells('Update', _("Update"));
-submit_cells('ProcessCredit', _("Process Credit Note"));
+submit_cells('ProcessCredit', _("Process Credit Note"), '', false, 'default');
 echo "</tr></table></center>";
 
 end_form();