web-erp-svn Mailing List for webERP Accounting & Business Management (Page 150)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4914
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4914&view=rev
Author:   daintree
Date:     2012-02-16 08:51:26 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
roll back stable to pre Tims menu changes

Modified Paths:
--------------
    branches/stable/AccountGroups.php
    branches/stable/AccountSections.php
    branches/stable/AddCustomerContacts.php
    branches/stable/AddCustomerTypeNotes.php
    branches/stable/UpgradeDatabase.php
    branches/stable/css/fresh/default.css
    branches/stable/css/fresh/images/maintenance.png
    branches/stable/css/fresh/images/reports.png
    branches/stable/css/fresh/images/transactions.png
    branches/stable/css/fresh/login.css
    branches/stable/css/silverwolf/default.css
    branches/stable/includes/ConnectDB.inc
    branches/stable/includes/footer.inc
    branches/stable/includes/header.inc
    branches/stable/includes/session.inc
    branches/stable/index.php

Removed Paths:
-------------
    branches/stable/includes/IndexArray.php
    branches/stable/sql/mysql/upgrade4.07-4.08.sql

Modified: branches/stable/AccountGroups.php
===================================================================

--- branches/stable/AccountGroups.php	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/AccountGroups.php	2012-02-16 08:51:26 UTC (rev 4914)
@@ -52,8 +52,7 @@
 	$i=1;
 
 	$sql="SELECT count(groupname)
-			FROM accountgroups 
-			WHERE groupname='".$_POST['GroupName']."'";
+			FROM accountgroups WHERE groupname='".$_POST['GroupName']."'";
 
 	$DbgMsg = _('The SQL that was used to retrieve the information was');
 	$ErrMsg = _('Could not check whether the group exists because');
@@ -116,7 +115,7 @@
 		$Errors[$i] = 'SequenceInTB';
 		$i++;
 	}
-	if (!ctype_digit($_POST['SequenceInTB']) OR $_POST['SequenceInTB'] > 10000) {
+	if (!ctype_digit($_POST['SequenceInTB']) or $_POST['SequenceInTB'] > 10000) {
 		$InputError = 1;
 		prnMsg( _('The sequence in the TB must be numeric and less than') . ' 10,000','error');
 		$Errors[$i] = 'SequenceInTB';

Modified: branches/stable/AccountSections.php
===================================================================
--- branches/stable/AccountSections.php	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/AccountSections.php	2012-02-16 08:51:26 UTC (rev 4914)
@@ -14,8 +14,9 @@
 
 	if( DB_num_rows($result) == 0 ) {
 		$sql = "INSERT INTO accountsection (sectionid,
-											sectionname) 
-									VALUES (1,
+											sectionname
+										) VALUES (
+											1,
 											'Income')";
 		$result = DB_query($sql,$db);
 	}
@@ -25,8 +26,9 @@
 
 	if( DB_num_rows($result) == 0 ) {
 		$sql = "INSERT INTO accountsection (sectionid,
-											sectionname) 
-									VALUES (2,
+											sectionname
+										) VALUES (
+											2,
 											'Cost Of Sales')";
 		$result = DB_query($sql,$db);
 	}
@@ -56,7 +58,7 @@
 					WHERE sectionid='".$_POST['SectionID']."'";
 		$result=DB_query($sql, $db);
 
-		if ((DB_num_rows($result)!=0 AND !isset($_POST['SelectedSectionID']))) {
+		if ((DB_num_rows($result)!=0 and !isset($_POST['SelectedSectionID']))) {
 			$InputError = 1;
 			prnMsg( _('The account section already exists in the database'),'error');
 			$Errors[$i] = 'SectionID';
@@ -75,20 +77,20 @@
 		$Errors[$i] = 'SectionName';
 		$i++;
 	}
-	if (isset($_POST['SectionID']) AND (!is_numeric($_POST['SectionID']))) {
+	if (isset($_POST['SectionID']) and (!is_numeric($_POST['SectionID']))) {
 		$InputError = 1;
 		prnMsg( _('The section number must be an integer'),'error');
 		$Errors[$i] = 'SectionID';
 		$i++;
 	}
-	if (isset($_POST['SectionID']) AND mb_strpos($_POST['SectionID'],".")>0) {
+	if (isset($_POST['SectionID']) and mb_strpos($_POST['SectionID'],".")>0) {
 		$InputError = 1;
 		prnMsg( _('The section number must be an integer'),'error');
 		$Errors[$i] = 'SectionID';
 		$i++;
 	}
 
-	if (isset($_POST['SelectedSectionID']) AND $_POST['SelectedSectionID']!='' AND $InputError !=1) {
+	if (isset($_POST['SelectedSectionID']) and $_POST['SelectedSectionID']!='' AND $InputError !=1) {
 
 		/*SelectedSectionID 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*/
 
@@ -147,7 +149,7 @@
 	unset ($_POST['SectionName']);
 }
 
-if (!isset($_GET['SelectedSectionID']) AND !isset($_POST['SelectedSectionID'])) {
+if (!isset($_GET['SelectedSectionID']) and !isset($_POST['SelectedSectionID'])) {
 
 /* An account section could be posted when one has been edited and is being updated
   or GOT when selected for modification

Modified: branches/stable/AddCustomerContacts.php
===================================================================
--- branches/stable/AddCustomerContacts.php	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/AddCustomerContacts.php	2012-02-16 08:51:26 UTC (rev 4914)
@@ -34,7 +34,7 @@
 	ie the page has called itself with some user input */
 
 	//first off validate inputs sensible
-	if (isset($_POST['Con_ID']) AND !is_long((integer)$_POST['Con_ID'])) {
+	if (isset($_POST['Con_ID']) and !is_long((integer)$_POST['Con_ID'])) {
 		$InputError = 1;
 		prnMsg( _('The Contact ID must be an integer.'), 'error');
 	} elseif (mb_strlen($_POST['ContactName']) >40) {
@@ -43,12 +43,12 @@
 	} elseif( trim($_POST['ContactName']) == '' ) {
 		$InputError = 1;
 		prnMsg( _('The contact name may not be empty'), 'error');
-	} elseif (!IsEmailAddress($_POST['ContactEmail']) AND mb_strlen($_POST['ContactEmail'])>0){
+	} elseif (!IsEmailAddress($_POST['ContactEmail']) and mb_strlen($_POST['ContactEmail'])>0){
 		$InputError = 1;
 		prnMsg( _('The contact email address is not a valid email address'), 'error');
 	}
 
-	if (isset($Id) AND ($Id AND $InputError !=1)) {
+	if (isset($Id) and ($Id and $InputError !=1)) {
 		$sql = "UPDATE custcontacts SET contactname='" . $_POST['ContactName'] . "',
 										role='" . $_POST['ContactRole'] . "',
 										phoneno='" . $_POST['ContactPhone'] . "',
@@ -89,7 +89,7 @@
 		unset($_POST['ContactEmail']);
 		unset($_POST['Con_ID']);
 	}
-} elseif (isset($_GET['delete']) AND $_GET['delete']) {
+} elseif (isset($_GET['delete']) and $_GET['delete']) {
 //the link to delete a selected record was clicked instead of the submit button
 
 // PREVENT DELETES IF DEPENDENT RECORDS IN 'SalesOrders'
@@ -127,8 +127,7 @@
 			<th>' . _('Role') . '</th>
 			<th>' . _('Phone no') . '</th>
 			<th>' . _('Email') . '</th>
-			<th>' . _('Notes') . '</th>
-		</tr>';
+			<th>' . _('Notes') . '</th>';
 
 	$k=0; //row colour counter
 
@@ -209,8 +208,7 @@
 		echo '<table class="selection">';
 	}
 
-	echo '<tr>
-			<td>'. _('Contact Name') . '</td>';
+	echo '<tr><td>'. _('Contact Name') . '</td>';
 	if (isset($_POST['ContactName'])) {
 		echo '<td><input type="text" name="ContactName" value="' . $_POST['ContactName']. '" size="35" maxlength="40" /></td>
 			</tr>';
@@ -227,8 +225,7 @@
 		echo '<td><input type="text" name="ContactRole" size="35" maxlength="40" /></td>
 			</tr>';
 	}
-	echo '<tr>
-			<td>' . _('Phone') . '</td>';
+	echo '<tr><td>' . _('Phone') . '</td>';
 	if (isset($_POST['ContactPhone'])) {
 		echo '<td><input type="text" name="ContactPhone" value="' . $_POST['ContactPhone'] . '" size="35" maxlength="40" /></td>
 			</tr>';

Modified: branches/stable/AddCustomerTypeNotes.php
===================================================================
--- branches/stable/AddCustomerTypeNotes.php	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/AddCustomerTypeNotes.php	2012-02-16 08:51:26 UTC (rev 4914)
@@ -111,8 +111,7 @@
 			<th>' . _('Date') . '</th>
 			<th>' . _('Note') . '</th>
 			<th>' . _('href') . '</th>
-			<th>' . _('Priority') . '</th>
-		</tr>';
+			<th>' . _('Priority') . '</th>';
 
 	$k=0; //row colour counter
 

Modified: branches/stable/UpgradeDatabase.php
===================================================================
--- branches/stable/UpgradeDatabase.php	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/UpgradeDatabase.php	2012-02-16 08:51:26 UTC (rev 4914)
@@ -134,8 +134,6 @@
 				case '4.06.6':
 					$SQLScripts[] = './sql/mysql/upgrade4.06-4.07.sql';
 				case '4.07.0':
-					$SQLScripts[] = './sql/mysql/upgrade4.07-4.08.sql';
-				case '4.08':
 					break;
 			} //end switch
 		}

Modified: branches/stable/css/fresh/default.css
===================================================================
--- branches/stable/css/fresh/default.css	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/css/fresh/default.css	2012-02-16 08:51:26 UTC (rev 4914)
@@ -2,7 +2,7 @@
 |               |               | default.css       |
 |---------------------------------------------------|
 | For use with:                                     |
-| Web-ERP - http://weberp.sourceforge.net          |
+| Web-ERP - http://web-erp.sourceforge.net          |
 | by Logic Works Ltd                                |
 |---------------------------------------------------|
 | Developer:                                        |
@@ -19,11 +19,11 @@
 body {
 	font-family: Arial, Verdana, Helvetica, sans-serif;;
 	font-size: 10px;
-	background-color: #FFF;
-	margin-left: 0px;
-	margin-top: 0px;
+	background-color: #F1FFDD;
+	margin-left: 10px;
+	margin-top: 5px;
 	margin-bottom: 0px;
-	margin-right: 0px;
+	margin-right: 10px;
 	padding: 0px;
 }
 
@@ -37,7 +37,7 @@
 	font-size: 10px;
 	font-weight: bold;
 	text-decoration: none;
-	color: #4D4E1A;
+	color: black;
 }
 
 /*links on any screen when mouse is hovering over them */
@@ -47,7 +47,7 @@
 }
 
 table {
-  background-color: #ffffff;
+  background-color: #B4BB86;
   margin: 0 auto;
 }
 
@@ -106,11 +106,11 @@
 }
 
 .EvenTableRows {
-	background-color: #72824D;
+	background-color: #CCCCCC;
 }
 
 .OddTableRows {
-	background-color: #CAF17C;
+	background-color: #EEEEEE;
 }
 
 th {
@@ -147,7 +147,7 @@
 div.info {
 	background-color:#c7ccf6;
 	color: navy;
-	border: 0px solid navy;
+	border: 1px solid navy;
 }
 
 input {
@@ -190,7 +190,7 @@
 #topMenu {
 	width: 100%;
 	color: black;
-	background-color: #A0C462;
+	background-color: #ffffff;
 	border: none;
 	border-bottom: 1px solid #999999;
 }
@@ -248,16 +248,10 @@
 .table1 {
   width:90%;
   background: #eee;
-  border: 0px 0px 2px 2px #222 solid;
+  border: 1px solid #222;
   margin: 0 auto;
 }
-/* Table type is used for UI tables type 2 */
-.table2 {
-  width:90%;
-  background: #eee;
-  border: 0px 0px 2px 2px #222 solid;
-  margin: 0 auto;
-}
+
 input.address3 {
 	text-transform: uppercase;
 }
@@ -302,12 +296,18 @@
 /* Main page heading with quick menu within */
 .quick_menu {
 	width: 100%;
-	background-color: #C9D392;
+	background-color: #ffffff;
 	border: none;
 	margin: 0px;
 	padding: 0px;
  	color: black;
+	/*border-top: 2px #aaaaaa solid;
+	border-left: 2px #aaaaaa solid;
+	border-right: 2px #ffffff solid;
+	border-bottom: 4px #ffffff solid; */
 	text-align: right;
+	/* position: relative;
+	top: 3px; */
 }
 
 #quick_menu{
@@ -319,14 +319,14 @@
 	font-size: 11px;
 	border: 0px;
 	white-space: nowrap;
-	margin: 0px;
+	margin: 2px;
 	padding: 0px;
 	color: black;
 }
 
 /*the Select Customer / Item / Supplier Menu tabs */
 .quick_menu_tabs {
-	background-color: #5A5F00;
+	background-color: #ffffff;
 	white-space: nowrap;
 	border: none;
 	margin: 0px;
@@ -399,7 +399,6 @@
 
 .main_menu {
 	border: 2px inset #ffffff;
-	background-color: #ffffff;
 }
 
 .main_menu table {
@@ -411,21 +410,11 @@
 
 .main_menu_unselected {
 	background-color: #617C4F;
-	border: 1px solid #5C874D;
+	border: 2px #f1ffdd outset;
 	text-align: center;
 	white-space: nowrap;
-	height: 16pt;
 }
 
-.main_menu_selected {
-	background-color: #C9D392;
-	border: 1px solid #5C874D;
-	text-align: center;
-	white-space: nowrap;
-	color: #2B570F;
-	height: 16pt;
-}
-
 .main_menu_unselected:hover{
 }
 .main_menu_selected:hover{
@@ -437,13 +426,20 @@
 .main_menu_unselected a:hover{
 }
 
+.main_menu_selected {
+	background-color: #617C4F;
+	border: 2px inset #41437D;
+	text-align: center;
+	white-space: nowrap;
+}
+
 .main_menu_selected a{
-	color: #2B570F;
+	color: #eee;
     font-weight:bold;
 }
 
 .main_menu_selected a:hover{
-	color: #2B570F;
+	color: #fff;
 	text-decoration: none;
 }
 
@@ -480,7 +476,7 @@
 }
 
 .menu_group_area {
-  border: 0px inset #ffffff;
+  border: 2px inset #ffffff;
 }
 
 .blank_area table {
@@ -489,8 +485,7 @@
 }
 
 .menu_group_headers {
-  border: 0px #aaaaaa;
-  background-color: #C9D392;
+  border: 2px outset #aaaaaa;
   width: 25%;
 }
 
@@ -507,32 +502,30 @@
 .menu_group_items {
 	vertical-align: top;
 	background-color: #ffffff;
-	border: 0px #aaaaaa;
+	border: 2px outset #aaaaaa;
 	padding: 10px;
 }
 
 .menu_group_item {
+	background-color: #ffffff;
 	padding-top: 2px;
 	padding-bottom: 2px;
 }
 
 .menu_group_item p {
-	color: #5AAE34; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
+	color: #00f; /* This is the color for bullets, I like it to be the same as the anchor color, but it's up to you */
 	text-indent: -12px; /* this makes the bullet to appear as the li tag previously used */
 	margin: 0 0 0 12px; /* One thing that I didn´t like of the li was that it had no left margin applied */
 }
 
-p.page_title_text {
+.page_title_text {
 	font-family: Arial, Verdana, Helvetica, sans-serif;
-	padding-top: 2px;
-	padding-bottom: 2px;
+        padding-top: 2px;
+        padding-bottom: 2px;
 	font-weight: bold;
 	font-size: 10px;
 	color: black;
-	background-color: #C9D392;
-	width: 30%;
 	TEXT-ALIGN:center;
-	margin: 10px auto;
 }
 
 DIV.page_help_text {
@@ -593,21 +586,20 @@
 #footer {
 	position: relative;
 	bottom: -3px;
-	background-color: #C9D392;
 }
 
 a.footer {
 	font-family: Arial, Verdana, Helvetica, sans-serif;
 	color: black;
 	font-weight: normal;
-	font-size: 10px;
+	font-size: 8px;
 }
 
 .footer {
 	font-family: Arial, Verdana, Helvetica, sans-serif;
 	color: black;
 	font-weight: normal;
-	font-size: 10px;
+	font-size: 8px;
 	text-align: center;
 }
 
@@ -696,4 +688,4 @@
 
 li {
 	list-style-image: url(bullet.gif);
-}
+}
\ No newline at end of file

Modified: branches/stable/css/fresh/images/maintenance.png
===================================================================
--- branches/stable/css/fresh/images/maintenance.png	2012-02-16 08:38:39 UTC (rev 4913)
+++ branches/stable/css/fresh/images/maintenance.png	2012-02-16 08:51:26 UTC (rev 4914)
@@ -1,7 +1,7 @@
 \x89PNG
 
 

2011	Jan (14)	Feb (42)	Mar (56)	Apr (60)	May (54)	Jun (48)	Jul (74)	Aug (52)	Sep (68)	Oct (64)	Nov (42)	Dec (62)
2012	Jan (142)	Feb (270)	Mar (374)	Apr (230)	May (214)	Jun (116)	Jul (234)	Aug (66)	Sep (120)	Oct (16)	Nov (17)	Dec (41)
2013	Jan (19)	Feb (18)	Mar (8)	Apr (40)	May (121)	Jun (42)	Jul (127)	Aug (145)	Sep (27)	Oct (38)	Nov (83)	Dec (61)
2014	Jan (33)	Feb (35)	Mar (59)	Apr (41)	May (38)	Jun (45)	Jul (17)	Aug (58)	Sep (46)	Oct (51)	Nov (55)	Dec (36)
2015	Jan (57)	Feb (67)	Mar (70)	Apr (34)	May (32)	Jun (11)	Jul (3)	Aug (17)	Sep (16)	Oct (13)	Nov (30)	Dec (30)
2016	Jan (17)	Feb (12)	Mar (17)	Apr (20)	May (47)	Jun (15)	Jul (13)	Aug (30)	Sep (32)	Oct (20)	Nov (32)	Dec (24)
2017	Jan (16)	Feb	Mar (11)	Apr (11)	May (5)	Jun (42)	Jul (9)	Aug (10)	Sep (14)	Oct (15)	Nov (2)	Dec (29)
2018	Jan (28)	Feb (49)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

web-erp-svn Mailing List for webERP Accounting & Business Management (Page 150)

Accounting & Best Practice Business Administration System

web-erp-svn — SVN commits