X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_credit_invoice.php;h=d6bb4057d9d04c93941735b99133e0d7548e1dc2;hb=7202616e85a0fb8907ced404e418d8a16a5ed53a;hp=7d318a9f18a61b92f3e73c1d2c1ff1a731291eeb;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/sales/customer_credit_invoice.php b/sales/customer_credit_invoice.php
index 7d318a9f..d6bb4057 100644
--- a/sales/customer_credit_invoice.php
+++ b/sales/customer_credit_invoice.php
@@ -1,20 +1,20 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //---------------------------------------------------------------------------
 //
 //	Entry/Modify Credit Note for selected Sales Invoice
 //
 
-$page_security = 3;
+$page_security = 'SA_SALESCREDITINV';
 $path_to_root = "..";
 
 include_once($path_to_root . "/sales/includes/cart_class.inc");
@@ -126,7 +126,7 @@ if (isset($_GET['InvoiceNumber']) && $_GET['InvoiceNumber'] > 0) {
     $ci->src_docs = $ci->trans_no;
     $ci->src_date = $ci->document_date;
     $ci->trans_no = 0;
-    $ci->document_date = Today();
+    $ci->document_date = new_doc_date();
     $ci->reference = references::get_next(11);
 
     for ($line_no=0; $line_no<count($ci->line_items); $line_no++) {
@@ -152,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 =
@@ -175,24 +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;
-  $_POST['cart_id'] = $cart->cart_id;
+	$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;
 }
 //-----------------------------------------------------------------------------
 
@@ -204,6 +210,7 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
 		$_POST['WriteOffGLCode'] = 0;
 
 	copy_to_cart();
+	if ($new_credit) new_doc_date($_SESSION['Items']->document_date);
     $credit_no = $_SESSION['Items']->write($_POST['WriteOffGLCode']);
 
 	processing_end();
@@ -226,7 +233,7 @@ function display_credit_items()
 {
 	global $table_style, $table_style2;
 
-    start_form(false, true);
+    start_form();
 	hidden('cart_id');
 
 	start_table("$table_style2 width=80%", 5);
@@ -244,7 +251,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'");
 	}
@@ -270,7 +277,7 @@ function display_credit_items()
 
     label_row(_("Invoice Date"), $_SESSION['Items']->src_date, "class='tableheader2'");
 
-    date_row(_("Credit Note Date"), 'CreditDate', '', null, 0, 0, 0, "class='tableheader2'");
+    date_row(_("Credit Note Date"), 'CreditDate', '', $_SESSION['Items']->trans_no==0, 0, 0, 0, "class='tableheader2'");
 
     end_table();
 
@@ -287,8 +294,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);
 
@@ -382,7 +389,7 @@ display_credit_options();
 echo "<br><center>";
 submit('Update', _("Update"), true, _('Update credit value for quantities entered'), true);
 echo "&nbsp";
-submit('ProcessCredit', _("Process Credit Note"), true, '', true);
+submit('ProcessCredit', _("Process Credit Note"), true, '', 'default');
 echo "</center>";
 
 end_form();