|
From: <te...@us...> - 2013-07-19 01:05:41
|
Revision: 6106
http://sourceforge.net/p/web-erp/reponame/6106
Author: tehonu
Date: 2013-07-19 01:05:37 +0000 (Fri, 19 Jul 2013)
Log Message:
-----------
Added ORDER BY at salesman selection box
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-07-18 15:04:58 UTC (rev 6105)
+++ trunk/WWW_Users.php 2013-07-19 01:05:37 UTC (rev 6106)
@@ -538,7 +538,7 @@
<td>' . _('Restrict to Sales Person') . ':</td>
<td><select name="Salesman">';
-$sql = "SELECT salesmancode, salesmanname FROM salesman WHERE current = 1";
+$sql = "SELECT salesmancode, salesmanname FROM salesman WHERE current = 1 ORDER BY salesmanname";
$result = DB_query($sql,$db);
if ((isset($_POST['Salesman']) AND $_POST['Salesman']=='') OR !isset($_POST['Salesman'])){
echo '<option selected="selected" value="">' . _('Not a salesperson only login') . '</option>';
|
|
From: <ex...@us...> - 2013-07-24 10:27:38
|
Revision: 6140
http://sourceforge.net/p/web-erp/reponame/6140
Author: exsonqu
Date: 2013-07-24 10:27:34 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
24/7/2013 Exson: Add the html5 mark for some input fields in WWW_Users.php.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-07-24 03:03:47 UTC (rev 6139)
+++ trunk/WWW_Users.php 2013-07-24 10:27:34 UTC (rev 6140)
@@ -420,7 +420,7 @@
echo '<table class="selection">
<tr>
<td>' . _('User Login') . ':</td>
- <td><input type="text" name="UserID" size="22" maxlength="20" /></td>
+ <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="true" name="UserID" size="22" maxlength="20" placeholder="'._('Not less than 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'" /></td>
</tr>';
/*set the default modules to show to all
@@ -452,7 +452,7 @@
}
echo '<tr>
<td>' . _('Password') . ':</td>
- <td><input type="password" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" /></td>
+ <td><input type="password" pattern=".{5,}" name="Password" required="true" size="22" maxlength="20" value="' . $_POST['Password'] . '" placeholder="'._('not less than 5 characters').'" title="'._('Please enter not less than 5 characters and cannot same as users id').'" /></td>
</tr>';
echo '<tr>
<td>' . _('Full Name') . ':</td>
@@ -460,11 +460,11 @@
</tr>';
echo '<tr>
<td>' . _('Telephone No') . ':</td>
- <td><input type="text" name="Phone" value="' . $_POST['Phone'] . '" size="32" maxlength="30" /></td>
+ <td><input name="Phone" value="' . $_POST['Phone'] . '" size="32" maxlength="30" /></td>
</tr>';
echo '<tr>
<td>' . _('Email Address') .':</td>
- <td><input type="text" name="Email" value="' . $_POST['Email'] .'" size="32" maxlength="55" /></td>
+ <td><input type="email" name="Email" value="' . $_POST['Email'] .'" size="32" maxlength="55" title="'._('The input must be email').'" /></td>
</tr>';
echo '<tr>
<td>' . _('Security Role') . ':</td>
@@ -479,6 +479,7 @@
}
echo '</select>';
echo '<input type="hidden" name="ID" value="'.$_SESSION['UserID'].'" /></td>
+
</tr>';
echo '<tr><td>' . _('User Can Create Tenders') . ':</td><td><select name="CanCreateTender">';
@@ -740,4 +741,4 @@
echo '<script type="text/javascript">defaultControl(document.forms[0].UserID);</script>';
}
include('includes/footer.inc');
-?>
\ No newline at end of file
+?>
|
|
From: <ex...@us...> - 2013-07-24 11:02:32
|
Revision: 6142
http://sourceforge.net/p/web-erp/reponame/6142
Author: exsonqu
Date: 2013-07-24 11:02:29 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
24/7/2013 Exson: Fixed that empty password should be allowed. Reported by Tim.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-07-24 10:28:25 UTC (rev 6141)
+++ trunk/WWW_Users.php 2013-07-24 11:02:29 UTC (rev 6142)
@@ -452,7 +452,7 @@
}
echo '<tr>
<td>' . _('Password') . ':</td>
- <td><input type="password" pattern=".{5,}" name="Password" required="true" size="22" maxlength="20" value="' . $_POST['Password'] . '" placeholder="'._('not less than 5 characters').'" title="'._('Please enter not less than 5 characters and cannot same as users id').'" /></td>
+ <td><input type="password" pattern=".{5,}" name="Password" size="22" maxlength="20" value="' . $_POST['Password'] . '" placeholder="'._('not less than 5 characters').'" title="'._('Please enter not less than 5 characters and cannot same as users id').'" /></td>
</tr>';
echo '<tr>
<td>' . _('Full Name') . ':</td>
|
|
From: <rc...@us...> - 2013-10-09 17:37:25
|
Revision: 6349
http://sourceforge.net/p/web-erp/reponame/6349
Author: rchacon
Date: 2013-10-09 17:37:21 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Fixes capital letter mismatch between WWW_User.php and PDFStarter.php for paper size.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-10-09 01:20:59 UTC (rev 6348)
+++ trunk/WWW_Users.php 2013-10-09 17:37:21 UTC (rev 6349)
@@ -68,7 +68,7 @@
if (mb_strlen($_POST['UserID'])<4){
$InputError = 1;
prnMsg(_('The user ID entered must be at least 4 characters long'),'error');
- } elseif (ContainsIllegalCharacters($_POST['UserID'])) {
+ } elseif (ContainsIlLegalCharacters($_POST['UserID'])) {
$InputError = 1;
prnMsg(_('User names cannot contain any of the following characters') . " - ' & + \" \\ " . _('or a space'),'error');
} elseif (mb_strlen($_POST['Password'])<5){
@@ -420,7 +420,7 @@
echo '<table class="selection">
<tr>
<td>' . _('User Login') . ':</td>
- <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'" /></td>
+ <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains ilLegal characters').'" /></td>
</tr>';
/*set the default modules to show to all
@@ -524,17 +524,17 @@
}
echo '<tr>
<td>' . _('Customer Code') . ':</td>
- <td><input type="text" name="Cust" data-type="no-illegal-chars" title="' . _('If this user login is to be associated with a customer account, enter the customer account code') . '" size="10" maxlength="10" value="' . $_POST['Cust'] . '" /></td>
+ <td><input type="text" name="Cust" data-type="no-ilLegal-chars" title="' . _('If this user login is to be associated with a customer account, enter the customer account code') . '" size="10" maxlength="10" value="' . $_POST['Cust'] . '" /></td>
</tr>';
echo '<tr>
<td>' . _('Branch Code') . ':</td>
- <td><input type="text" name="BranchCode" data-type="no-illegal-chars" title="' . _('If this user login is to be associated with a customer account a valid branch for the customer account must be entered.') . '" size="10" maxlength="10" value="' . $_POST['BranchCode'] .'" /></td>
+ <td><input type="text" name="BranchCode" data-type="no-ilLegal-chars" title="' . _('If this user login is to be associated with a customer account a valid branch for the customer account must be entered.') . '" size="10" maxlength="10" value="' . $_POST['BranchCode'] .'" /></td>
</tr>';
echo '<tr>
<td>' . _('Supplier Code') . ':</td>
- <td><input type="text" name="SupplierID" data-type="no-illegal-chars" size="10" maxlength="10" value="' . $_POST['SupplierID'] .'" /></td>
+ <td><input type="text" name="SupplierID" data-type="no-ilLegal-chars" size="10" maxlength="10" value="' . $_POST['SupplierID'] .'" /></td>
</tr>';
echo '<tr>
@@ -577,33 +577,33 @@
echo '<option value="A3">' . _('A3') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3_landscape'){
- echo '<option selected="selected" value="A3_landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='A3_Landscape'){
+ echo '<option selected="selected" value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
} else {
- echo '<option value="A3_landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
+ echo '<option value="A3_Landscape">' . _('A3') . ' ' . _('landscape') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='letter'){
- echo '<option selected="selected" value="letter">' . _('Letter') . '</option>';
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter'){
+ echo '<option selected="selected" value="Letter">' . _('Letter') . '</option>';
} else {
- echo '<option value="letter">' . _('Letter') . '</option>';
+ echo '<option value="Letter">' . _('Letter') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='letter_landscape'){
- echo '<option selected="selected" value="letter_landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Letter_Landscape'){
+ echo '<option selected="selected" value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
} else {
- echo '<option value="letter_landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
+ echo '<option value="Letter_Landscape">' . _('Letter') . ' ' . _('landscape') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='legal'){
- echo '<option selected="selected" value="legal">' . _('Legal') . '</option>';
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal'){
+ echo '<option selected="selected" value="Legal">' . _('Legal') . '</option>';
} else {
- echo '<option value="legal">' . _('Legal') . '</option>';
+ echo '<option value="Legal">' . _('Legal') . '</option>';
}
-if(isset($_POST['PageSize']) AND $_POST['PageSize']=='legal_landscape'){
- echo '<option selected="selected" value="legal_landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
+if(isset($_POST['PageSize']) AND $_POST['PageSize']=='Legal_Landscape'){
+ echo '<option selected="selected" value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
} else {
- echo '<option value="legal_landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
+ echo '<option value="Legal_Landscape">' . _('Legal') . ' ' . _('landscape') . '</option>';
}
echo '</select></td>
|
|
From: <ex...@us...> - 2013-12-02 03:19:42
|
Revision: 6467
http://sourceforge.net/p/web-erp/reponame/6467
Author: exsonqu
Date: 2013-12-02 03:19:37 +0000 (Mon, 02 Dec 2013)
Log Message:
-----------
2/12/2013 Exson: Fixed the typo in WWW_Users.php. Reported by Thumb.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2013-12-01 15:31:07 UTC (rev 6466)
+++ trunk/WWW_Users.php 2013-12-02 03:19:37 UTC (rev 6467)
@@ -420,7 +420,7 @@
echo '<table class="selection">
<tr>
<td>' . _('User Login') . ':</td>
- <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains ilLegal characters').'" /></td>
+ <td><input pattern="(?!^([aA]{1}[dD]{1}[mM]{1}[iI]{1}[nN]{1})$)[^?+.&\\>< ]{4,}" type="text" required="required" name="UserID" size="22" maxlength="20" placeholder="'._('At least 4 characters').'" title="'._('Please input not less than 4 characters and canot be admin or contains illegal characters').'" /></td>
</tr>';
/*set the default modules to show to all
|
|
From: <ex...@us...> - 2014-06-14 16:08:18
|
Revision: 6752
http://sourceforge.net/p/web-erp/reponame/6752
Author: exsonqu
Date: 2014-06-14 16:08:09 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
15/06/14 Akits from minghao.hk/bbs/ fixed the bugs that www_Users.php allowed modules does not matched the one displayed in index.php.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2014-06-13 01:09:20 UTC (rev 6751)
+++ trunk/WWW_Users.php 2014-06-14 16:08:09 UTC (rev 6752)
@@ -11,8 +11,8 @@
$ModuleList = array(_('Orders'),
_('Receivables'),
+ _('Purchasing'),
_('Payables'),
- _('Purchasing'),
_('Inventory'),
_('Manufacturing'),
_('General Ledger'),
@@ -738,4 +738,4 @@
</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
|
|
From: <aga...@us...> - 2014-08-11 14:12:35
|
Revision: 6807
http://sourceforge.net/p/web-erp/reponame/6807
Author: agaluski
Date: 2014-08-11 14:12:30 +0000 (Mon, 11 Aug 2014)
Log Message:
-----------
Authorize user for default location on create (Tim)
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2014-08-09 04:37:02 UTC (rev 6806)
+++ trunk/WWW_Users.php 2014-08-11 14:12:30 UTC (rev 6807)
@@ -87,7 +87,7 @@
prnMsg(_('The demonstration user called demo cannot be modified.'),'error');
$InputError = 1;
}
-
+
if (!isset($SelectedUser)){
/* check to ensure the user id is not already entered */
$result = DB_query("SELECT userid FROM www_users WHERE userid='" . $_POST['UserID'] . "'",$db);
@@ -163,6 +163,20 @@
prnMsg( _('The selected user record has been updated'), 'success' );
} elseif ($InputError !=1) {
+ $LocationSql = "INSERT INTO locationusers (loccode,
+ userid,
+ canview,
+ canupd
+ ) VALUES (
+ '" . $_POST['DefaultLocation'] . "',
+ '" . $_POST['UserID'] . "',
+ 1,
+ 1
+ )";
+ $ErrMsg = _('The default user locations could not be processed because');
+ $DbgMsg = _('The SQL that was used to update the user locations and failed was');
+ $Result = DB_query($LocationSql, $ErrMsg, $DbgMsg);
+
$sql = "INSERT INTO www_users (userid,
realname,
customerid,
|
|
From: <te...@us...> - 2014-10-29 15:15:31
|
Revision: 6952
http://sourceforge.net/p/web-erp/reponame/6952
Author: tehonu
Date: 2014-10-29 15:15:29 +0000 (Wed, 29 Oct 2014)
Log Message:
-----------
When deleting a user, delete also the locationusers related records to avoid orfaned info
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2014-10-29 06:29:22 UTC (rev 6951)
+++ trunk/WWW_Users.php 2014-10-29 15:15:29 UTC (rev 6952)
@@ -258,6 +258,9 @@
if (DB_num_rows($result)!=0) {
prnMsg(_('Cannot delete user as entries already exist in the audit trail'), 'warn');
} else {
+ $sql="DELETE FROM locationusers WHERE userid='" . $SelectedUser . "'";
+ $ErrMsg = _('The Location - User could not be deleted because');;
+ $result = DB_query($sql,$ErrMsg);
$sql="DELETE FROM www_users WHERE userid='" . $SelectedUser . "'";
$ErrMsg = _('The User could not be deleted because');;
|
|
From: <ex...@us...> - 2015-03-07 02:22:05
|
Revision: 7192
http://sourceforge.net/p/web-erp/reponame/7192
Author: exsonqu
Date: 2015-03-07 02:22:03 +0000 (Sat, 07 Mar 2015)
Log Message:
-----------
07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-03-07 02:16:15 UTC (rev 7191)
+++ trunk/WWW_Users.php 2015-03-07 02:22:03 UTC (rev 7192)
@@ -327,7 +327,7 @@
}
if ($myrow[8]=='') {
- $LastVisitDate = Date($_SESSION['DefaultDateFormat']);
+ $LastVisitDate = _('No login record');
} else {
$LastVisitDate = ConvertSQLDate($myrow[8]);
}
|
|
From: <te...@us...> - 2015-11-16 08:14:29
|
Revision: 7391
http://sourceforge.net/p/web-erp/reponame/7391
Author: tehonu
Date: 2015-11-16 08:14:27 +0000 (Mon, 16 Nov 2015)
Log Message:
-----------
Delete glaccountusers entries in cascade when deleting a webERP user
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-11-15 18:32:41 UTC (rev 7390)
+++ trunk/WWW_Users.php 2015-11-16 08:14:27 UTC (rev 7391)
@@ -276,6 +276,10 @@
$ErrMsg = _('The Location - User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
+ $sql="DELETE FROM glaccountusers WHERE userid='" . $SelectedUser . "'";
+ $ErrMsg = _('The GL Account - User could not be deleted because');;
+ $result = DB_query($sql,$ErrMsg);
+
$sql="DELETE FROM www_users WHERE userid='" . $SelectedUser . "'";
$ErrMsg = _('The User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
|
|
From: <te...@us...> - 2015-11-27 00:26:58
|
Revision: 7402
http://sourceforge.net/p/web-erp/reponame/7402
Author: tehonu
Date: 2015-11-27 00:26:56 +0000 (Fri, 27 Nov 2015)
Log Message:
-----------
cascade deletion of bankaccountusers to aviod orphaned records in bankaccountusers table
Modified Paths:
--------------
trunk/WWW_Users.php
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2015-11-26 07:14:50 UTC (rev 7401)
+++ trunk/WWW_Users.php 2015-11-27 00:26:56 UTC (rev 7402)
@@ -280,6 +280,10 @@
$ErrMsg = _('The GL Account - User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
+ $sql="DELETE FROM bankaccountusers WHERE userid='" . $SelectedUser . "'";
+ $ErrMsg = _('The Bank Accounts - User could not be deleted because');;
+ $result = DB_query($sql,$ErrMsg);
+
$sql="DELETE FROM www_users WHERE userid='" . $SelectedUser . "'";
$ErrMsg = _('The User could not be deleted because');;
$result = DB_query($sql,$ErrMsg);
|