Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3605] trunk
|
From: <tim...@us...> - 2010-07-11 20:59:16
|
Revision: 3605
http://web-erp.svn.sourceforge.net/web-erp/?rev=3605&view=rev
Author: tim_schofield
Date: 2010-07-11 20:59:10 +0000 (Sun, 11 Jul 2010)
Log Message:
-----------
Layout changes, sql quoting fixed
Modified Paths:
--------------
trunk/InventoryPlanning.php
trunk/doc/Change.log.html
trunk/includes/PDFInventoryPlanPageHeader.inc
Modified: trunk/InventoryPlanning.php
===================================================================
--- trunk/InventoryPlanning.php 2010-07-11 16:58:19 UTC (rev 3604)
+++ trunk/InventoryPlanning.php 2010-07-11 20:59:10 UTC (rev 3605)
@@ -144,23 +144,23 @@
if ($_POST['Location']=='All'){
- $SQL = "SELECT SUM(CASE WHEN prd=" . $CurrentPeriod . " THEN -qty ELSE 0 END) AS prd0,
- SUM(CASE WHEN prd=" . $Period_1 . " THEN -qty ELSE 0 END) AS prd1,
- SUM(CASE WHEN prd=" . $Period_2 . " THEN -qty ELSE 0 END) AS prd2,
- SUM(CASE WHEN prd=" . $Period_3 . " THEN -qty ELSE 0 END) AS prd3,
- SUM(CASE WHEN prd=" . $Period_4 . " THEN -qty ELSE 0 END) AS prd4,
- SUM(CASE WHEN prd=" . $Period_5 . " THEN -qty ELSE 0 END) AS prd5
+ $SQL = "SELECT SUM(CASE WHEN prd='" . $CurrentPeriod . "' THEN -qty ELSE 0 END) AS prd0,
+ SUM(CASE WHEN prd='" . $Period_1 . "' THEN -qty ELSE 0 END) AS prd1,
+ SUM(CASE WHEN prd='" . $Period_2 . "' THEN -qty ELSE 0 END) AS prd2,
+ SUM(CASE WHEN prd='" . $Period_3 . "' THEN -qty ELSE 0 END) AS prd3,
+ SUM(CASE WHEN prd='" . $Period_4 . "' THEN -qty ELSE 0 END) AS prd4,
+ SUM(CASE WHEN prd='" . $Period_5 . "' THEN -qty ELSE 0 END) AS prd5
FROM stockmoves
WHERE stockid='" . $InventoryPlan['stockid'] . "'
AND (type=10 OR type=11)
AND stockmoves.hidemovt=0";
} else {
- $SQL = "SELECT SUM(CASE WHEN prd=" . $CurrentPeriod . " THEN -qty ELSE 0 END) AS prd0,
- SUM(CASE WHEN prd=" . $Period_1 . " THEN -qty ELSE 0 END) AS prd1,
- SUM(CASE WHEN prd=" . $Period_2 . " THEN -qty ELSE 0 END) AS prd2,
- SUM(CASE WHEN prd=" . $Period_3 . " THEN -qty ELSE 0 END) AS prd3,
- SUM(CASE WHEN prd=" . $Period_4 . " THEN -qty ELSE 0 END) AS prd4,
- SUM(CASE WHEN prd=" . $Period_5 . " THEN -qty ELSE 0 END) AS prd5
+ $SQL = "SELECT SUM(CASE WHEN prd='" . $CurrentPeriod . "' THEN -qty ELSE 0 END) AS prd0,
+ SUM(CASE WHEN prd='" . $Period_1 . "' THEN -qty ELSE 0 END) AS prd1,
+ SUM(CASE WHEN prd='" . $Period_2 . "' THEN -qty ELSE 0 END) AS prd2,
+ SUM(CASE WHEN prd='" . $Period_3 . "' THEN -qty ELSE 0 END) AS prd3,
+ SUM(CASE WHEN prd='" . $Period_4 . "' THEN -qty ELSE 0 END) AS prd4,
+ SUM(CASE WHEN prd='" . $Period_5 . "' THEN -qty ELSE 0 END) AS prd5
FROM stockmoves
WHERE stockid='" . $InventoryPlan['stockid'] . "'
AND stockmoves.loccode ='" . $_POST['Location'] . "'
@@ -362,12 +362,13 @@
$title=_('Inventory Planning Reporting');
include('includes/header.inc');
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'<br>';
- if (strlen($_POST['FromCriteria'])<1 || strlen($_POST['ToCriteria'])<1) {
+ if (empty($_POST['FromCriteria']) or empty($_POST['ToCriteria'])) {
/*if $FromCriteria is not set then show a form to allow input */
- echo "<form action='" . $_SERVER['PHP_SELF'] . '?' . SID . "' method='POST'><table>";
+ echo "<form action='" . $_SERVER['PHP_SELF'] . '?' . SID . "' method='POST'><table class=selection>";
echo '<tr>
<td>' . _('From Inventory Category Code') . ':</font></td>
@@ -428,10 +429,10 @@
</td>
</tr>';
- echo "</table><div class='centre'><input type=Submit Name='PrintPDF' Value='" . _('Print PDF') . "'></div>";
+ echo "</table><br><div class='centre'><input type=Submit Name='PrintPDF' Value='" . _('Print PDF') . "'></div>";
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-07-11 16:58:19 UTC (rev 3604)
+++ trunk/doc/Change.log.html 2010-07-11 20:59:10 UTC (rev 3605)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>11/07/10 Tim: InventoryPlanning.php - Layout changes, sql quoting fixed</p>
<p>11/07/10 Tim: Goods Receiving - Fix conversion factor bug, layout changes, sql quoting fixed</p>
<p>11/07/10 Tim: DefineCartClass.php - Fix typo in variable declaration</p>
<p>10/07/10 Tim: StockTransfers - Bug fixes, correctly round the decimal places, fix sql quoting errors and layout changes</p>
Modified: trunk/includes/PDFInventoryPlanPageHeader.inc
===================================================================
--- trunk/includes/PDFInventoryPlanPageHeader.inc 2010-07-11 16:58:19 UTC (rev 3604)
+++ trunk/includes/PDFInventoryPlanPageHeader.inc 2010-07-11 20:59:10 UTC (rev 3605)
@@ -16,7 +16,7 @@
$FontSize=10;
-if ($_POST['SupplierID']=="0"){ //no supplier selected its a stock category report
+if (isset($_POST['SupplierID']) and $_POST['SupplierID']=="0"){ //no supplier selected its a stock category report
$ReportTitle = _('Inventory Planning for Categories Between') . ' ' . $_POST['FromCriteria'] . ' ' . _('and') . ' ' . $_POST['ToCriteria'];
} else { //supplier selected its just planning for products from the supplier
$ReportTitle = _('Inventory Planning for Products Category') . ' ' . $_POST['FromCriteria'];
@@ -57,12 +57,12 @@
$LeftOvers = $pdf->addTextWrap(471,$YPos,40,$FontSize,$Period_0_Name . ' ' . _('MTD'),'centre');
$stat=$_POST['NumberMonthsHolding'];
- if ($_POST['NumberMonthsHolding']>10){
+ if ($_POST['NumberMonthsHolding']>10){
$NumberMonthsHolding=$_POST['NumberMonthsHolding']-10;
}
- else{
- $NumberMonthsHolding=$_POST['NumberMonthsHolding'];
-
+ else{
+ $NumberMonthsHolding=$_POST['NumberMonthsHolding'];
+
}
$LeftOvers = $pdf->addTextWrap(512,$YPos,40,$FontSize,$NumberMonthsHolding . ' ' . _('ms stk'),'centre');
$LeftOvers = $pdf->addTextWrap(617,$YPos,40,$FontSize,_('QOH'),'centre');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
