Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5759] trunk
|
From: <dai...@us...> - 2012-12-15 03:01:23
|
Revision: 5759
http://sourceforge.net/p/web-erp/reponame/5759
Author: daintree
Date: 2012-12-15 03:01:20 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
Bob Thomas modified default theme font
Modified Paths:
--------------
trunk/PDFStockCheckComparison.php
trunk/SelectSupplier.php
trunk/StockAdjustments.php
trunk/css/aguapop/default.css
trunk/css/default/default.css
trunk/css/fluid/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/professional/default.css
trunk/css/silverwolf/default.css
trunk/css/wood/default.css
trunk/doc/Change.log
trunk/doc/Manual/ManualAccountsPayable.html
trunk/doc/Manual/ManualContributors.html
trunk/doc/Manual/ManualInventory.html
Modified: trunk/PDFStockCheckComparison.php
===================================================================
--- trunk/PDFStockCheckComparison.php 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/PDFStockCheckComparison.php 2012-12-15 03:01:20 UTC (rev 5759)
@@ -146,7 +146,7 @@
'" . $SQLAdjustmentDate . "',
'" . $PeriodNo . "',
'" . $StockGLCodes['adjglact'] . "',
- '" . $myrow['standardcost'] * -($StockQtyDifference) . "',
+ '" . ($myrow['standardcost'] * -($StockQtyDifference)) . "',
'" . $myrow['stockid'] . " x " . $StockQtyDifference . " @ " . $myrow['standardcost'] . " - " . _('Inventory Check') . "')";
$Result = DB_query($SQL,$db, $ErrMsg, $DbgMsg, true);
@@ -182,13 +182,13 @@
$ErrMsg = _('The Inventory Comparison data could not be retrieved because');
$DbgMsg = _('The following SQL to retrieve the Inventory Comparison data was used');
$sql = "SELECT stockcheckfreeze.stockid,
- description,
- stockmaster.categoryid,
- stockcategory.categorydescription,
- stockcheckfreeze.loccode,
- locations.locationname,
- stockcheckfreeze.qoh,
- stockmaster.decimalplaces
+ description,
+ stockmaster.categoryid,
+ stockcategory.categorydescription,
+ stockcheckfreeze.loccode,
+ locations.locationname,
+ stockcheckfreeze.qoh,
+ stockmaster.decimalplaces
FROM stockcheckfreeze INNER JOIN stockmaster
ON stockcheckfreeze.stockid=stockmaster.stockid
INNER JOIN locations
Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/SelectSupplier.php 2012-12-15 03:01:20 UTC (rev 5759)
@@ -3,6 +3,11 @@
include ('includes/session.inc');
$title = _('Search Suppliers');
+
+/* webERP manual links before header.inc */
+$ViewTopic= 'AccountsPayable';
+$BookMark = 'SelectSupplier';
+
include ('includes/header.inc');
include ('includes/SQL_CommonFunctions.inc');
if (!isset($_SESSION['SupplierID'])) {
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/StockAdjustments.php 2012-12-15 03:01:20 UTC (rev 5759)
@@ -6,9 +6,11 @@
include('includes/DefineSerialItems.php');
include('includes/session.inc');
$title = _('Stock Adjustments');
+
/* webERP manual links before header.inc */
-$ViewTopic= "Inventory";
-$BookMark = "InventoryAdjustments";
+$ViewTopic= 'Inventory';
+$BookMark = 'InventoryAdjustments';
+
include('includes/header.inc');
include('includes/SQL_CommonFunctions.inc');
@@ -39,6 +41,7 @@
$StockID = trim(mb_strtoupper($_POST['StockID']));
}
}
+
if ($NewAdjustment==true){
$_SESSION['Adjustment' . $identifier]->StockID = trim(mb_strtoupper($StockID));
@@ -61,8 +64,8 @@
$_SESSION['Adjustment' . $identifier]->Quantity=0;
}
- $_SESSION['Adjustment' . $identifier]->PartUnit=$myrow['units'];
- $_SESSION['Adjustment' . $identifier]->StandardCost=$myrow['totalcost'];
+ $_SESSION['Adjustment' . $identifier]->PartUnit = $myrow['units'];
+ $_SESSION['Adjustment' . $identifier]->StandardCost = $myrow['totalcost'];
$DecimalPlaces = $myrow['decimalplaces'];
DB_free_result($result);
@@ -115,8 +118,8 @@
</tr>';
while ($myrow = DB_fetch_row($result)) {
echo '<tr>
- <td>'.$myrow[0].'</td>
- <td>'.$myrow[1].'</td>
+ <td>' . $myrow[0] . '</td>
+ <td>' . $myrow[1] . '</td>
<td><a href="StockAdjustments.php?StockID='.$myrow[0].'&Description='.$myrow[1].'">'._('Adjust').'</a>
</tr>';
}
@@ -276,7 +279,7 @@
- $SQL = "UPDATE locstock SET quantity = quantity + '" . $_SESSION['Adjustment' . $identifier]->Quantity . "'
+ $SQL = "UPDATE locstock SET quantity = quantity + " . cval$_SESSION['Adjustment' . $identifier]->Quantity . "
WHERE stockid='" . $_SESSION['Adjustment' . $identifier]->StockID . "'
AND loccode='" . $_SESSION['Adjustment' . $identifier]->StockLocation . "'";
@@ -305,8 +308,7 @@
'" . round($_SESSION['Adjustment' . $identifier]->StandardCost * -($_SESSION['Adjustment' . $identifier]->Quantity), $_SESSION['CompanyRecord']['decimalplaces']) . "',
'" . $_SESSION['Adjustment' . $identifier]->StockID . " x " . $_SESSION['Adjustment' . $identifier]->Quantity . " @ " .
$_SESSION['Adjustment' . $identifier]->StandardCost . " " . $_SESSION['Adjustment' . $identifier]->Narrative . "',
- '" . $_SESSION['Adjustment' . $identifier]->tag . "'
- )";
+ '" . $_SESSION['Adjustment' . $identifier]->tag . "')";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The general ledger transaction entries could not be added because');
$DbgMsg = _('The following SQL to insert the GL entries was used');
Modified: trunk/css/aguapop/default.css
===================================================================
--- trunk/css/aguapop/default.css 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/css/aguapop/default.css 2012-12-15 03:01:20 UTC (rev 5759)
@@ -9,234 +9,233 @@
*/
body {
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
-background: silver;
-margin:0;
-padding:0;
+ font-family:Arial, Verdana, Helvetica, sans-serif;
+ font-size:12px;
+ background: silver;
+ margin:0;
+ padding:0;
}
/* default styles */
a{
-color:blue;
-text-decoration:none;
+ color:blue;
+ text-decoration:none;
}
a:hover{
-color:red;
-text-decoration:underline;
+ color:red;
+ text-decoration:underline;
}
-a:active{
-}
+a:active{}
img{ /* icon on page title, etc */
-border:none;
-vertical-align:middle;
+ border:none;
+ vertical-align:middle;
}
p{ /* some text need to be centered */
/*text-align:center;*/
}
p.page_title_text { /* page title */
-color:black;
-font-weight:bold;
-margin:0 auto;
-padding:5px;
-text-align:center;
+ color:black;
+ font-weight:bold;
+ margin:0 auto;
+ padding:5px;
+ text-align:center;
}
p.good {
-font-weight: bold;
-color: green;
+ font-weight: bold;
+ color: green;
}
p.bad {
-font-weight: bold;
-color:red;
+ font-weight: bold;
+ color:red;
}
table {
-width:auto;
-max-width:90%;
-margin:5px auto;
-padding-bottom:5px;
+ width:auto;
+ max-width:90%;
+ margin:5px auto;
+ padding-bottom:5px;
}
table.selection {
-width:auto;
-max-width:90%;
+ width:auto;
+ max-width:90%;
/*padding-bottom:5px;*/
}
th {
-background-color:skyblue;
-color:black;
-font-weight:normal;
-padding:3px;
+ background-color:skyblue;
+ color:black;
+ font-weight:normal;
+ padding:3px;
}
th.number {
-text-align: right;
-font-weight: normal;
-background-color: skyblue;
-color: white;
+ text-align: right;
+ font-weight: normal;
+ background-color: skyblue;
+ color: white;
}
td {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-text-align: left;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ text-align: left;
}
td.select {
-background-color: whitesmoke;
-padding:3px;
+ background-color: whitesmoke;
+ padding:3px;
}
td.number {
-text-align: right;
+ text-align: right;
}
div.centre {
-padding:5px;
-text-align:center;
+ padding:5px;
+ text-align:center;
}
input { /*specifies the input field text characteristics*/
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 9px;
-font-style: italic;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 12px;
+ font-style: italic;
}
input.number{
-text-align: right;
+ text-align: right;
}
input.image {
-border-width: 0px;
-background-color: transparent;
+ border-width: 0px;
+ background-color: transparent;
}
input:hover{
-background:#9ffffb;
+ background:#9ffffb;
}
select {
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 11px;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size: 12px;
}
select:hover { /* drop down */
-background:#9ffffb;
+ background:#9ffffb;
}
textarea{
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-size: 10px;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-size:12px;
}
textarea:hover{
-background:#9ffffb;
+ background:#9ffffb;
}
.EvenTableRows {
-background-color: gainsboro;
+ background-color: gainsboro;
}
.OddTableRows {
-background-color: whitesmoke;
+ background-color: whitesmoke;
}
div{ /* some input/buttons need to be centered */
}
div.error {
-background-color: mistyrose;
-width: 98%;
-margin: 5px auto;
-color: red;
-border: 1px solid red;
+ background-color: mistyrose;
+ width: 98%;
+ margin: 5px auto;
+ color: red;
+ border: 1px solid red;
}
div.warn {
-background-color: pink;
-width: 98%;
-margin: 5px auto;
-color: maroon;
-border: 1px solid maroon;
+ background-color: pink;
+ width: 98%;
+ margin: 5px auto;
+ color: maroon;
+ border: 1px solid maroon;
}
div.success {
-background-color: aquamarine;
-width: 98%;
-margin: 5px auto;
-color: green;
-border: 1px solid green;
+ background-color: aquamarine;
+ width: 98%;
+ margin: 5px auto;
+ color: green;
+ border: 1px solid green;
}
div.info {
-background-color: lightskyblue;
-width: 98%;
-margin: 5px auto;
-color:navy;
-border: 1px solid navy;
+ background-color: lightskyblue;
+ width: 98%;
+ margin: 5px auto;
+ color:navy;
+ border: 1px solid navy;
}
DIV.page_help_text {
-background: lightgrey url(images/help.png) top left no-repeat;
-border: maroon 1px solid;
-padding-top:2px;
-padding-bottom: 2px;
-z-index: 1;
-width: 80%;
-float: none;
-visibility: visible;
-margin: 0 auto;
-position: static;
-font-family: Arial, Verdana, Helvetica, sans-serif;
-font-weight: normal;
-font-size: 10px;
-color: black;
-text-align:center;
-padding-left: 24px;
-min-height:26px;
+ background: lightgrey url(images/help.png) top left no-repeat;
+ border: maroon 1px solid;
+ padding-top:2px;
+ padding-bottom: 2px;
+ z-index: 1;
+ width: 80%;
+ float: none;
+ visibility: visible;
+ margin: 0 auto;
+ position: static;
+ font-family: Arial, Verdana, Helvetica, sans-serif;
+ font-weight: normal;
+ font-size: 12px;
+ color: black;
+ text-align:center;
+ padding-left: 24px;
+ min-height:26px;
}
/* date picker */
.dpTbl {
- border: solid navy 1px;
- background:white;
+ border: solid navy 1px;
+ background:white;
}
.dpTD {
-border: 0;
-width: 20px;
-background-color: whitesmoke;
-text-align: right;
-cursor: pointer;
+ border: 0;
+ width: 20px;
+ background-color: whitesmoke;
+ text-align: right;
+ cursor: pointer;
}
.dpDayHighlight {
-border: 0;
-width: 20px;
-background-color: yellow;
-text-align: right;
-cursor: pointer;
+ border: 0;
+ width: 20px;
+ background-color: yellow;
+ text-align: right;
+ cursor: pointer;
}
.dpTDHover {
-border: 0;
-width: 20px;
-background-color: gainsboro;
-text-align: right;
-cursor: pointer;
+ border: 0;
+ width: 20px;
+ background-color: gainsboro;
+ text-align: right;
+ cursor: pointer;
}
/* Table type is used for UI tables type 1 */
.table1 {
-width:90%;
-background: whitesmoke;
-border: 1px solid darkslategray;
-margin: 0 auto;
+ width:90%;
+ background: whitesmoke;
+ border: 1px solid darkslategray;
+ margin: 0 auto;
}
.tableheader {
-font-weight: normal;
-background-color: skyblue;
-color: white;
+ font-weight: normal;
+ background-color: skyblue;
+ color: white;
}
.notavailable {
-font-weight: lighter;
-font-style: italic;
-color: gray;
+ font-weight: lighter;
+ font-style: italic;
+ color: gray;
}
.label {
-font-weight: bold;
-font-style: normal;
-font-size: 11px;
-color: black;
-background-color: gainsboro;
+ font-weight: bold;
+ font-style: normal;
+ font-size: 12px;
+ color: black;
+ background-color: gainsboro;
}
.table_index {
-background-color: aliceblue;
+ background-color: aliceblue;
}
li {
/*list-style-image: url(bullet.gif);*/
@@ -245,30 +244,30 @@
/* CANVAS */
#CanvasDiv {
-background:steelblue;
-border-radius:20px;
-box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
-margin:10px;
+ background:steelblue;
+ border-radius:20px;
+ box-shadow:3px 3px 4px #86C3D7 inset, -3px -3px 4px #383878 inset, 0 0 10px black;
+ margin:10px;
}
/* HEADER */
#HeaderDiv {
-overflow:hidden;
-color:white;
-padding:5px 10px 0;
+ overflow:hidden;
+ color:white;
+ padding:5px 10px 0;
}
#HeaderDiv a{
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
+ border-radius:10px;
+ color:white;
+ text-decoration:none;
+ padding:3px;
}
#HeaderDiv a:hover{
-color:cyan;
-border-radius:10px;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
-padding:3px;
+ color:cyan;
+ border-radius:10px;
+ box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+ padding:3px;
}
#HeaderWrapDiv{
}
@@ -276,188 +275,187 @@
/* HEADER - APP INFO */
#AppInfoDiv{
-float:left; /* REQUIRED: to the left */
+ float:left; /* REQUIRED: to the left */
}
#AppInfoCompanyDiv{
-display:table-cell; /* REQUIRED: as a cell */
+ display:table-cell; /* REQUIRED: as a cell */
}
#AppInfoUserDiv{
-display:table-cell; /* REQUIRED: as a cell */
-padding-left:5px;
+ display:table-cell; /* REQUIRED: as a cell */
+ padding-left:5px;
}
#AppInfoModuleDiv{
-font-weight:bold;
-font-size:12px;
-padding:3px;
+ font-weight:bold;
+ font-size:12px;
+ padding:3px;
}
/* HEADER - QUICK MENU */
#QuickMenuDiv{
-float:right;
-margin-top:7px;
+ float:right;
+ margin-top:7px;
}
#QuickMenuDiv ul{
-list-style:none;
-float:right;
+ list-style:none;
+ float:right;
}
#QuickMenuDiv ul li{
-float: left;
-display:inline;
-margin: 0px 3px;
+ float: left;
+ display:inline;
+ margin: 0px 3px;
}
/* BODY */
#BodyDiv {
-clear:both;
-overflow:hidden;
-text-align:center; /* needed to center some buttons on SelectSupplier.php */
+ clear:both;
+ overflow:hidden;
+ text-align:center; /* needed to center some buttons on SelectSupplier.php */
}
#BodyWrapDiv{
-background:lightsteelblue;
-box-shadow:2px 2px 3px inset;
-margin:0 5px;
+ background:lightsteelblue;
+ box-shadow:2px 2px 3px inset;
+ margin:0 5px;
}
/* BODY - MAIN MENU */
#MainMenuDiv{
-float:left;
-background:steelblue;
-white-space:nowrap;
-text-align:center;
-padding-left:3px;
-padding-top:3px;
-width:11%;
+ float:left;
+ background:steelblue;
+ white-space:nowrap;
+ text-align:center;
+ padding-left:3px;
+ padding-top:3px;
+ width:11%;
}
#MainMenuDiv ul{
-margin:0;
-padding:0;
+ margin:0;
+ padding:0;
}
#MainMenuDiv li{
-list-style:none;
+ list-style:none;
}
#MainMenuDiv li a,
#MainMenuDiv li a:hover,
#MainMenuDiv .main_menu_selected a{
-display:block; /* REQUIRED */
-border-radius:10px;
-color:white;
-text-decoration:none;
-padding:3px;
-margin-bottom:5px;
+ display:block; /* REQUIRED */
+ border-radius:10px;
+ color:white;
+ text-decoration:none;
+ padding:3px;
+ margin-bottom:5px;
}
#MainMenuDiv li a:hover{
-color:cyan;
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+ color:cyan;
+ box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
#MainMenuDiv .main_menu_selected a{ /* the selected button */
-box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
+ box-shadow:2px 2px 3px #86C3D7, -2px -2px 3px #383878;
}
/* BODY - SUB MENU */
#SubMenuDiv{
-display:table; /* display as table, sub menu will auto adjust width */
-float:right;
-overflow: hidden;
-margin-left:auto;
-margin-right:auto;
-width:88%; /* main menu is 10% */
-text-align:left;
+ display:table; /* display as table, sub menu will auto adjust width */
+ float:right;
+ overflow: hidden;
+ margin-left:auto;
+ margin-right:auto;
+ width:88%; /* main menu is 10% */
+ text-align:left;
}
#SubMenuDiv ul{
-margin:0;
-padding:0;
+ margin:0;
+ padding:0;
}
#SubMenuDiv li{
-list-style:none; /* REQUIRED: hide bullets */
+ list-style:none; /* REQUIRED: hide bullets */
}
#SubMenuDiv p{
}
#SubMenuDiv a{
-color:black;
-text-decoration:none;
+ color:black;
+ text-decoration:none;
}
#SubMenuDiv a:hover{
-color:black;
-text-decoration:underline;
+ color:black;
+ text-decoration:underline;
}
.menu_group_headers {
-background:steelblue;
-border:2px outset white;
-color:white;
-font-weight:bold;
-text-align:center;
-padding:3px;
+ background:steelblue;
+ border:2px outset white;
+ color:white;
+ font-weight:bold;
+ text-align:center;
+ padding:3px;
}
.menu_group_item {
-padding:2px;
-text-align:left;
+ padding:2px;
+ text-align:left;
}
.menu_group_item:hover{
-background:lightblue;
-text-align:left;
+ background:lightblue;
+ text-align:left;
}
.menu_group_item p { /* bullet */
-color: red; /* 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: -10px; /* this makes the bullet to appear as the li tag previously used */
-margin: 0 0 0 12px;
-text-align:left;
+ color: red; /* 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: -10px; /* this makes the bullet to appear as the li tag previously used */
+ margin: 0 0 0 12px;
+ text-align:left;
}
.menu_group_item a{
-color:black;
-text-decoration:none;
+ color:black;
+ text-decoration:none;
}
.menu_group_item a:hover{
-color:red;
-text-decoration:none;
+ color:red;
+ text-decoration:none;
}
#TransactionsDiv,#InquiriesDiv,#MaintenanceDiv{
-background:whitesmoke;
-border:2px solid steelblue;
-display:table-cell;
+ background:whitesmoke;
+ border:2px solid steelblue;
+ display:table-cell;
}
#InquiriesDiv div{ /* to center custom report/form header */
-background:lightsteelblue;
-font-weight:bold;
-color:black;
-padding:2px;
+ background:lightsteelblue;
+ font-weight:bold;
+ color:black;
+ padding:2px;
}
/*** FOOTER ***/
#FooterDiv{
-clear:both;
-color:white;
-height:53px;
-padding:0;
+ clear:both;
+ color:white;
+ height:53px;
+ padding:0;
}
#FooterWrapDiv{
-padding:5px;
+ padding:5px;
}
#FooterLogoDiv{
-background:white;
-border:2px outset steelblue;
-border-radius:8px 8px 8px 8px;
-float:left;
-padding:3px;
+ background:white;
+ border:2px outset steelblue;
+ border-radius:8px 8px 8px 8px;
+ float:left;
+ padding:3px;
}
#FooterVersionDiv{
-float:left;
-margin-left:10px;
-margin-top:15px;
-
+ float:left;
+ margin-left:10px;
+ margin-top:15px;
}
#FooterTimeDiv{
-float:right;
-margin-top:15px;
+ float:right;
+ margin-top:15px;
}
/**** END ***/
\ No newline at end of file
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-12-12 09:17:12 UTC (rev 5758)
+++ trunk/css/default/default.css 2012-12-15 03:01:20 UTC (rev 5759)
@@ -7,7 +7,7 @@
body{
background-color:#ccd;
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
+font-size:10pt;
margin:0;
padding:0
}
@@ -61,8 +61,6 @@
color:white;
}
td{
-font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
text-align:left;
}
td.select{
@@ -78,7 +76,6 @@
}
input{
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
}
input.number{
text-align:right;
@@ -91,11 +88,9 @@
}
select{
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
}
textarea{
font-family:Arial, Verdana, Helvetica, sans-serif;
-font-size:10px;
}
textarea:hover{
}
@@ -139,7 +134,6 @@
POSITION:static;
font-family:Arial, Verdana, Helvetica, sans-serif;
font-weight:normal;
-font-size:10px;
color:black;
TEXT-ALIGN:center;
}
@@ -157,7 +151,6 @@
padding-top:1px;
padding-bottom:1px;
font-weight:normal;
-font-size:10px;
color:blac |
