Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5054] trunk
|
From: <dai...@us...> - 2012-03-08 05:47:59
|
Revision: 5054
http://web-erp.svn.sourceforge.net/web-erp/?rev=5054&view=rev
Author: daintree
Date: 2012-03-08 05:47:53 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
Ricards changes for product image
Modified Paths:
--------------
trunk/SelectProduct.php
trunk/SystemParameters.php
trunk/doc/Change.log
trunk/doc/README.txt
Modified: trunk/SelectProduct.php
===================================================================
--- trunk/SelectProduct.php 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/SelectProduct.php 2012-03-08 05:47:53 UTC (rev 5054)
@@ -411,9 +411,7 @@
if ($Its_A_Kitset_Assembly_Or_Dummy == False) {
echo '<a href="' . $rootpath . '/PO_SelectOSPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Outstanding Purchase Orders') . '</a><br />';
echo '<a href="' . $rootpath . '/PO_SelectPurchOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search All Purchase Orders') . '</a><br />';
- if (file_exists($_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg')){
- echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture') . '</a><br />';
- }
+ echo '<a href="' . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $StockID . '.jpg">' . _('Show Part Picture (if available)') . '</a><br />';
}
if ($Its_A_Dummy == False) {
echo '<a href="' . $rootpath . '/BOMInquiry.php?StockID=' . $StockID . '">' . _('View Costed Bill Of Material') . '</a><br />';
@@ -430,7 +428,11 @@
echo '<a href="' . $rootpath . '/StockTransfers.php?StockID=' . $StockID . '&NewTransfer=true">' . _('Location Transfers') . '</a><br />';
//show the item image if it has been uploaded
if( isset($StockID) AND file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&StockID=' . $StockID . '&text=' . $StockID . '&width=120&height=120" />';
+ if ($_SESSION['ShowStockidOnImages'] == "0"){
+ echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&width=120&height=120&StockID=' . $StockID . '&text=""' . '" />';
+ }else{
+ echo '<div class="centre"><img src="' . $rootpath . '/GetStockImage.php?automake=1&textcolor=FFFFF0&bgcolor=007F00&StockID=' . $StockID . '&text=' . $StockID . '&width=120&height=120" />';
+ }
}
if (($myrow['mbflag'] == 'B')
AND (in_array($SuppliersSecurity, $_SESSION['AllowedPageSecurityTokens']))
Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/SystemParameters.php 2012-03-08 05:47:53 UTC (rev 5054)
@@ -193,6 +193,9 @@
if ($_SESSION['MaxImageSize'] != $_POST['X_MaxImageSize'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_MaxImageSize']."' WHERE confname = 'MaxImageSize'";
}
+ if ($_SESSION['ShowStockidOnImages'] != $_POST['X_ShowStockidOnImages'] ) {
+ $sql[] = "UPDATE config SET confvalue = '".$_POST['X_ShowStockidOnImages']."' WHERE confname = 'ShowStockidOnImages'";
+ }
//new number must be shown
if ($_SESSION['NumberOfMonthMustBeShown'] != $_POST['X_NumberOfMonthMustBeShown'] ) {
$sql[] = "UPDATE config SET confvalue = '".$_POST['X_NumberOfMonthMustBeShown']."' WHERE confname = 'NumberOfMonthMustBeShown'";
@@ -701,16 +704,29 @@
</tr>';
//DefaultDisplayRecordsMax
-echo '<tr style="outline: 1px solid"><td>' . _('Default Maximum Number of Records to Show') . ':</td>
- <td><input type="text" class="number" name="X_DefaultDisplayRecordsMax" size="4" maxlength="3" value="' . $_SESSION['DefaultDisplayRecordsMax'] . '" /></td>
- <td>' . _('When pages have code to limit the number of returned records - such as select customer, select supplier and select item, then this will be the default number of records to show for a user who has not changed this for themselves in user settings.') . '</td>
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Default Maximum Number of Records to Show') . ':</td>
+ <td><input type="text" class="number" name="X_DefaultDisplayRecordsMax" size="4" maxlength="3" value="' . $_SESSION['DefaultDisplayRecordsMax'] . '" /></td>
+ <td>' . _('When pages have code to limit the number of returned records - such as select customer, select supplier and select item, then this will be the default number of records to show for a user who has not changed this for themselves in user settings.') . '</td>
</tr>';
+// ShowStockidOnImage
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Show Stockid on images') . ':</td>
+ <td><select name="X_ShowStockidOnImages">
+ <option '.($_SESSION['ShowStockidOnImages'] ?'selected ':'').'value="1">'._('Yes').'</option>
+ <option '.(!$_SESSION['ShowStockidOnImages'] ?'selected ':'').'value="0">'._('No').'</option>
+ </select></td>
+ <td>' . _('Show the code inside the thumbnail image of the items') . '</td>
+ </tr>';
+
+
//MaxImageSize
-echo '<tr style="outline: 1px solid"><td>' . _('Maximum Size in KB of uploaded images') . ':</td>
- <td><input type="text" class="number" name="X_MaxImageSize" size="4" maxlength="3" value="' . $_SESSION['MaxImageSize'] . '" /></td>
- <td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
-</tr>';
+echo '<tr style="outline: 1px solid">
+ <td>' . _('Maximum Size in KB of uploaded images') . ':</td>
+ <td><input type="text" class="number" name="X_MaxImageSize" size="4" maxlength="3" value="' . $_SESSION['MaxImageSize'] . '" /></td>
+ <td>' . _('Picture files of items can be uploaded to the server. The system will check that files uploaded are less than this size (in KB) before they will be allowed to be uploaded. Large pictures will make the system slow and will be difficult to view in the stock maintenance screen.') .'</td>
+ </tr>';
//NumberOfMonthMustBeShown
$sql = "SELECT confvalue
FROM `config`
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/doc/Change.log 2012-03-08 05:47:53 UTC (rev 5054)
@@ -1,9 +1,11 @@
webERP Change Log
+
+8/3/12 Ricard: Added parameter for show stock image on select product screen - SelectProduct.php and SystemParameters.php
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustmentsControlled.php. Reported by Soujiro
7/3/2012 Exson: Fixed that serialised items cannot be processed in StockAdjustments.php. Reported by Soujiro
-6/3/2012 Exson: Rule out 'Pending' status PO from On Order Quantity in ReorderLevel.php Suggested by Brian May
-6/3/2012 Exson: Remove carriage return and feed line from Quotation PDF file in PDFQuotation.php Reported by Thomas_lie
-03/06/2012 Exson: add condition to prevent blank stock category description in StockCategories.php
+6/3/12 Exson: Rule out 'Pending' status PO from On Order Quantity in ReorderLevel.php Suggested by Brian May
+6/3/12 Exson: Remove carriage return and feed line from Quotation PDF file in PDFQuotation.php Reported by Thomas_lie
+03/06/12 Exson: add condition to prevent blank stock category description in StockCategories.php
6/3/12 Exson: BankMatching.php sql error due to extra single quotation. Reported by PakRichard
5/3/12 Exson/Tim: PrintCustTransPortrait.php html elements failed to display. Reported by rfthomas
3/3/12 Phil: SelectProduct.php checked for existence of part pic before displaying a link that could potnetially fail
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2012-03-07 23:06:32 UTC (rev 5053)
+++ trunk/doc/README.txt 2012-03-08 05:47:53 UTC (rev 5054)
@@ -53,13 +53,10 @@
LEGAL
-This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; version 2 of the License.
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
-This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+A copy of the GNU General Public License is included in the doc directory along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-Copyright weberp.org 2011 - Contact: in...@we...
\ No newline at end of file
+Copyright weberp.org 2003-2012 - Contact: in...@we...
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
