[Web-erp-svn] SF.net SVN: web-erp:[5408] trunk

[<dai...@us...>]

Revision: 5408
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5408&view=rev
Author:   daintree
Date:     2012-06-02 06:08:51 +0000 (Sat, 02 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/CounterSales.php
    trunk/Z_ImportStocks.php

Modified: trunk/CounterSales.php
===================================================================
--- trunk/CounterSales.php	2012-05-30 09:03:21 UTC (rev 5407)
+++ trunk/CounterSales.php	2012-06-02 06:08:51 UTC (rev 5408)
@@ -1278,7 +1278,8 @@
 										rate,
 										invtext,
 										shipvia,
-										alloc )
+										alloc,
+										settled )
 			VALUES (
 				'". $InvoiceNo . "',
 				10,
@@ -1295,7 +1296,8 @@
 				'" . $ExRate . "',
 				'" . $_SESSION['Items'.$identifier]->Comments . "',
 				'" . $_SESSION['Items'.$identifier]->ShipVia . "',
-				'" . ($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['TaxTotal'])) . "')";
+				'" . ($_SESSION['Items'.$identifier]->total + filter_number_format($_POST['TaxTotal'])) . "',
+				'1')";
 
 		$ErrMsg =_('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The debtor transaction record could not be inserted because');
 		$DbgMsg = _('The following SQL to insert the debtor transaction record was used');
@@ -1934,7 +1936,8 @@
 							rate,
 							ovamount,
 							alloc,
-							invtext)
+							invtext,
+							settled)
 					VALUES ('" . $ReceiptNumber . "',
 						12,
 						'" . $_SESSION['Items'.$identifier]->DebtorNo . "',
@@ -1945,7 +1948,8 @@
 						'" . $ExRate . "',
 						'" . -filter_number_format($_POST['AmountPaid']) . "',
 						'" . -filter_number_format($_POST['AmountPaid']) . "',
-						'" . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('Counter Sale') ."')";
+						'" . $_SESSION['Items'.$identifier]->LocationName . ' ' . _('Counter Sale') ."',
+						'1')";
 
 			$DbgMsg = _('The SQL that failed to insert the customer receipt transaction was');
 			$ErrMsg = _('Cannot insert a receipt transaction against the customer because') ;

Modified: trunk/Z_ImportStocks.php
===================================================================
--- trunk/Z_ImportStocks.php	2012-05-30 09:03:21 UTC (rev 5407)
+++ trunk/Z_ImportStocks.php	2012-06-02 06:08:51 UTC (rev 5408)
@@ -33,17 +33,17 @@
 if ($_FILES['userfile']['name']) { //start file processing
 
 	//initialize
-	$allowType='text/csv';
+	$AllowType='text/csv';
 	$fieldTarget = 18;
 	$InputError = 0;
 
 	//check file info
-	$fileName = $_FILES['userfile']['name'];
+	$FileName = $_FILES['userfile']['name'];
 	$tmpName  = $_FILES['userfile']['tmp_name'];
 	$fileSize = $_FILES['userfile']['size'];
 	$fileType = $_FILES['userfile']['type'];
-	if ($fileType != $allowType) {
-		prnMsg (_('File has type '. $fileType. ', but only '. $allowType. ' is allowed.'),'error');
+	if ($fileType != $AllowType) {
+		prnMsg (_('File has type '. $fileType. ', but only '. $AllowType. ' is allowed.'),'error');
 		include('includes/footer.inc');
 		exit;
 	}
@@ -273,7 +273,7 @@
 		DB_Txn_Rollback($db);
 	} else { //all good so commit data transaction
 		DB_Txn_Commit($db);
-		prnMsg( _('Batch Import of') .' ' . $fileName  . ' '. _('has been completed. All transactions committed to the database.'),'success');
+		prnMsg( _('Batch Import of') .' ' . $FileName  . ' '. _('has been completed. All transactions committed to the database.'),'success');
 	}
 
 	fclose($handle);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.