Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4625] trunk
|
From: <dai...@us...> - 2011-07-06 09:30:53
|
Revision: 4625
http://web-erp.svn.sourceforge.net/web-erp/?rev=4625&view=rev
Author: daintree
Date: 2011-07-06 09:30:42 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
various
Modified Paths:
--------------
trunk/GeocodeSetup.php
trunk/GetStockImage.php
trunk/MRPShortages.php
trunk/PDFStockTransfer.php
trunk/ShipmentCosting.php
trunk/Z_CheckDebtorsControl.php
trunk/api/api_session.inc
trunk/api/api_xml-rpc.php
trunk/doc/Change.log
trunk/geo_displaymap_customers.php
trunk/geo_displaymap_suppliers.php
trunk/includes/session.inc
trunk/index.php
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
Modified: trunk/GeocodeSetup.php
===================================================================
--- trunk/GeocodeSetup.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/GeocodeSetup.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -29,14 +29,14 @@
//first off validate inputs are sensible
$sql="SELECT count(geocodeid)
- FROM geocode_param WHERE geocodeid='".$_POST['geocodeid']."'";
+ FROM geocode_param WHERE geocodeid='".$_POST['GeoCodeID']."'";
$result=DB_query($sql, $db);
$myrow=DB_fetch_row($result);
if ($myrow[0]!=0 and !isset($SelectedParam)) {
$InputError = 1;
prnMsg( _('That geocode ID already exists in the database'),'error');
- $Errors[$i] = 'geocodeid';
+ $Errors[$i] = 'GeoCodeID';
$i++;
}
@@ -46,14 +46,14 @@
/*SelectedParam 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*/
- if (isset($_POST['geocode_key']) and isset($_POST['geocode_key']) ){
+ if (isset($_POST['GeoCode_Key']) and isset($_POST['GeoCode_Key']) ){
$sql = "UPDATE geocode_param SET
- geocode_key='" . $_POST['geocode_key'] . "',
- center_long='" . $_POST['center_long'] . "',
- center_lat='" . $_POST['center_lat'] . "',
- map_height='" . $_POST['map_height'] . "',
- map_width='" . $_POST['map_width'] . "',
- map_host='" . $_POST['map_host'] . "'
+ geocode_key='" . $_POST['GeoCode_Key'] . "',
+ center_long='" . $_POST['Center_Long'] . "',
+ center_lat='" . $_POST['Center_Lat'] . "',
+ map_height='" . $_POST['Map_Height'] . "',
+ map_width='" . $_POST['Map_Width'] . "',
+ map_host='" . $_POST['Map_Host'] . "'
WHERE geocodeid = '" . $SelectedParam . "'";
}
$msg = _('The geocode status record has been updated');
@@ -62,48 +62,42 @@
/*Selected Param is null cos no item selected on first time round so must be adding a record must be submitting new entries in the new status code form */
- if (isset($_POST['geocode_key']) and $_POST['geocode_key']>0){
+ if (isset($_POST['GeoCode_Key']) and $_POST['GeoCode_Key']>0){
- $sql = "INSERT INTO geocode_param (
- geocodeid,
- geocode_key,
- center_long,
- center_lat,
- map_height,
- map_width,
- map_host)
- VALUES (" . "
- '',
- '" . $_POST['geocode_key'] . "',
- '" . $_POST['center_long'] . "',
- '" . $_POST['center_lat'] . "',
- '" . $_POST['map_height'] . "',
- '" . $_POST['map_width'] . "',
- '" . $_POST['map_host'] . "'
- )";
+ $sql = "INSERT INTO geocode_param (geocodeid,
+ geocode_key,
+ center_long,
+ center_lat,
+ map_height,
+ map_width,
+ map_host)
+ VALUES ('',
+ '" . $_POST['GeoCode_Key'] . "',
+ '" . $_POST['Center_Long'] . "',
+ '" . $_POST['Center_Lat'] . "',
+ '" . $_POST['Map_Height'] . "',
+ '" . $_POST['Map_Width'] . "',
+ '" . $_POST['Map_Host'] . "')";
} else {
- $sql = "INSERT INTO geocode_param (
- geocodeid,
- geocode_key,
- center_long,
- center_lat,
- map_height,
- map_width,
- map_host)
- VALUES (
- '" . $_POST['geocodeid'] . "',
- '" . $_POST['geocode_key'] . "',
- '" . $_POST['center_long'] . "',
- '" . $_POST['center_lat'] . "',
- '" . $_POST['map_height'] . "',
- '" . $_POST['map_width'] . "',
- '" . $_POST['map_host'] . "
- ')";
+ $sql = "INSERT INTO geocode_param (geocodeid,
+ geocode_key,
+ center_long,
+ center_lat,
+ map_height,
+ map_width,
+ map_host)
+ VALUES ('" . $_POST['GeoCodeID'] . "',
+ '" . $_POST['GeoCode_Key'] . "',
+ '" . $_POST['Center_Long'] . "',
+ '" . $_POST['Center_Lat'] . "',
+ '" . $_POST['Map_Height'] . "',
+ '" . $_POST['Map_Width'] . "',
+ '" . $_POST['Map_Host'] . "')";
}
$msg = _('A new geocode status record has been inserted');
unset ($SelectedParam);
- unset ($_POST['geocode_key']);
+ unset ($_POST['GeoCode_Key']);
}
//run the SQL from either of the above possibilites
$result = DB_query($sql,$db);
@@ -128,7 +122,14 @@
links to delete or edit each. These will call the same page again and allow update/input
or deletion of the records*/
- $sql = "SELECT geocodeid, geocode_key, center_long, center_lat, map_height, map_width, map_host FROM geocode_param";
+ $sql = "SELECT geocodeid,
+ geocode_key,
+ center_long,
+ center_lat,
+ map_height,
+ map_width,
+ map_host
+ FROM geocode_param";
$result = DB_query($sql, $db);
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Geocode Setup') . '" alt="" />'.
@@ -137,17 +138,19 @@
'<a href="http://code.google.com/apis/maps/signup.html" target="_blank"> http://code.google.com/apis/maps/signup.html</a></b>';
echo '<div class="centre"><p>'. _('Find the lat/long for your map center point at ') .
'<a href="http://www.batchgeocode.com/lookup/" target="_blank">http://www.batchgeocode.com/lookup/</a></b>';
- echo '<p>'. _('Set the maps centre point using the Center Longitude and Center Latitude. Set the maps screen size using the height and width in pixels (px)').'</div><br />';
+ prnMsg(_('Set the maps centre point using the Center Longitude and Center Latitude. Set the maps screen size using the height and width in pixels (px)'),'info');
+ echo '</div><br />';
echo '<table border=1>';
echo '<tr>
- <th>'. _('Geocode ID') .'</th>
- <th>'. _('Geocode Key') .'</th>
- <th>'. _('Center Longitude') .'</th>
- <th>'. _('Center Latitude') .'</th>
- <th>'. _('Map height (px)') .'</th>
- <th>'. _('Map width (px)') .'</th>
- <th>'. _('Map host') .'</th>';
+ <th>'. _('Geocode ID') .'</th>
+ <th>'. _('Geocode Key') .'</th>
+ <th>'. _('Center Longitude') . '</th>
+ <th>'. _('Center Latitude') . '</th>
+ <th>'. _('Map height (px)') . '</th>
+ <th>'. _('Map width (px)') . '</th>
+ <th>'. _('Map host') . '</th>
+ </tr>';
$k=0; //row colour counter
while ($myrow=DB_fetch_row($result)) {
@@ -161,27 +164,27 @@
}
printf('<td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td><a href=\'%s?SelectedParam=%s\'>' . _('Edit') . '</a></td>
- <td><a href=\'%s?SelectedParam=%s&delete=%s\'>'. _('Delete') .'</a></td>
- </tr>',
- $myrow[0],
- $myrow[1],
- $myrow[2],
- $myrow[3],
- $myrow[4],
- $myrow[5],
- $myrow[6],
- $_SERVER['PHP_SELF'],
- $myrow[0],
- $_SERVER['PHP_SELF'],
- $myrow[0],
- $myrow[0]);
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td><a href=\'%s?SelectedParam=%s\'>' . _('Edit') . '</a></td>
+ <td><a href=\'%s?SelectedParam=%s&delete=%s\'>'. _('Delete') .'</a></td>
+ </tr>',
+ $myrow[0],
+ $myrow[1],
+ $myrow[2],
+ $myrow[3],
+ $myrow[4],
+ $myrow[5],
+ $myrow[6],
+ $_SERVER['PHP_SELF'],
+ $myrow[0],
+ $_SERVER['PHP_SELF'],
+ $myrow[0],
+ $myrow[0]);
} //END WHILE LIST LOOP
echo '</table>';
@@ -201,70 +204,72 @@
//editing an existing status code
$sql = "SELECT geocodeid,
- geocode_key,
- center_long,
- center_lat,
- map_height,
- map_width,
- map_host
- FROM geocode_param
- WHERE geocodeid='" . $SelectedParam . "'";
+ geocode_key,
+ center_long,
+ center_lat,
+ map_height,
+ map_width,
+ map_host
+ FROM geocode_param
+ WHERE geocodeid='" . $SelectedParam . "'";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
- $_POST['geocodeid'] = $myrow['geocodeid'];
- $_POST['geocode_key'] = $myrow['geocode_key'];
- $_POST['center_long'] = $myrow['center_long'];
- $_POST['center_lat'] = $myrow['center_lat'];
- $_POST['map_height'] = $myrow['map_height'];
- $_POST['map_width'] = $myrow['map_width'];
- $_POST['map_host'] = $myrow['map_host'];
+ $_POST['GeoCodeID'] = $myrow['geocodeid'];
+ $_POST['GeoCode_Key'] = $myrow['geocode_key'];
+ $_POST['Center_Long'] = $myrow['center_long'];
+ $_POST['Center_Lat'] = $myrow['center_lat'];
+ $_POST['Map_Height'] = $myrow['map_height'];
+ $_POST['Map_Width'] = $myrow['map_width'];
+ $_POST['Map_Host'] = $myrow['map_host'];
echo '<input type="hidden" name="SelectedParam" value="' . $SelectedParam . '" />';
- echo '<input type="hidden" name="geocodeid" value="' . $_POST['geocodeid'] . '" />';
+ echo '<input type="hidden" name="GeoCodeID" value="' . $_POST['GeoCodeID'] . '" />';
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Geocode Setup') . '" alt="">'. _('Setup configuration for Geocoding of Customers and Suppliers') .'</p>';
echo '<table>
<tr><td>'. _('Geocode Code') .':</td>
- <td>' . $_POST['geocodeid'] . '</td></tr>';
+ <td>' . $_POST['GeoCodeID'] . '</td></tr>';
} else { //end of if $SelectedParam only do the else when a new record is being entered
- if (!isset($_POST['geocodeid'])) {
- $_POST['geocodeid'] = '';
+ if (!isset($_POST['GeoCodeID'])) {
+ $_POST['GeoCodeID'] = '';
}
echo '<table>';
// <tr>
// <td>'. _('Geocode Code') .":</td>
-// <td><input " . (in_array('geocodeid',$Errors) ? 'class="inputerror"' : '' ) .
-// " tabindex=1 type='Text' name='geocodeid' VALUE='". $_POST['geocodeid'] ."' size=3 maxlength=2></td>
+// <td><input " . (in_array('GeoCodeID',$Errors) ? 'class="inputerror"' : '' ) .
+// " tabindex=1 type='Text' name='GeoCodeID' VALUE='". $_POST['GeoCodeID'] ."' size=3 maxlength=2></td>
// </tr>";
}
- if (!isset($_POST['geocode_key'])) {
- $_POST['geocode_key'] = '';
+ if (!isset($_POST['GeoCode_Key'])) {
+ $_POST['GeoCode_Key'] = '';
}
echo '<br /><tr>
<td>'. _('Geocode Key') .':</td>
- <td><input ' . (in_array('geocode_key',$Errors) ? 'class="inputerror"' : '' ) .
- ' tabindex=2 type="text" name="geocode_key" VALUE="'. $_POST['geocode_key'] .'" size=28 maxlength=300>
+ <td><input ' . (in_array('GeoCode_Key',$Errors) ? 'class="inputerror"' : '' ) .
+ ' tabindex=2 type="text" name="GeoCode_Key" value="'. $_POST['GeoCode_Key'] .'" size=28 maxlength=300>
</td></tr>
<tr><td>'. _('Geocode Center Long') . '</td>
- <td><input tabindex=3 type="text" name="center_long" VALUE="'. $_POST['center_long'] .'" size=28 maxlength=300></td></tr>
+ <td><input tabindex=3 type="text" name="Center_Long" value="'. $_POST['Center_Long'] .'" size=28 maxlength=300></td></tr>
<tr><td>'. _('Geocode Center Lat') . '</td>
- <td><input tabindex=4 type="text" name="center_lat" VALUE="'. $_POST['center_lat'] .'" size=28 maxlength=300></td></tr>
+ <td><input tabindex=4 type="text" name="Center_Lat" value="'. $_POST['Center_Lat'] .'" size=28 maxlength=300></td></tr>
<tr><td>'. _('Geocode Map Height') . '</td>
- <td><input tabindex=5 type="text" name="map_height" VALUE="'. $_POST['map_height'] .'" size=28 maxlength=300></td></tr>
+ <td><input tabindex=5 type="text" name="Map_Height" value="'. $_POST['Map_Height'] .'" size=28 maxlength=300></td></tr>
<tr><td>'. _('Geocode Map Width') . '</td>
- <td><input tabindex=6 type="text" name="map_width" VALUE="'. $_POST['map_width'] .'" size=28 maxlength=300></td></tr>
+ <td><input tabindex=6 type="text" name="Map_Width" value="'. $_POST['Map_Width'] .'" size=28 maxlength=300></td></tr>
<tr><td>'. _('Geocode Host') . '</td>
- <td><input tabindex=7 type="text" name="map_host" VALUE="'. $_POST['map_host'] .'" size=20 maxlength=300></td></tr>
+ <td><input tabindex=7 type="text" name="Map_Host" value="'. $_POST['Map_Host'] .'" size=20 maxlength=300></td></tr>
</table>
- <div class="centre"><input tabindex=4 type="Submit" name="submit" value="' . _('Enter Information') . '"</div><br /><br />
+ <div class="centre"><input tabindex=4 type="submit" name="submit" value="' . _('Enter Information') . '"</div>
+ <br />
+ <br />
</form>';
echo '<div class="page_help_text">' . _('When ready, click on the link below to run the GeoCode process. This will Geocode all Branches and Suppliers. This may take some time. Errors will be returned to the screen.') . '</p>';
echo '<p>' . _('Suppliers and Customer Branches are geocoded when being entered/updated. You can rerun the geocode process from this screen at any time.') . '</p></div><br />';
Modified: trunk/GetStockImage.php
===================================================================
--- trunk/GetStockImage.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/GetStockImage.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -20,33 +20,33 @@
*/
// Color decode function
-function DecodeBgColor( $colorstr ) {
- if ( $colorstr[0] == '#' ) {
- $colorstr = mb_substr($colorstr,1,mb_strlen($colorstr));
+function DecodeBgColor( $ColourStr ) {
+ if ( $ColourStr[0] == '#' ) {
+ $ColourStr = mb_substr($ColourStr,1,mb_strlen($ColourStr));
}
- $red = 0;
- if(mb_strlen($colorstr) > 1) {
- $red = hexdec(mb_substr($colorstr,0,2));
- $colorstr = mb_substr($colorstr,2,mb_strlen($colorstr));
+ $Red = 0;
+ if(mb_strlen($ColourStr) > 1) {
+ $Red = hexdec(mb_substr($ColourStr,0,2));
+ $ColourStr = mb_substr($ColourStr,2,mb_strlen($ColourStr));
}
- $green = 0;
- if(mb_strlen($colorstr) > 1) {
- $green = hexdec(mb_substr($colorstr,0,2));
- $colorstr = mb_substr($colorstr,2,mb_strlen($colorstr));
+ $Green = 0;
+ if(mb_strlen($ColourStr) > 1) {
+ $Green = hexdec(mb_substr($ColourStr,0,2));
+ $ColourStr = mb_substr($ColourStr,2,mb_strlen($ColourStr));
}
- $blue = 0;
- if(mb_strlen($colorstr) > 1) {
- $blue = hexdec(mb_substr($colorstr,0,2));
- $colorstr = mb_substr($colorstr,2,mb_strlen($colorstr));
+ $Blue = 0;
+ if(mb_strlen($ColourStr) > 1) {
+ $Blue = hexdec(mb_substr($ColourStr,0,2));
+ $ColourStr = mb_substr($ColourStr,2,mb_strlen($ColourStr));
}
- if(mb_strlen($colorstr) > 1) {
- $alpha = hexdec(mb_substr($colorstr,0,2));
- $colorstr = mb_substr($colorstr,2,mb_strlen($colorstr));
+ if(mb_strlen($ColourStr) > 1) {
+ $Alpha = hexdec(mb_substr($ColourStr,0,2));
+ $ColourStr = mb_substr($ColourStr,2,mb_strlen($ColourStr));
}
- if ( isset($alpha) )
- return array('red' => $red, 'green' => $green, 'blue' => $blue, 'alpha' => $alpha );
+ if ( isset($Alpha) )
+ return array('red' => $Red, 'green' => $Green, 'blue' => $Blue, 'alpha' => $Alpha );
else
- return array('red' => $red, 'green' => $green, 'blue' => $blue );
+ return array('red' => $Red, 'green' => $Green, 'blue' => $Blue );
}
if (!function_exists('imagecreatefrompng')){
@@ -56,7 +56,7 @@
include('includes/footer.inc');
exit;
}
-$defaultimage = 'webERPsmall.png';
+$DefaultImage = 'webERPsmall.png';
// FOR APACHE
if ( $_SERVER['PATH_TRANSLATED'][0] == '/' OR $_SERVER['PATH_TRANSLATED'][0]=='') {
@@ -66,13 +66,13 @@
//Windows
$pathsep = "\\";
}
-$filepath = $_SESSION['part_pics_dir'] . $pathsep;
+$FilePath = $_SESSION['part_pics_dir'] . $pathsep;
-$stockid = trim(mb_strtoupper($_GET['StockID']));
+$StockID = trim(mb_strtoupper($_GET['StockID']));
if( isset($_GET['bgcolor']) )
- $bgcolor = $_GET['bgcolor'];
+ $BackgroundColour = $_GET['bgcolor'];
if( isset($_GET['textcolor']) )
- $textcolor = $_GET['textcolor'];
+ $TextColour = $_GET['textcolor'];
if( isset($_GET['width']) )
$width = $_GET['width'];
if( isset($_GET['height']) )
@@ -89,7 +89,7 @@
}
if( isset($_GET['transcolor'])) {
$doTrans = true;
- $transcolor = $_GET['transcolor'];
+ $TranspColour = $_GET['transcolor'];
}
if( isset($_GET['bevel']) ) {
$bevel = $_GET['bevel'];
@@ -111,17 +111,17 @@
// Extension requirements and Stock ID Isolation
-if($stockid == '') {
- $stockid = $defaultimage;
+if($StockID == '') {
+ $StockID = $DefaultImage;
$blanktext = true;
}
-$i = strrpos($stockid,'.');
+$i = strrpos($StockID,'.');
if( $i === false )
$type = 'png';
else {
- $type = strtolower(mb_substr($stockid,$i+1,mb_strlen($stockid)));
- $stockid = mb_substr($stockid,0,$i);
+ $type = strtolower(mb_substr($StockID,$i+1,mb_strlen($StockID)));
+ $StockID = mb_substr($StockID,0,$i);
if($blanktext && !isset($text))
$text = '';
}
@@ -132,22 +132,22 @@
$functype = 'jpeg';
}
-$tmpfilename = $filepath.$stockid;
+$tmpFileName = $FilePath.$StockID;
// First check for an image this is not the type requested
-if ( file_exists($tmpfilename.'.jpg') ) {
- $filename = $stockid.'.jpg';
- $isjpeg = true;
-} elseif (file_exists($tmpfilename.'.jpeg')) {
- $filename = $stockid.'.jpeg';
- $isjpeg = true;
-} elseif (file_exists($tmpfilename.'.png')) {
- $filename = $stockid.'.png';
- $isjpeg = false;
+if ( file_exists($tmpFileName.'.jpg') ) {
+ $FileName = $StockID.'.jpg';
+ $IsJpeg = true;
+} elseif (file_exists($tmpFileName.'.jpeg')) {
+ $FileName = $StockID.'.jpeg';
+ $IsJpeg = true;
+} elseif (file_exists($tmpFileName.'.png')) {
+ $FileName = $StockID.'.png';
+ $IsJpeg = false;
} else {
- $filename = $defaultimage;
- $isjpeg = $defaultisjpeg;
+ $FileName = $DefaultImage;
+ $IsJpeg = $DefaultIsJpeg;
}
-if( !$automake && !isset($filename) ) {
+if( !$automake && !isset($FileName) ) {
$title = _('Stock Image Retrieval ....');
include('includes/header.inc');
prnMsg( _('The Image could not be retrieved because it does not exist'), 'error');
@@ -159,9 +159,9 @@
/*
$title = _('Stock Image Retrieval ....');
include('includes/header.inc');
- echo 'The image ' . $filename . ' using functype ' . $functype
- . '<br /> The tmpfilename = ' . $tmpfilename . '<br /> The temppath = ' . $filepath . '<br />The stockid = ' . $stockid . '<br /> filepath . stockid .jpg = ' . $filepath . $stockid .'.jpg<br /> The result of file_exists($filepath . $stockid .jpg) =' . file_exists($filepath . $stockid .'.jpg')
- . '<br />filepath = ' . $filepath
+ echo 'The image ' . $FileName . ' using functype ' . $functype
+ . '<br /> The tmpFileName = ' . $tmpFileName . '<br /> The temppath = ' . $FilePath . '<br />The stockid = ' . $StockID . '<br /> filepath . stockid .jpg = ' . $FilePath . $StockID .'.jpg<br /> The result of file_exists($FilePath . $StockID .jpg) =' . file_exists($FilePath . $StockID .'.jpg')
+ . '<br />filepath = ' . $FilePath
. '<br />rootpath = ' . $rootpath;
include('includes/footer.inc');
exit;
@@ -170,7 +170,7 @@
// See if we need to automake this image
-if( $automake && !isset($filename) || $useblank ) {
+if( $automake && !isset($FileName) || $useblank ) {
// Have we got height and width specs
if( !isset($width) )
$width = 64;
@@ -178,39 +178,39 @@
$height = 64;
// Have we got a background color
$im = imagecreate($width, $height);
- if( isset($bgcolor) )
- $bgcolor = DecodeBgColor( $bgcolor );
+ if( isset($BackgroundColour) )
+ $BackgroundColour = DecodeBgColor( $BackgroundColour );
else
- $bgcolor = DecodeBgColor( '#7F7F7F' );
- if( !isset($bgcolor['alpha']) ) {
+ $BackgroundColour = DecodeBgColor( '#7F7F7F' );
+ if( !isset($BackgroundColour['alpha']) ) {
$ixbgcolor = imagecolorallocate($im,
- $bgcolor['red'],$bgcolor['green'],$bgcolor['blue']);
+ $BackgroundColour['red'],$BackgroundColour['green'],$BackgroundColour['blue']);
} else {
$ixbgcolor = imagecolorallocatealpha($im,
- $bgcolor['red'],$bgcolor['green'],$bgcolor['blue'],$bgcolor['alpha']);
+ $BackgroundColour['red'],$BackgroundColour['green'],$BackgroundColour['blue'],$BackgroundColour['alpha']);
}
// Have we got a text color
- if( isset($textcolor) )
- $textcolor = DecodeBgColor( $textcolor );
+ if( isset($TextColour) )
+ $TextColour = DecodeBgColor( $TextColour );
else
- $textcolor = DecodeBgColor( '#000000' );
- if( !isset($textcolor['alpha']) ) {
+ $TextColour = DecodeBgColor( '#000000' );
+ if( !isset($TextColour['alpha']) ) {
$ixtextcolor = imagecolorallocate($im,
- $textcolor['red'],$textcolor['green'],$textcolor['blue']);
+ $TextColour['red'],$TextColour['green'],$TextColour['blue']);
} else {
$ixtextcolor = imagecolorallocatealpha($im,
- $textcolor['red'],$textcolor['green'],$textcolor['blue'],$textcolor['alpha']);
+ $TextColour['red'],$TextColour['green'],$TextColour['blue'],$TextColour['alpha']);
}
// Have we got transparency requirements
- if( isset($transcolor) ) {
- $transcolor = DecodeBgColor( $transcolor );
- if( $transcolor != $bgcolor ) {
- if( !isset($textcolor['alpha']) ) {
+ if( isset($TranspColour) ) {
+ $TranspColour = DecodeBgColor( $TranspColour );
+ if( $TranspColour != $BackgroundColour ) {
+ if( !isset($TextColour['alpha']) ) {
$ixtranscolor = imagecolorallocate($im,
- $transcolor['red'],$transcolor['green'],$transcolor['blue']);
+ $TranspColour['red'],$TranspColour['green'],$TranspColour['blue']);
} else {
$ixtranscolor = imagecolorallocatealpha($im,
- $transcolor['red'],$transcolor['green'],$transcolor['blue'],$transcolor['alpha']);
+ $TranspColour['red'],$TranspColour['green'],$TranspColour['blue'],$TranspColour['alpha']);
}
} else {
$ixtranscolor = $ixbgcolor;
@@ -223,7 +223,7 @@
}
if(!isset($text))
- $text = $stockid;
+ $text = $StockID;
if(mb_strlen($text) > 0 ) {
$fw = imagefontwidth($fontsize);
$fh = imagefontheight($fontsize);
@@ -237,35 +237,35 @@
}
} else {
- $tmpfilename = $filepath.$filename;
- if( $isjpeg ) {
- $im = imagecreatefromjpeg($tmpfilename);
+ $tmpFileName = $FilePath.$FileName;
+ if( $IsJpeg ) {
+ $im = imagecreatefromjpeg($tmpFileName);
} else {
- $im = imagecreatefrompng($tmpfilename);
+ $im = imagecreatefrompng($tmpFileName);
}
// Have we got a background color
- if( isset($bgcolor) )
- $bgcolor = DecodeBgColor( $bgcolor );
+ if( isset($BackgroundColour) )
+ $BackgroundColour = DecodeBgColor( $BackgroundColour );
else
- $bgcolor = DecodeBgColor( '#7F7F7F' );
- if( !isset($bgcolor['alpha']) ) {
+ $BackgroundColour = DecodeBgColor( '#7F7F7F' );
+ if( !isset($BackgroundColour['alpha']) ) {
$ixbgcolor = imagecolorallocate($im,
- $bgcolor['red'],$bgcolor['green'],$bgcolor['blue']);
+ $BackgroundColour['red'],$BackgroundColour['green'],$BackgroundColour['blue']);
} else {
$ixbgcolor = imagecolorallocatealpha($im,
- $bgcolor['red'],$bgcolor['green'],$bgcolor['blue'],$bgcolor['alpha']);
+ $BackgroundColour['red'],$BackgroundColour['green'],$BackgroundColour['blue'],$BackgroundColour['alpha']);
}
// Have we got a text color
- if( isset($textcolor) )
- $textcolor = DecodeBgColor( $textcolor );
+ if( isset($TextColour) )
+ $TextColour = DecodeBgColor( $TextColour );
else
- $textcolor = DecodeBgColor( '#000000' );
- if( !isset($textcolor['alpha']) ) {
+ $TextColour = DecodeBgColor( '#000000' );
+ if( !isset($TextColour['alpha']) ) {
$ixtextcolor = imagecolorallocate($im,
- $textcolor['red'],$textcolor['green'],$textcolor['blue']);
+ $TextColour['red'],$TextColour['green'],$TextColour['blue']);
} else {
$ixtextcolor = imagecolorallocatealpha($im,
- $textcolor['red'],$textcolor['green'],$textcolor['blue'],$textcolor['alpha']);
+ $TextColour['red'],$TextColour['green'],$TextColour['blue'],$TextColour['alpha']);
}
$sw = imagesx($im);
$sh = imagesy($im);
@@ -281,32 +281,32 @@
$im = $tmpim;
unset($tmpim);
- if( !isset($bgcolor['alpha']) ) {
+ if( !isset($BackgroundColour['alpha']) ) {
$ixbgcolor = imagecolorallocate($im,
- $bgcolor['red'],$bgcolor['green'],$bgcolor['blue']);
+ $BackgroundColour['red'],$BackgroundColour['green'],$BackgroundColour['blue']);
} else {
$ixbgcolor = imagecolorallocatealpha($im,
- $bgcolor['red'],$bgcolor['green'],$bgcolor['blue'],$bgcolor['alpha']);
+ $BackgroundColour['red'],$BackgroundColour['green'],$BackgroundColour['blue'],$BackgroundColour['alpha']);
}
- if( !isset($textcolor['alpha']) ) {
+ if( !isset($TextColour['alpha']) ) {
$ixtextcolor = imagecolorallocate($im,
- $textcolor['red'],$textcolor['green'],$textcolor['blue']);
+ $TextColour['red'],$TextColour['green'],$TextColour['blue']);
} else {
$ixtextcolor = imagecolorallocatealpha($im,
- $textcolor['red'],$textcolor['green'],$textcolor['blue'],$textcolor['alpha']);
+ $TextColour['red'],$TextColour['green'],$TextColour['blue'],$TextColour['alpha']);
}
//imagealphablending ( $im, false);
}
// Have we got transparency requirements
- if( isset($transcolor) ) {
- $transcolor = DecodeBgColor( $transcolor );
- if( $transcolor != $bgcolor ) {
- if( !isset($textcolor['alpha']) ) {
+ if( isset($TranspColour) ) {
+ $TranspColour = DecodeBgColor( $TranspColour );
+ if( $TranspColour != $BackgroundColour ) {
+ if( !isset($TextColour['alpha']) ) {
$ixtranscolor = imagecolorallocate($im,
- $transcolor['red'],$transcolor['green'],$transcolor['blue']);
+ $TranspColour['red'],$TranspColour['green'],$TranspColour['blue']);
} else {
$ixtranscolor = imagecolorallocatealpha($im,
- $transcolor['red'],$transcolor['green'],$transcolor['blue'],$transcolor['alpha']);
+ $TranspColour['red'],$TranspColour['green'],$TranspColour['blue'],$TranspColour['alpha']);
}
} else {
$ixtranscolor = $ixbgcolor;
@@ -322,7 +322,7 @@
// $ixtextbgcolor = imagecolorallocatealpha($im,
// 0,0,0,0);
if(!isset($text))
- $text = $stockid;
+ $text = $StockID;
if(mb_strlen($text) > 0 ) {
$fw = imagefontwidth($fontsize);
$fh = imagefontheight($fontsize);
@@ -348,7 +348,7 @@
imageline($im, imagesx($im)-1,0,imagesx($im)-1, imagesy($im)-1, $silver); // right
}
// Set up headers
-header('Content-Disposition: filename='.$stockid.'.'.$type);
+header('Content-Disposition: filename='.$StockID.'.'.$type);
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
header('Content-type: image/'.$style);
Modified: trunk/MRPShortages.php
===================================================================
--- trunk/MRPShortages.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/MRPShortages.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -260,15 +260,15 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="'
. _('Stock') . '" alt="" />' . ' ' . $title . '</p>';
- echo '<form action=' . $_SERVER['PHP_SELF'] . " method='post'>";
+ echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class=selection>';
echo '</select></td></tr>';
echo '<tr><td>' . _('Inventory Category') . ':</td><td><select name="CategoryID">';
- echo '<option selected value="All">' . _('All Stock Categories');
+ echo '<option selected value="All">' . _('All Stock Categories') .'</option>';
$sql = 'SELECT categoryid,
- categorydescription
- FROM stockcategory';
+ categorydescription
+ FROM stockcategory";
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categoryid'] . ' - ' .$myrow['categorydescription'] . '</option>';
Modified: trunk/PDFStockTransfer.php
===================================================================
--- trunk/PDFStockTransfer.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/PDFStockTransfer.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -2,6 +2,8 @@
/* $Id$*/
+/* This script is superseded by the PDFStockLocTransfer.php which produces a multiple item stock transfer listing - this was for the old individual stock transfers where there is just single items being transferred */
+
include('includes/session.inc');
if (!isset($_GET['TransferNo'])){
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/ShipmentCosting.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -25,15 +25,15 @@
}
$ShipmentHeaderSQL = "SELECT shipments.supplierid,
- suppliers.suppname,
- shipments.eta,
- suppliers.currcode,
- shipments.vessel,
- shipments.voyageref,
- shipments.closed
- FROM shipments INNER JOIN suppliers
- ON shipments.supplierid = suppliers.supplierid
- WHERE shipments.shiptref = '" . $_GET['SelectedShipment'] . "'";
+ suppliers.suppname,
+ shipments.eta,
+ suppliers.currcode,
+ shipments.vessel,
+ shipments.voyageref,
+ shipments.closed
+ FROM shipments INNER JOIN suppliers
+ ON shipments.supplierid = suppliers.supplierid
+ WHERE shipments.shiptref = '" . $_GET['SelectedShipment'] . "'";
$ErrMsg = _('Shipment').' '. $_GET['SelectedShipment'] . ' ' . _('cannot be retrieved because a database error occurred');
$GetShiptHdrResult = DB_query($ShipmentHeaderSQL,$db, $ErrMsg);
@@ -46,7 +46,7 @@
$HeaderData = DB_fetch_array($GetShiptHdrResult);
echo '<br />';
-echo '<table class=selection>';
+echo '<table class="selection">';
echo '<tr><th colspan=4><font size=3 color=navy>'._('Shipment Details').'</font></th></tr>';
echo '<tr>
<td><b>'. _('Shipment') .': </td>
@@ -140,15 +140,17 @@
echo '<br /><table cellpadding=2 colspan=7 class=selection>';
echo '<tr><th colspan=9><font color=navy size=3>' . _('Items on shipment'). '</font></th></tr>';
- $TableHeader = '<tr> <th>'. _('Item'). '</th>
- <th>'. _('Quantity'). '<br />'. _('Invoiced'). '</th>
- <th>'. _('Quantity'). '<br />'. _('Received'). '</th>
- <th>'. _('Invoiced'). '<br />'. _('Charges'). '</th>
- <th>'. _('Shipment'). '<br />'. _('Charges'). '</th>
- <th>'. _('Shipment'). '<br />'. _('Cost'). '</th>
- <th>'. _('Standard'). '<br />'. _('Cost'). '</th>
- <th>'. _('Variance'). '</th>
- <th>%</th></tr>';
+ $TableHeader = '<tr>
+ <th>'. _('Item'). '</th>
+ <th>'. _('Quantity'). '<br />'. _('Invoiced'). '</th>
+ <th>'. _('Quantity'). '<br />'. _('Received'). '</th>
+ <th>'. _('Invoiced'). '<br />'. _('Charges'). '</th>
+ <th>'. _('Shipment'). '<br />'. _('Charges'). '</th>
+ <th>'. _('Shipment'). '<br />'. _('Cost'). '</th>
+ <th>'. _('Standard'). '<br />'. _('Cost'). '</th>
+ <th>'. _('Variance'). '</th>
+ <th>%</th>
+ </tr>';
echo $TableHeader;
/*show the line items on the shipment with the value invoiced and shipt cost */
@@ -618,17 +620,18 @@
if ( isset($_GET['Close'])) { /* Only an opportunity to confirm user wishes to close */
// if the page was called with Close=Yes then show options to confirm OK to c
- echo '<div class+"centre"><form method="POST" action="' . $_SERVER['PHP_SELF'] .'?SelectedShipment=' . $_GET['SelectedShipment'] . '">';
+ echo '<div class="centre">
+ <form method="POST" action="' . $_SERVER['PHP_SELF'] .'?SelectedShipment=' . $_GET['SelectedShipment'] . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if ($_SESSION['WeightedAverageCosting']==0){
/* We are standard costing - so show the option to update costs - under W. Avg cost updates are implicit */
echo _('Update Standard Costs') .':<select name="UpdateCost">
- <option selected value="Yes">'. _('Yes') . '</option>
- <option value="No">'. _('No') . '</option>
+ <option selected value="Yes">'. _('Yes') . '</option>
+ <option value="No">'. _('No') . '</option>
</select>';
}
- echo '<br /><br /><input type=submit name="Close" VALUE="'. _('Confirm OK to Close'). '">';
+ echo '<br /><br /><input type=submit name="Close" value="'. _('Confirm OK to Close'). '">';
echo '</form></div>';
}
Modified: trunk/Z_CheckDebtorsControl.php
===================================================================
--- trunk/Z_CheckDebtorsControl.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/Z_CheckDebtorsControl.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -88,13 +88,12 @@
$GLOpening = $invTotal = $RecTotal = $GLClosing = $CalcTotal = $DiffTotal = 0;
$j=0;
- while ( $CurPeriod <= $_POST['ToPeriod'] )
- {
+ while ( $CurPeriod <= $_POST['ToPeriod'] ) {
$SQL = "SELECT bfwd,
- actual
- FROM chartdetails
- WHERE period = " . $CurPeriod . "
- AND accountcode=" . $_SESSION['CompanyRecord']['debtorsact'];
+ actual
+ FROM chartdetails
+ WHERE period = " . $CurPeriod . "
+ AND accountcode=" . $_SESSION['CompanyRecord']['debtorsact'];
$dtResult = DB_query($SQL,$db);
$dtRow = DB_fetch_array($dtResult);
DB_free_result($dtResult);
@@ -165,7 +164,6 @@
echo '</table></form>';
}
-echo '</td></tr></table>'; // end Page Border
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/api/api_session.inc
===================================================================
--- trunk/api/api_session.inc 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/api/api_session.inc 2011-07-06 09:30:42 UTC (rev 4625)
@@ -40,7 +40,7 @@
$_SESSION['AttemptsCounter'] = 0;
}
-if ($_SESSION['HTTPS_Only']==1){
+if (isset($_SESSION['HTTPS_Only']) AND $_SESSION['HTTPS_Only']==1){
if ($_SERVER['HTTPS']!='on'){
prnMsg(_('webERP is configured to allow only secure socket connections. Pages must be called with https://') . ' .....','error');
exit;
@@ -51,8 +51,7 @@
// value must be set in the script before header.inc is included. $SecurityGroups is an array of
// arrays defining access for each group of users. These definitions can be modified by a system admin under setup
-
-if (!is_array($_SESSION['AllowedPageSecurityTokens']) AND !isset($AllowAnyone)) {
+if (isset($_SESSION['AllowedPageSecurityTokens']) AND !is_array($_SESSION['AllowedPageSecurityTokens']) AND !isset($AllowAnyone)) {
/* NO HTML output - but may need an XMLRPC style error message here.
Lindsay: 12Jan10
$title = _('Account Error Report');
Modified: trunk/api/api_xml-rpc.php
===================================================================
--- trunk/api/api_xml-rpc.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/api/api_xml-rpc.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -1043,7 +1043,7 @@
unset($Description);
unset($Parameter);
unset($ReturnValue);
-
+ $ReturnValue = _('Return Value Descriptions go here');
$Description = _('This function is used to insert a new Sales Credit to the webERP database.');
$Parameter[0]['name'] = _('Credit Details');
$Parameter[0]['description'] = _('An array of index/value items describing the credit. All values must be negative.');
@@ -1212,7 +1212,8 @@
unset($Description);
unset($Parameter);
unset($ReturnValue);
-
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
$Parameter[0]['name'] = _('Account Details');
$Parameter[0]['description'] = _('An array of index/value items describing the GL Account and fields to set.');
$Parameter[1]['name'] = _('User name');
@@ -1242,6 +1243,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Account Section Details');
$Parameter[0]['description'] = _('An array of index/value items describing the account section to insert.');
$Parameter[1]['name'] = _('User name');
@@ -1271,6 +1275,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Account Group Details');
$Parameter[0]['description'] = _('An array of index/value items describing the account group to insert.');
$Parameter[1]['name'] = _('User name');
@@ -1299,7 +1306,7 @@
unset($Description);
unset($Parameter);
unset($ReturnValue);
-
+
$Description = _('This function returns a list of stock location ids.');
$Parameter[0]['name'] = _('User name');
$Parameter[0]['description'] = _('A valid weberp username. This user should have security access to this data.');
@@ -1507,6 +1514,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Sales Area Details');
$Parameter[0]['description'] = _('An array of index/value items describing the sales area to insert.');
$Parameter[1]['name'] = _('User name');
@@ -1626,6 +1636,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Salesman Details');
$Parameter[0]['description'] = _('An array of index/value items describing the salesman to insert.');
$Parameter[1]['name'] = _('User name');
@@ -1773,6 +1786,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Category Details');
$Parameter[0]['description'] = _('An array of index/value items describing the stock category to insert.');
$Parameter[1]['name'] = _('User name');
@@ -1802,6 +1818,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Category Details');
$Parameter[0]['description'] = _('An array of index/value items describing the stock category to modify.');
$Parameter[1]['name'] = _('User name');
@@ -1889,6 +1908,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Field Name');
$Parameter[0]['description'] = _('The field name to search on.');
$Parameter[1]['name'] = _('Match Criteria');
@@ -1922,6 +1944,9 @@
unset($Parameter);
unset($ReturnValue);
+ $ReturnValue = _('Return Value Descriptions go here');
+ $Description = _('Function Description go here');
+
$Parameter[0]['name'] = _('Label Name');
$Parameter[0]['description'] = _('The category label to search on.');
$Parameter[1]['name'] = _('Match Criteria');
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/doc/Change.log 2011-07-06 09:30:42 UTC (rev 4625)
@@ -1,5 +1,6 @@
webERP Change Log
+5/7/11 Phil: Amend menu to use PDFStockLocTransfer.php to reprint transfer list - as reported by Ron Wong
3/7/11 Phil: changed all strpos to mb_strpos
3/7/11 Phil: changed all strtoupper to mb_strtoupper
3/7/11 Phil: changed all substr to mb_substr
Modified: trunk/geo_displaymap_customers.php
===================================================================
--- trunk/geo_displaymap_customers.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/geo_displaymap_customers.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -1,7 +1,7 @@
<?php
/* $Id$*/
-//$PageSecurity = 3;
+
$title = _('Geocoded Customer Branches Report');
include ('includes/session.inc');
@@ -13,14 +13,14 @@
$result = DB_query($sql, $db, $ErrMsg);
$myrow = DB_fetch_array($result);
-$api_key = $myrow['geocode_key'];
-$center_long = $myrow['center_long'];
-$center_lat = $myrow['center_lat'];
-$map_height = $myrow['map_height'];
-$map_width = $myrow['map_width'];
-$map_host = $myrow['map_host'];
+$Api_Key = $myrow['geocode_key'];
+$Center_Long = $myrow['center_long'];
+$Center_Lat = $myrow['center_lat'];
+$Map_Height = $myrow['map_height'];
+$Map_Width = $myrow['map_width'];
+$Map_Host = $myrow['map_host'];
-echo '<script src="http://' . $map_host . '/maps?file=api&v=2&key=' . $api_key . '"';
+echo '<script src="http://' . $Map_Host . '/maps?file=api&v=2&key=' . $Api_Key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo " //<![CDATA[ "; ?>
@@ -51,7 +51,7 @@
map.addControl(new GSmallMapControl());
map.addControl(new GMapTypeControl());
-<? echo 'map.setCenter(new GLatLng(' . $center_lat . ', ' . $center_long . '), 10);'; ?>
+<? echo 'map.setCenter(new GLatLng(' . $Center_Lat . ', ' . $Center_Long . '), 10);'; ?>
GDownloadUrl("geocode_genxml_customers.php", function(data) {
var xml = GXml.parse(data);
@@ -83,7 +83,7 @@
<body onload="load()" onunload="GUnload()">
<p>
-<? echo '<div class="centre" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px"></div>'; ?>
+<? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
</p>
</body>
<?
Modified: trunk/geo_displaymap_suppliers.php
===================================================================
--- trunk/geo_displaymap_suppliers.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/geo_displaymap_suppliers.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -1,7 +1,7 @@
<?php
/* $Id$*/
-//$PageSecurity = 3;
+
$title = _('Geocoded Supplier Report');
include ('includes/session.inc');
@@ -13,14 +13,14 @@
$result = DB_query($sql, $db, $ErrMsg);
$myrow = DB_fetch_array($result);
-$api_key = $myrow['geocode_key'];
-$center_long = $myrow['center_long'];
-$center_lat = $myrow['center_lat'];
-$map_height = $myrow['map_height'];
-$map_width = $myrow['map_width'];
-$map_host = $myrow['map_host'];
+$Api_Key = $myrow['geocode_key'];
+$Center_Long = $myrow['center_long'];
+$Center_Lat = $myrow['center_lat'];
+$Map_Height = $myrow['map_height'];
+$Map_Width = $myrow['map_width'];
+$Map_Host = $myrow['map_host'];
-echo '<script src="http://' . $map_host . '/maps?file=api&v=2&key=' . $api_key . '"';
+echo '<script src="http://' . $Map_Host . '/maps?file=api&v=2&key=' . $Api_Key . '"';
echo ' type="text/javascript"></script>';
echo ' <script type="text/javascript">';
echo " //<![CDATA[ "; ?>
@@ -51,7 +51,7 @@
map.addControl(new GSmallMapControl());
map.addControl(new GMapTypeControl());
-<? echo 'map.setCenter(new GLatLng(' . $center_lat . ', ' . $center_long . '), 10);'; ?>
+<? echo 'map.setCenter(new GLatLng(' . $Center_Lat . ', ' . $Center_Long . '), 10);'; ?>
GDownloadUrl("geocode_genxml_suppliers.php", function(data) {
var xml = GXml.parse(data);
@@ -83,7 +83,7 @@
<body onload="load()" onunload="GUnload()">
<p>
-<? echo '<div class="centre" id="map" style="width: ' . $map_width . 'px; height: ' . $map_height . 'px"></div>'; ?>
+<? echo '<div class="centre" id="map" style="width: ' . $Map_Width . 'px; height: ' . $Map_Height . 'px"></div>'; ?>
</p>
</body>
<?
Modified: trunk/includes/session.inc
===================================================================
--- trunk/includes/session.inc 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/includes/session.inc 2011-07-06 09:30:42 UTC (rev 4625)
@@ -291,7 +291,8 @@
echo '</td>
</tr>
</table>
- </td>';
+ </td>
+ </tr>';
include($PathPrefix . 'includes/footer.inc');
exit;
Modified: trunk/index.php
===================================================================
--- trunk/index.php 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/index.php 2011-07-06 09:30:42 UTC (rev 4625)
@@ -714,7 +714,7 @@
</tr>
<tr>
<td class="menu_group_item">
- <?php echo '<p>• <a href="' . $rootpath . '/PDFStockTransfer.php">' . _('Stock Transfer Note') . '</a></p>'; ?>
+ <?php echo '<p>• <a href="' . $rootpath . '/PDFStockLocTransfer.php">' . _('Stock Transfer Note') . '</a></p>'; ?>
</td>
</tr>
<tr>
Modified: trunk/locale/it_IT.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po 2011-07-05 10:36:13 UTC (rev 4624)
+++ trunk/locale/it_IT.utf8/LC_MESSAGES/messages.po 2011-07-06 09:30:42 UTC (rev 4625)
@@ -1,5 +1,4 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2005 Logic Works Ltd
# This file is distributed under the GPL
# FIRST AUTHOR <xlyz> .2004/2005
#
@@ -7,9 +6,9 @@
msgstr ""
"Project-Id-Version: Weberp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-02 20:11+1200\n"
-"PO-Revision-Date: 2011-03-04 18:03+0000\n"
-"Last-Translator: Martino Barbon <Unknown>\n"
+"POT-Creation-Date: 2011-05-30 20:51+1200\n"
+"PO-Revision-Date: 2011-07-05 12:26+0100\n"
+"Last-Translator: Gioacchino Cipriano <gio...@gm...>\n"
"Language-Team: italian <none>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,31 +17,25 @@
"X-Generator: Launchpad (build 12696)\n"
"Language: \n"
-#: AccountGroups.php:7 index.php:1296
+#: AccountGroups.php:7
+#: index.php:1296
msgid "Account Groups"
msgstr "Gestione dei conti"
#: AccountGroups.php:17
-msgid ""
-"An error occurred in retrieving the account groups of the parent account "
-"group during the check for recursion"
-msgstr ""
-"È verificato un errore durante il recupero dei gruppi conto del gruppo di "
-"conto genitore durante il controllo per la ricorsione"
+msgid "An error occurred in retrieving the account groups of the parent account group during the check for recursion"
+msgstr "È verificato un errore durante il recupero dei gruppi conto del gruppo di conto genitore durante il controllo per la ricorsione"
#: AccountGroups.php:18
-msgid ""
-"The SQL that was used to retrieve the account groups of the parent account "
-"group and that failed in the process was"
-msgstr ""
-"Il SQL che è stata utilizzata per recuperare i gruppi conto del gruppo di "
-"account principale e che ha fallito nel processo è stato"
+msgid "The SQL that was used to retrieve the account groups of the parent account group and that failed in the process was"
+msgstr "Il SQL che è stata utilizzata per recuperare i gruppi conto del gruppo di account principale e che ha fallito nel processo è stato"
-#: AccountGroups.php:55 AccountGroups.php:92 AccountGroups.php:176
-#: AccountGroups.php:186
+#: AccountGroups.php:55
+#: AccountGroups.php:92
+#: AccountGroups.php:175
+#: AccountGroups.php:185
msgid "The SQL that was used to retrieve the information was"
-msgstr ""
-"Il SQL che è stato utilizzato per recuperare le informazioni sono state"
+msgstr "Il SQL che è stato utilizzato per recuperare le informazioni sono state"
#: AccountGroups.php:56
msgid "Could not check whether the group exists because"
@@ -54,415 +47,774 @@
#: AccountGroups.php:69
msgid "The account group name cannot contain the character"
-msgstr "Il nome del conto non può contenere il carattere"
+msgstr "Il nome del conto non può contenere il carattere"
-#: AccountGroups.php:69 TaxCategories.php:31 TaxProvinces.php:30
+#: AccountGroups.php:69
+#: TaxCategories.php:31
+#: TaxProvinces.php:30
#: UnitsOfMeasure.php:30
msgid "or the character"
msgstr "o il carattere"
#: AccountGroups.php:75
msgid "The account group name must be at least one character long"
-msgstr "Il nome del gruppo account deve essere almeno un carattere a lungo"
+msgstr "Il nome del gruppo account deve essere lungo almeno un carattere"
#: AccountGroups.php:82
-msgid ""
-"The parent account group selected appears to result in a recursive account "
-"structure - select an alternative parent account group or make this group a "
-"top level account group"
-msgstr ""
-"Il gruppo di account principale selezionato sembra comportare una struttura "
-"ricorsiva conto - selezionare un'alternativa gruppo di account "
-"principale o fanno di questo gruppo un gruppo di alto livello di account"
+msgid "The parent account group selected appears to result in a recursive account structure - select an alternative parent account group or make this group a top level account group"
+msgstr "Il gruppo di account principale selezionato sembra comportare una struttura ricorsiva conto - selezionare un'alternativa gruppo di account principale o fanno di questo gruppo un gruppo di alto livello di account"
#: AccountGroups.php:93
msgid "Could not check whether the group is recursive because"
msgstr "Impossibile verificare se il gruppo è ricorsivo perché"
-#: AccountGroups.php:101
-msgid ""
-"Since this account group is a child group, the sequence in the trial "
-"balance, the section in the accounts and whether or not the account group "
-"appears in the balance sheet or profit and loss account are all properties "
-"inherited from the parent account group. Any changes made to these fields "
-"will have no effect."
-msgstr ""
-
-#: AccountGroups.php:106
+#: AccountGroups.php:105
msgid "The section in accounts must be an integer"
msgstr "Il codice del gruppo di conti deve essere un numero intero"
-#: AccountGroups.php:112
+#: AccountGroups.php:111
msgid "The sequence in the trial balance must be an integer"
-msgstr ""
-"Il numero che indica la posizione nel bilancio deve essere un numero intero"
+msgstr "Il numero che indica la posizione nel bilancio deve essere un numero intero"
-#: AccountGroups.php:118
+#: AccountGroups.php:117
msgid "The sequence in the TB must be numeric and less than"
msgstr "La sequenza della TB deve essere numerico e meno"
-#: AccountGroups.php:135
+#: AccountGroups.php:134
msgid "An error occurred in updating the account group"
-msgstr "È verificato un errore nell'aggiornamento del gruppo di account"
+msgstr "Si è verificato un errore nell'aggiornamento del gruppo di account"
-#: AccountGroups.php:136
+#: AccountGroups.php:135
msgid "The SQL that was used to update the account group was"
-msgstr ""
-"Il SQL che è stato utilizzato per aggiornare il gruppo di conto è stato"
+msgstr "Il SQL che è stato utilizzato per aggiornare il gruppo di conto è stato"
-#: AccountGroups.php:138 AccountSections.php:104 PaymentMethods.php:82
+#: AccountGroups.php:137
+#: AccountSections.php:104
+#: PaymentMethods.php:82
msgid "Record Updated"
msgstr "Record aggiornato"
-#: AccountGroups.php:156
+#: AccountGroups.php:155
msgid "An error occurred in inserting the account group"
msgstr "È verificato un errore nel mettere il gruppo di account"
-#: AccountGroups.php:157
+#: AccountGroups.php:156
msgid "The SQL that was used to insert the account group was"
-msgstr ""
-"L'SQL che è stato utilizzato per inserire il gruppo di conto è stato"
+msgstr "L'SQL che è stato utilizzato per inserire il gruppo di conto è stato"
-#: AccountGroups.php:158 AccountSections.php:116 PaymentMethods.php:106
+#: AccountGroups.php:157
+#: AccountSections.php:116
+#: PaymentMethods.php:106
msgid "Record inserted"
msgstr "Record inserito"
-#: AccountGroups.php:175
+#: AccountGroups.php:174
msgid "An error occurred in retrieving the group information from chartmaster"
-msgstr ""
-"È verificato un errore di estrarre le informazioni sul gruppo da chartmaster"
+msgstr "È verificato un errore di estrarre le informazioni sul gruppo da chartmaster"
+#: AccountGroups.php:179
+msgid "Cannot delete this account group because general ledger accounts have been created using this group"
+msgstr "Impossibile eliminare questo gruppo di conti, perché ci sono conti di contabilità generale che sono stati creati utilizzando questo gruppo"
+
#: AccountGroups.php:180
-msgid ""
-"Cannot delete this account group because general ledger accounts have been "
-"created using this group"
-msgstr ""
-"Non ĂŠ possibile cancellare questo conto perchĂŠ ci sono dei sottoconti che "
-"vi fanno riferimento"
-
-#: AccountGroups.php:181 AccountGroups.php:191 AccountSections.php:137
-#: Areas.php:116 Areas.php:125 BankAccounts.php:158 CreditStatus.php:123
-#: Currencies.php:164 Currencies.php:172 Currencies.php:180
-#: CustomerBranches.php:286 CustomerBranches.php:296 CustomerBranches.php:306
-#: CustomerBranches.php:316 Customers.php:312 Customers.php:321
-#: Customers.php:329 Customers.php:337 CustomerTypes.php:147
-#: CustomerTypes.php:157 Factors.php:134 FixedAssetCategories.php:130
-#: GLAccounts.php:80 GLAccounts.php:94 Locations.php:244 Locations.php:252
-#: Locations.php:261 Locations.php:269 Locations.php:277 Locations.php:285
-#: Locations.php:293 Locations.php:301 MRPDemandTypes.php:87
-#: PaymentMethods.php:140 PaymentTerms.php:147 PaymentTerms.php:154
-#: PcExpenses.php:152 SalesCategories.php:125 SalesCategories.php:133
-#: SalesPeople.php:149 SalesPeople.php:156 SalesTypes.php:150
-#: SalesTypes.php:160 Shippers.php:82 Shippers.php:94 StockCategories.php:179
-#: Stocks.php:475 Stocks.php:484 Stocks.php:492 Stocks.php:500 Stocks.php:508
-#: Stocks.php:516 Suppliers.php:609 Suppliers.php:618 Suppliers.php:626
-#: SupplierTypes.php:145 TaxCategories.php:131 TaxGroups.php:127
-#: TaxGroups.php:134 TaxProvinces.php:125 UnitsOfMeasure.php:138
-#: WorkCentres.php:89 WorkCentres.php:95 WWW_Access.php:83
+#: AccountGroups.php:190
+#: AccountSections.php:137
+#: Areas.php:116
+#: Areas.php:125
+#: BankAccounts.php:157
+#: CreditStatus.php:125
+#: Currencies.php:143
+#: Currencies.php:151
+#: Currencies.php:158
+#: CustomerBranches.php:286
+#: CustomerBranches.php:296
+#: CustomerBranches.php:306
+#: CustomerBranches.php:316
+#: Customers.php:311
+#: Customers.php:320
+#: Customers.php:328
+#: Customers.php:336
+#: CustomerTypes.php:147
+#: CustomerTypes.php:157
+#: Factors.php:134
+#: FixedAssetCategories.php:130
+#: GLAccounts.php:80
+#: GLAccounts.php:94
+#: Locations.php:244
+#: Locations.php:252
+#: Locations.php:261
+#: Locations.php:269
+#: Locations.php:277
+#: Locations.php:285
+#: Locations.php:293
+#: Locations.php:301
+#: MRPDemandTypes.php:87
+#: PaymentMethods.php:140
+#: PaymentTerms.php:147
+#: PaymentTerms.php:154
+#: PcExpenses.php:152
+#: SalesCategories.php:125
+#: SalesCategories.php:133
+#: SalesPeople.php:144
+#: SalesPeople.php:151
+#: SalesTypes.php:145
+#: SalesTypes.php:155
+#: Shippers.php:82
+#: Shippers.php:94
+#: StockCategories.php:179
+#: Stocks.php:475
+#: Stocks.php:484
+#: Stocks.php:492
+#: Stocks.php:500
+#: Stocks.php:508
+#: Stocks.php:516
+#: Suppliers.php:609
+#: Suppliers.php:618
+#: Suppliers.php:626
+#: SupplierTypes.php:145
+#: TaxCategories.php:131
+#: TaxGroups.php:127
+#: TaxGroups.php:134
+#: TaxProvinces.php:125
+#: UnitsOfMeasure.php:138
+#: WorkCentres.php:89
+#: WorkCentres.php:95
+#: WWW_Access.php:83
msgid "There are"
msgstr "Ci sono"
-#: AccountGroups.php:181
+#: AccountGroups.php:180
msgid "general ledger accounts that refer to this account group"
msgstr "sottoconti fanno riferimento a questo conto"
-#: AccountGroups.php:185
+#: AccountGroups.php:184
msgid "An error occurred in retrieving the parent group information"
-msgstr ""
-"È verificato un errore di estrarre le informazioni del gruppo di genitore"
+msgstr "È verificato un errore di estrarre le informazioni del gruppo di genitore"
+#: AccountGroups.php:189
+msgid "Cannot delete this account group because it is a parent account group of other account group(s)"
+msgstr "Impossibile eliminare questo gruppo considerazione perché si tratta di un gruppo di account principale del gruppo di altri account"
+
#: AccountGroups.php:190
-msgid ""
-"Cannot delete this account group because it is a parent account group of "
-"other account group(s)"
-msgstr ""
-"Impossibile eliminare questo gruppo considerazione perché si tratta di un "
-"gruppo di account principale del gruppo di altri account (s)"
-
-#: AccountGroups.php:191
msgid "account groups that have this group as its/there parent account group"
-msgstr ""
-"gruppi di account che hanno questo gruppo come il suo / gruppo di "
-"appartenenza ci conto"
+msgstr "gruppi di account che hanno questo gruppo come il suo / gruppo di appartenenza ci conto"
-#: AccountGroups.php:194
+#: AccountGroups.php:193
msgid "An error occurred in deleting the account group"
-msgstr ""
-"È verificato un errore durante l'eliminazione del gruppo di account"
+msgstr "Si è verificato un errore durante l'eliminazione del gruppo di account"
-#: AccountGroups.php:195
+#: AccountGroups.php:194
msgid "The SQL that was used to delete the account group was"
-msgstr ""
-"L'SQL che è stato utilizzato per eliminare il gruppo di conto è stato"
+msgstr "L'SQL che è stato utilizzato per eliminare il gruppo di conto è stato"
-#: AccountGroups.php:197
+#: AccountGroups.php:196
msgid "group has been deleted"
msgstr "e' stato cancellato"
-#: AccountGroups.php:222
+#: AccountGroups.php:221
msgid "The sql that was used to retrieve the account group information was "
-msgstr ""
-"L'SQL che è stato utilizzato per recuperare le informazioni di account "
-"di gruppo è stato "
+msgstr "L'SQL che è stato utilizzato per recuperare le informazioni di account di gruppo è stato "
-#: AccountGroups.php:223
+#: AccountGroups.php:222
msgid "Could not get account groups because"
-msgstr "Non Ê possibile estrarre il piano dei conti perchè"
+msgstr "Non àŠ possibile estrarre il piano dei conti perchè"
-#: AccountGroups.php:225 AccountSections.php:175 AddCustomerContacts.php:25
-#: AddCustomerContacts.php:28 AddCustomerNotes.php:101
-#: AddCustomerTypeNotes.php:95 AgedDebtors.php:454 AgedSuppliers.php:268
-#: Areas.php:144 AuditTrail.php:11 BankReconciliation.php:13
-#: BOMExtendedQty.php:259 BOMIndented.php:246 BOMIndentedReverse.php:236
-#: BOMInquiry.php:171 BOMListing.php:112 BOMs.php:208 BOMs.php:798
-#: COGSGLPostings.php:18 CompanyPreferences.php:153 CounterSales.php:1983
-#: CounterSales.php:2107 Credit_Invoice.php:255 CreditStatus.php:20
-#: Currencies.php:28 CustEDISetup.php:17 DailyBankTransactions.php:10
-#: DebtorsAtPeriodEnd.php:124 DiscountCategories.php:10
-#: DiscountCategories.php:128 DiscountMatrix.php:16 EDIMessageFormat.php:104
-#: FixedAssetLocations.php:9 FixedAssetRegister.php:13
-#: FixedAssetRegister.php:238 FixedAssetTransfer.php:31 FormDesigner.php:129
-#: GLBalanceSheet.php:351 GLBudgets.php:28 GLJournal.php:228
-#: InventoryPlanning.php:374 InventoryPlanningPrefSupplier.php:474
-#: Labels.php:117 Labels.php:273 MRPReport.php:515 OutstandingGRNs.php:150
-#: PcAssignCashToTab.php:56 PcAssignCashToTab.php:130
-#: PcAssignCashToTab.php:146 PcAssignCashToTab.php:183 PDFPickingList.php:28
-#: PDFPrintLabel.php:131 PDFStockLocTransfer.php:21
-#: PO_AuthorisationLevels.php:10 POReport.php:60 POReport.php:64
-#: POReport.php:68 PO_SelectOSPurchOrder.php:133 PricesBasedOnMarkUp.php:11
-#: Prices_Customer.php:39 Prices.php:30 PurchData.php:138 PurchData.php:249
-#: PurchData.php:268 RecurringSalesOrders.php:310 SalesAnalReptCols.php:51
-#: SalesAnalRepts.php:11 SalesCategories.php:11 SalesGLPostings.php:17
-#: SalesGraph.php:34 SalesPeople.php:20 SalesTypes.php:20 SelectAsset.php:45
-#: SelectCompletedOrder.php:11 SelectContract.php:78 SelectCreditItems.php:202
-#: SelectCreditItems.php:270 SelectCustomer.php:323 SelectGLAccount.php:19
-#: SelectGLAccount.php:79 SelectOrderItems.php:618 SelectOrderItems.php:1463
-#: SelectOrderItems.php:1583 SelectProduct.php:485 SelectSalesOrder.php:454
-#: SelectSupplier.php:9 SelectSupplier.php:192 SelectWorkOrder.php:9
-#: SelectWorkOrder.php:145 ShipmentCosting.php:11 Shipments.php:17
-#: Shippers.php:123 Shippers.php:159 Shipt_Select.php:8
-#: StockLocMovements.php:13 StockLocStatus.php:26 Suppliers.php:302
-#: SupplierTenders.php:260 SupplierTenders.php:317 SupplierTransInquiry.php:11
-#: TaxGroups.php:15 TaxProvinces.php:10 TopItems.php:65
-#: WhereUsedInquiry.php:18 WorkCentres.php:110 WorkCentres.php:157
-#: WorkOrderCosting.php:12 WorkOrderEntry.php:10 WorkOrderIssue.php:20
-#: WorkOrderReceive.php:13 WorkOrderStatus.php:41 WWW_Access.php:11
-#: WWW_Users.php:32 Z_BottomUpCosts.php:51
+#: AccountGroups.php:224
+#: AccountSections.php:175
+#: AddCustomerContacts.php:25
+#: AddCustomerContacts.php:28
+#: AddCustomerNotes.php:97
+#: AddCustomerTypeNotes.php:94
+#: AgedDebtors.php:454
+#: AgedSuppliers.php:277
+#: Areas.php:144
+#: AuditTrail.php:11
+#: BankReconciliation.php:13
+#: BOMExtendedQty.php:272
+#: BOMIndented.ph...
[truncated message content] |
