X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=b19746120882e497d25503e7516ea0edb5395646;hb=d193828f0a27570074695bf92bf11e96d0fd817b;hp=ca1db0bd210799716d1f993205418c85d495fea5;hpb=067227ab0e5a017a224a7ba51964d70da0baaffe;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index ca1db0bd..b1974612 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.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 Credit Note for selected Sales Invoice
@@ -39,33 +49,33 @@ page($_SESSION['page_title'], false, false, "", $js);
 if (isset($_GET['AddedID'])) {
 	$credit_no = $_GET['AddedID'];
 	$trans_type = 11;
-	print_hidden_script(11);
 
 	display_notification_centered(_("Credit Note has been processed"));
 
-	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("View This Credit Note")), 0, 0);
+	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0);
 
-	display_note(print_document_link($credit_no, _("Print This Credit Note"), true, 11),1);
+	display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, 11),1);
 
- 	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL Journal Entries for this Credit Note")),1);
+ 	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")),1);
 
 	display_footer_exit();
 
 } elseif (isset($_GET['UpdatedID'])) {
 	$credit_no = $_GET['UpdatedID'];
 	$trans_type = 11;
-	print_hidden_script(11);
 
 	display_notification_centered(_("Credit Note has been updated"));
 
-	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("View This Credit Note")), 0, 0);
+	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View This Credit Note")), 0, 0);
 
-	display_note(print_document_link($credit_no, _("Print This Credit Note"), true, 11),1);
+	display_note(print_document_link($credit_no, _("&Print This Credit Note"), true, 11),1);
 
- 	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL Journal Entries for this Credit Note")),1);
+ 	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();
+
 
 //-----------------------------------------------------------------------------
 
@@ -142,6 +152,9 @@ function check_quantities()
 {
 	$ok =1;
 	foreach ($_SESSION['Items']->line_items as $line_no=>$itm) {
+		if ($itm->quantity == $itm->qty_done) {
+			continue; // this line was fully credited/removed
+		}
 		if (isset($_POST['Line'.$line_no])) {
 			if (check_num('Line'.$line_no, 0, $itm->quantity)) {
 				$_SESSION['Items']->line_items[$line_no]->qty_dispatched =
@@ -165,23 +178,27 @@ function check_quantities()
 
 function copy_to_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $cart->ship_via = $_POST['ShipperID'];
-  $cart->freight_cost = input_num('ChargeFreightCost');
-  $cart->document_date =  $_POST['CreditDate'];
-  $cart->Location = $_POST['Location'];
-  $cart->Comments = $_POST['CreditText'];
+	$cart = &$_SESSION['Items'];
+	$cart->ship_via = $_POST['ShipperID'];
+	$cart->freight_cost = input_num('ChargeFreightCost');
+	$cart->document_date =  $_POST['CreditDate'];
+	$cart->Location = $_POST['Location'];
+	$cart->Comments = $_POST['CreditText'];
+	if ($_SESSION['Items']->trans_no == 0)
+		$cart->reference = $_POST['ref'];
 }
 //-----------------------------------------------------------------------------
 
 function copy_from_cart()
 {
-  $cart = &$_SESSION['Items'];
-  $_POST['ShipperID'] = $cart->ship_via;
-  $_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
-  $_POST['CreditDate']= $cart->document_date;
-  $_POST['Location']= $cart->Location;
-  $_POST['CreditText']= $cart->Comments;
+	$cart = &$_SESSION['Items'];
+	$_POST['ShipperID'] = $cart->ship_via;
+	$_POST['ChargeFreightCost'] = price_format($cart->freight_cost);
+	$_POST['CreditDate']= $cart->document_date;
+	$_POST['Location']= $cart->Location;
+	$_POST['CreditText']= $cart->Comments;
+	$_POST['cart_id'] = $cart->cart_id;
+	$_POST['ref'] = $cart->reference;
 }
 //-----------------------------------------------------------------------------
 
@@ -216,6 +233,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
@@ -232,7 +250,7 @@ function display_credit_items()
 //		$_POST['ref'] = references::get_next(11);
 
     if ($_SESSION['Items']->trans_no==0) {
-		ref_cells(_("Reference"), 'ref', '', $_SESSION['Items']->reference, "class='tableheader2'");
+		ref_cells(_("Reference"), 'ref', '', null, "class='tableheader2'");
 	} else {
 		label_cells(_("Reference"), $_SESSION['Items']->reference, "class='tableheader2'");
 	}
@@ -275,8 +293,8 @@ function display_credit_items()
     $k = 0; //row colour counter
 
     foreach ($_SESSION['Items']->line_items as $line_no=>$ln_itm) {
-		if ($ln_itm->quantity==$ln_itm->qty_done) {
-			continue; // this line was fully credited
+		if ($ln_itm->quantity == $ln_itm->qty_done) {
+			continue; // this line was fully credited/removed
 		}
 		alt_table_row_color($k);