Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5534] trunk
|
From: <dai...@us...> - 2012-07-24 09:26:08
|
Revision: 5534
http://web-erp.svn.sourceforge.net/web-erp/?rev=5534&view=rev
Author: daintree
Date: 2012-07-24 09:26:01 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/SupplierInvoice.php
trunk/css/default/default.css
trunk/css/fresh/default.css
trunk/css/gel/default.css
trunk/css/jelly/default.css
trunk/css/professional/default.css
trunk/css/professional-rtl/default.css
trunk/css/silverwolf/default.css
trunk/doc/Change.log
trunk/includes/footer.inc
trunk/includes/header.inc
trunk/index.php
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/SelectProduct.php 2012-07-24 09:26:01 UTC (rev 5534)
@@ -317,7 +317,7 @@
FROM salesorderdetails INNER JOIN salesorders
ON salesorders.orderno = salesorderdetails.orderno
INNER JOIN bom ON salesorderdetails.stkcode=bom.parent
- INNER JOIN stockmaster stockmaster.stockid=bom.parent
+ INNER JOIN stockmaster ON stockmaster.stockid=bom.parent
WHERE salesorderdetails.quantity-salesorderdetails.qtyinvoiced > 0
AND bom.component='" . $StockID . "'
AND stockmaster.mbflag='A'
Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/SupplierInvoice.php 2012-07-24 09:26:01 UTC (rev 5534)
@@ -1235,8 +1235,7 @@
$sql ="SELECT quantity
FROM locstock
- WHERE loccode='" . $LocCode . "'
- AND stockid='" . $EnteredGRN->ItemCode . "'";
+ WHERE stockid='" . $EnteredGRN->ItemCode . "'";
$ErrMsg = _('CRITICAL ERROR') . '! ' . _('NOTE DOWN THIS ERROR AND SEEK ASSISTANCE') . ': ' . _('The quantity on hand could not be retrieved from the database');
$DbgMsg = _('The following SQL to retrieve the total stock quantity was used');
$Result = DB_query($sql, $db, $ErrMsg, $DbgMsg);
Modified: trunk/css/default/default.css
===================================================================
--- trunk/css/default/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/default/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -41,7 +41,6 @@
table {
background-color: #587BA6;
margin: 0 auto;
- width: 100%;
}
.dpTbl {
Modified: trunk/css/fresh/default.css
===================================================================
--- trunk/css/fresh/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/fresh/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -49,7 +49,6 @@
table {
background-color: #ffffff;
margin: 0 auto;
- width: 95%;
}
.dpTbl {
Modified: trunk/css/gel/default.css
===================================================================
--- trunk/css/gel/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/gel/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -70,7 +70,6 @@
border: 0px 0px 2px 2px #222 solid;
background: #eee;
margin: 0 auto;
- width: 95%;
}
.dpTbl {
Modified: trunk/css/jelly/default.css
===================================================================
--- trunk/css/jelly/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/jelly/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -52,7 +52,6 @@
background: #eee;
border: 0px 0px 2px 2px #222 solid;
margin: 0 auto;
- width: 95%;
}
.dpTbl {
Modified: trunk/css/professional/default.css
===================================================================
--- trunk/css/professional/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/professional/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -49,7 +49,6 @@
table {
background-color: #EEEEFF;
margin: 0 auto;
- width: 95%;
}
.dpTbl {
Modified: trunk/css/professional-rtl/default.css
===================================================================
--- trunk/css/professional-rtl/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/professional-rtl/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -51,7 +51,6 @@
table {
background-color: #EEEEFF;
margin: 0 auto;
- width: 95%;
}
.dpTbl {
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/css/silverwolf/default.css 2012-07-24 09:26:01 UTC (rev 5534)
@@ -55,7 +55,7 @@
table {
background-color: #fff;
- width: 100%;
+ margin: 0 auto;
}
th {
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/doc/Change.log 2012-07-24 09:26:01 UTC (rev 5534)
@@ -1,5 +1,7 @@
webERP Change Log
+24/7/2012 Exson/Phil: SupplierInvoice.php incorrect calculation of weighted average cost just using the stock quantity at a single location, now corrected
+24/7/2012 Phil: includes/Z_POSDataCreation.php - added system default date format config to POS data upload file
22/7/2012 Phil/Bob Thomas: Fix all scripts where demand was calculated including salesorder quotations (to exclude quotations). CounterSales.php DeliveryDetails.php SelectOrderItems.php StockCheck.php StockLocStatus.php
22/7/2012 Phil: Fixed on order quantities to exclude purchase orders with status completed and cancelled CounterSales.php SelectOrderItems.php DeliveryDetails.php StockLocStatus.php
21/7/2012 Hindra: Fix Aguapop theme and table and div nesting of index.php header.inc and footer.inc - and other themes table style width: 95%;
Modified: trunk/includes/footer.inc
===================================================================
--- trunk/includes/footer.inc 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/includes/footer.inc 2012-07-24 09:26:01 UTC (rev 5534)
@@ -1,29 +1,20 @@
<?php
/* $Id$*/
-echo '</div>'; //end of BODY div
-echo '<div id="FooterDiv">'; //start of FOOTER div
-echo '<table class="FooterTbl">';
-echo '<tr>';
-echo '<td style="width:33%"></td><td class="footer">';
-echo '<img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" /></td>';
-echo '<td class="footer" style="text-align: right;width:33%">'. DisplayDateTime() .'</td>';
-
-echo '</tr>';
-echo '<tr><td colspan="3" class="footer">webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . '</td></tr>';
-
-// if(http_file_exists('http://sflogo.sourceforge.net/sflogo.php')) {
-// echo '<tr><td class="footer"><a href="https://sourceforge.net/projects/web-erp"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=391629&type=12" width="120" height="30" border="0" alt="Get webERP web-based ERP Accounting at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></td></tr>';
-// }
-
-echo '</table>';
-
-echo '</div>'; //end of FOOTER div
-
-echo '</div>'; //end of CANVAS div
-
-echo '</body>
+echo '<table width="100%" id="footer">
+ <tr>
+ <td style="width:33%"></td><td class="footer">
+ <img src="'. $rootpath . '/' . $_SESSION['LogoFile'] . '" width="120" alt="webERP" title="webERP ' . _('Copyright') . ' © weberp.org - ' . date('Y') . '" />
+ </td>
+ <td class="footer" style="text-align: right;width:33%">'. DisplayDateTime() .'</td>
+ </tr>
+ <tr>
+ <td colspan="3" class="footer">webERP ' ._('version') .' ' . $_SESSION['VersionNumber'] . '</td>
+ </tr>
+ </table>
+ </div>
+ </body>
</html>';
?>
Modified: trunk/includes/header.inc
===================================================================
--- trunk/includes/header.inc 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/includes/header.inc 2012-07-24 09:26:01 UTC (rev 5534)
@@ -42,10 +42,8 @@
echo '<body>';
- echo '<div id="CanvasDiv">'; //start of CANVAS div
- echo '<div id="HeaderDiv">'; //start of HEADER div
-
- echo '<table class="HeaderTbl">';
+ echo '<div id="canvas">';
+ echo '<table class="callout_main" cellpadding="0" cellspacing="0">';
echo '<tr>';
echo '<td colspan="2" rowspan="2">';
@@ -93,6 +91,5 @@
echo '</td>';
echo '</tr>';
echo '</table>';
-echo '</div>'; //end of HEADER div
-echo '<div id="BodyDiv">'; //start of BODY div - contains left menu, three columns menu, forms, data, etc
-?>
+
+?>
\ No newline at end of file
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2012-07-24 09:21:47 UTC (rev 5533)
+++ trunk/index.php 2012-07-24 09:26:01 UTC (rev 5534)
@@ -49,12 +49,12 @@
include('includes/footer.inc');
exit;
}
-echo 'x'.$PathPrefix.'x';
+
if (isset($_GET['Application'])){ /*This is sent by this page (to itself) when the user clicks on a tab */
$_SESSION['Module'] = $_GET['Application'];
}
-echo '<table class="BodyTbl">
+echo '<table width="99%">
<tr>
<td style="width:10%" valign="top">';
echo '<table class="main_menu" width="100%" cellspacing="0" cellpadding="0" border="0">';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
