X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcustomer_credit_invoice.php;h=9796bbd73eb190ed5def865d4581e017a0048adb;hb=c2f32b7b39e8c21c29f66fee832938b2ad2f31cb;hp=e46d352814dfa22f3ae3970b1f034ed73ca569c2;hpb=68372f2a08f5a862375c04862c8ccb56df830b4b;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index e46d3528..9796bbd7 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -63,7 +63,9 @@ if (isset($_GET['AddedID'])) {
  	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
 	display_footer_exit();
-}
+} else
+	check_edit_conflicts();
+
 
 //-----------------------------------------------------------------------------
 
@@ -180,6 +182,7 @@ function copy_from_cart()
   $_POST['CreditDate']= $cart->document_date;
   $_POST['Location']= $cart->Location;
   $_POST['CreditText']= $cart->Comments;
+  $_POST['cart_id'] = $cart->cart_id;
 }
 //-----------------------------------------------------------------------------
 
@@ -214,6 +217,7 @@ function display_credit_items()
 	global $table_style, $table_style2;
 
     start_form(false, true);
+	hidden('cart_id');
 
 	start_table("$table_style2 width=80%", 5);
 	echo "<tr><td>"; // outer table