[Weberp-cvs] SF.net SVN: web-erp:[3567] trunk

[<tim...@us...>]

Revision: 3567
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3567&view=rev
Author:   tim_schofield
Date:     2010-07-05 21:26:42 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
Minor bug fixes, corrections to sql statements

Modified Paths:
--------------
    trunk/CustLoginSetup.php
    trunk/doc/Change.log.html

Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php	2010-07-05 13:06:08 UTC (rev 3566)
+++ trunk/CustLoginSetup.php	2010-07-05 21:26:42 UTC (rev 3567)
@@ -15,12 +15,25 @@
 					_('Purchasing'),
 					_('Inventory'),
 					_('Manufacturing'),
+					_('Contracts'),
 					_('General Ledger'),
+					_('Asset Manager'),
+					_('Petty Cash'),
 					_('Setup'));
 
 echo "<a href='" . $rootpath . '/SelectCustomer.php?' . SID . "'>" . _('Back to Customers') . '</a><br>';
 
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="">' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName . ' ' . $phone . _(' has been selected') . '<br>';//'</p>';
+$sql="SELECT name
+		FROM debtorsmaster
+		WHERE debtorno='".$_SESSION['CustomerID']."'";
+
+$result=DB_query($sql, $db);
+$myrow=DB_fetch_array($result);
+$CustomerName=$myrow['name'];
+
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') .
+	'" alt="">' . ' ' . _('Customer') . ' : ' . $_SESSION['CustomerID'] . ' - ' . $CustomerName. _(' has been selected') .
+		'<br>';//'</p>';
 //echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'<br>';
 
 
@@ -126,7 +139,7 @@
 	$_POST['ModulesAllowed']= $ModulesAllowed;
 
 
-	if ($SelectedUser AND $InputError !=1) {
+	if (isset($SelectedUser) AND $InputError !=1) {
 
 /*SelectedUser could also exist if submit had not been clicked this code would not run in this case cos submit is false of course  see the delete code below*/
 
@@ -146,13 +159,13 @@
 						".$UpdatePassword."
 						branchcode='" . $_POST['BranchCode'] . "',
 						pagesize='" . $_POST['PageSize'] . "',
-						fullaccess=" . $_POST['Access'] . ",
+						fullaccess='" . $_POST['Access'] . "',
 						theme='" . $_POST['Theme'] . "',
 						language ='" . $_POST['UserLanguage'] . "',
 						defaultlocation='" . $_POST['DefaultLocation'] ."',
 						modulesallowed='" . $ModulesAllowed . "',
-						blocked=" . $_POST['Blocked'] . "
-					WHERE userid = '$SelectedUser'";
+						blocked='" . $_POST['Blocked'] . "'
+					WHERE userid = '".$SelectedUser."'";
 
 		$msg = _('The selected user record has been updated');
 	} elseif ($InputError !=1) {
@@ -165,6 +178,7 @@
 						phone,
 						email,
 						pagesize,
+						lastvisitdate,
 						fullaccess,
 						defaultlocation,
 						modulesallowed,
@@ -179,10 +193,11 @@
 						'" . $_POST['Phone'] . "',
 						'" . $_POST['Email'] ."',
 						'" . $_POST['PageSize'] ."',
-						" . $_POST['Access'] . ",
+						'" . date('Y-m-d') ."',
+						'" . $_POST['Access'] . "',
 						'" . $_POST['DefaultLocation'] ."',
 						'" . $ModulesAllowed . "',
-						" . $_SESSION['DefaultDisplayRecordsMax'] . ",
+						'" . $_SESSION['DefaultDisplayRecordsMax'] . "',
 						'" . $_POST['Theme'] . "',
 						'". $_POST['UserLanguage'] ."')";
 		$msg = _('A new user record has been inserted');
@@ -226,7 +241,7 @@
 			prnMsg(_('Cannot delete user as entries already exist in the audit trail'), 'warn');
 		} else {
 
-			$sql="DELETE FROM www_users WHERE userid='$SelectedUser'";
+			$sql="DELETE FROM www_users WHERE userid='".$SelectedUser."'";
 			$ErrMsg = _('The User could not be deleted because');;
 			$result = DB_query($sql,$db,$ErrMsg);
 			prnMsg(_('User Deleted'),'info');
@@ -254,7 +269,7 @@
 		FROM www_users WHERE customerid = '" . $_SESSION['CustomerID'] . "'";
 	$result = DB_query($sql,$db);
 
-	echo '<table>';
+	echo '<table class=selection>';
 	echo "<tr><th>" . _('User Login') . "</th>
 		<th>" . _('Full Name') . "</th>
 		<th>" . _('Telephone') . "</th>

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-05 13:06:08 UTC (rev 3566)
+++ trunk/doc/Change.log.html	2010-07-05 21:26:42 UTC (rev 3567)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>05/07/10 Tim: CustLoginSetup.php - Minor bug fixes, corrections to sql statements</p>
 <p>05/07/10 Pak Ricard: upgrade3.11.1-3.12.sql - Error in table name
 <p>05/07/10 Pak Ricard: PricesByCost.php - Margin must be decimal to allow margins like 2,5 or 3,3 time standard cost. Also ot has to be large enough to accept "currency margins". If you have a standard costs in EUR and want to check prices in IDR or viceversa, you'll need to compute large margins.</p>
 <p>04/07/10 Tim: CustEDISetup.php - Corrections to sql statements</p>


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