Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6636] trunk
|
From: <dai...@us...> - 2014-03-25 08:30:04
|
Revision: 6636
http://sourceforge.net/p/web-erp/reponame/6636
Author: daintree
Date: 2014-03-25 08:30:00 +0000 (Tue, 25 Mar 2014)
Log Message:
-----------
Removed DefaultTheme config parameter
Modified Paths:
--------------
trunk/CustLoginSetup.php
trunk/SuppLoginSetup.php
trunk/SystemParameters.php
trunk/WWW_Users.php
trunk/Z_ChangeStockCode.php
trunk/doc/Change.log
trunk/includes/session.inc
trunk/sql/mysql/upgrade4.11-4.12.sql
Modified: trunk/CustLoginSetup.php
===================================================================
--- trunk/CustLoginSetup.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/CustLoginSetup.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -242,7 +242,7 @@
if (isset($_POST['Theme']) and $_POST['Theme'] == $ThemeName){
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) and ($_SESSION['DefaultTheme']==$ThemeName)) {
+ } else if (!isset($_POST['Theme']) and ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
Modified: trunk/SuppLoginSetup.php
===================================================================
--- trunk/SuppLoginSetup.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/SuppLoginSetup.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -260,7 +260,7 @@
if (isset($_POST['Theme']) and $_POST['Theme'] == $ThemeName){
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) and ($_SESSION['DefaultTheme']==$ThemeName)) {
+ } else if (!isset($_POST['Theme']) and ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/SystemParameters.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -108,9 +108,6 @@
if ($_SESSION['DefaultDateFormat'] != $_POST['X_DefaultDateFormat'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_DefaultDateFormat']."' WHERE confname = 'DefaultDateFormat'";
}
- if ($_SESSION['DefaultTheme'] != $_POST['X_DefaultTheme'] ) {
- $sql[] = "UPDATE config SET confvalue = '".$_POST['X_DefaultTheme']."' WHERE confname = 'DefaultTheme'";
- }
if ($_SESSION['PastDueDays1'] != $_POST['X_PastDueDays1'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_PastDueDays1']."' WHERE confname = 'PastDueDays1'";
}
@@ -380,22 +377,6 @@
</select></td>
<td>' . _('The default date format for entry of dates and display.') . '</td></tr>';
-// DefaultTheme
-echo '<tr style="outline: 1px solid"><td>' . _('New Users Default Theme') . ':</td>
- <td><select name="X_DefaultTheme">';
-$ThemeDirectory = dir('css/');
-while (false != ($ThemeName = $ThemeDirectory->read())){
- if (is_dir("css/$ThemeName") AND $ThemeName != '.' AND $ThemeName != '..' AND $ThemeName != '.svn'){
- if ($_SESSION['DefaultTheme'] == $ThemeName) {
- echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else {
- echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
- }
- }
-}
-echo '</select></td>
- <td>' . _('The default theme is used for new users who have not yet defined the display colour scheme theme of their choice') . '</td></tr>';
-
echo '<tr><th colspan="3">' . _('Accounts Receivable/Payable Settings') . '</th></tr>';
// PastDueDays1
Modified: trunk/WWW_Users.php
===================================================================
--- trunk/WWW_Users.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/WWW_Users.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -622,7 +622,7 @@
if (isset($_POST['Theme']) AND $_POST['Theme'] == $ThemeName){
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
- } else if (!isset($_POST['Theme']) AND ($_SESSION['DefaultTheme']==$ThemeName)) {
+ } else if (!isset($_POST['Theme']) AND ($Theme==$ThemeName)) {
echo '<option selected="selected" value="' . $ThemeName . '">' . $ThemeName . '</option>';
} else {
echo '<option value="' . $ThemeName . '">' . $ThemeName . '</option>';
Modified: trunk/Z_ChangeStockCode.php
===================================================================
--- trunk/Z_ChangeStockCode.php 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/Z_ChangeStockCode.php 2014-03-25 08:30:00 UTC (rev 6636)
@@ -41,6 +41,8 @@
if ($InputError ==0){ // no input errors
+
+ DB_IgnoreForeignKeys($db);
$result = DB_Txn_Begin($db);
echo '<br />' . _('Adding the new stock master record');
$sql = "INSERT INTO stockmaster (stockid,
@@ -109,22 +111,24 @@
ChangeFieldInTable("mrpdemands", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
//check if MRP tables exist before assuming
-
- $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
- if (DB_error_no($db)==0) {
- ChangeFieldInTable("mrpplannedorders", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ $sql = "SELECT * FROM mrpparameters";
+- $result = DB_query($sql, $db, '', '', false, false);
+- if (DB_error_no($db) == 0) {
+ $result = DB_query("SELECT COUNT(*) FROM mrpplannedorders",$db,'','',false,false);
+ if (DB_error_no($db)==0) {
+ ChangeFieldInTable("mrpplannedorders", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ }
+
+ $result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
+ if (DB_error_no($db)==0){
+ ChangeFieldInTable("mrprequirements", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ }
+
+ $result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
+ if (DB_error_no($db)==0){
+ ChangeFieldInTable("mrpsupplies", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
+ }
}
-
- $result = DB_query("SELECT * FROM mrprequirements" , $db,'','',false,false);
- if (DB_error_no($db)==0){
- ChangeFieldInTable("mrprequirements", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
- }
-
- $result = DB_query("SELECT * FROM mrpsupplies" , $db,'','',false,false);
- if (DB_error_no($db)==0){
- ChangeFieldInTable("mrpsupplies", "part", $_POST['OldStockID'], $_POST['NewStockID'], $db);
- }
-
ChangeFieldInTable("salesanalysis", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
ChangeFieldInTable("orderdeliverydifferenceslog", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
ChangeFieldInTable("prices", "stockid", $_POST['OldStockID'], $_POST['NewStockID'], $db);
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/doc/Change.log 2014-03-25 08:30:00 UTC (rev 6636)
@@ -1,5 +1,6 @@
webERP Change Log
+24/3/14 Phil: Removed DefaultTheme configuration parameter - unecessary as noted by Serafalcon
23/03/14 Exson: Fixed the no defined variable bugs in WorkOrderIssue.php. Reported by Tim.
23/03/14 Exson: Fixed the bug that the search results shows only limited to DisplayRecordsMax which does not make sense due to pagination in WorkOrderIssue.php.
23/03/14 Exson: Fixed that currency name not available in Prices.php.
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/includes/session.inc 2014-03-25 08:30:00 UTC (rev 6636)
@@ -195,10 +195,6 @@
If (isset($_POST['Theme']) AND ($_SESSION['UsersRealName'] == $_POST['RealName'])) {
$_SESSION['Theme'] = $_POST['Theme'];
$Theme = $_POST['Theme'];
-} elseif (!isset($_SESSION['Theme'])) {
- $Theme = $_SESSION['DefaultTheme'];
- $_SESSION['Theme'] = $_SESSION['DefaultTheme'];
-
} else {
$Theme = $_SESSION['Theme'];
}
Modified: trunk/sql/mysql/upgrade4.11-4.12.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11-4.12.sql 2014-03-25 06:16:08 UTC (rev 6635)
+++ trunk/sql/mysql/upgrade4.11-4.12.sql 2014-03-25 08:30:00 UTC (rev 6636)
@@ -1,4 +1,5 @@
INSERT INTO `systypes` (`typeid` ,`typename` ,`typeno`) VALUES ('600', 'Auto Supplier Number', '0');
INSERT INTO config (confname, confvalue) VALUES ('AutoSupplierNo', '0');
+DELETE FROM config WHERE confname='DefaultTheme';
UPDATE config SET confvalue='4.12' WHERE confname='VersionNumber';
|
