[Web-erp-svn] SF.net SVN: web-erp:[4826] trunk

[<dai...@us...>]

Revision: 4826
          http://web-erp.svn.sourceforge.net/web-erp/?rev=4826&view=rev
Author:   daintree
Date:     2012-01-21 00:49:44 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/CustomerBranches.php
    trunk/StockAdjustments.php
    trunk/doc/Change.log

Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php	2012-01-20 23:11:00 UTC (rev 4825)
+++ trunk/CustomerBranches.php	2012-01-21 00:49:44 UTC (rev 4826)
@@ -85,9 +85,9 @@
 	if (!isset($_POST['EstDeliveryDays'])) {
 		$_POST['EstDeliveryDays']=1;
 	}
-	if (!isset($latitude)) {
-		$latitude=0.0;
-		$longitude=0.0;
+	if (!isset($Latitude)) {
+		$Latitude=0.0;
+		$Longitude=0.0;
 	}
 	if ($_SESSION['geocode_integration']==1 ){
 		// Get the lat/long from our geocoding host
@@ -110,8 +110,8 @@
 			$coordinates = $xml->Response->Placemark->Point->coordinates;
 			$coordinatesSplit = explode(",", $coordinates);
 			// Format: Longitude, Latitude, Altitude
-			$latitude = $coordinatesSplit[1];
-			$longitude = $coordinatesSplit[0];
+			$Latitude = $coordinatesSplit[1];
+			$Longitude = $coordinatesSplit[0];
 			
 			$status = $xml->Response->Status->code;
 			if (strcmp($status, '200') == 0) {
@@ -120,8 +120,8 @@
 				$coordinates = $xml->Response->Placemark->Point->coordinates;
 				$coordinatesSplit = explode(",", $coordinates);
 				// Format: Longitude, Latitude, Altitude
-				$latitude = $coordinatesSplit[1];
-				$longitude = $coordinatesSplit[0];
+				$Latitude = $coordinatesSplit[1];
+				$Longitude = $coordinatesSplit[0];
 			} else {
 				// failure to geocode
 				$geocode_pending = false;
@@ -141,8 +141,8 @@
 						braddress4 = '" . $_POST['BrAddress4'] . "',
 						braddress5 = '" . $_POST['BrAddress5'] . "',
 						braddress6 = '" . $_POST['BrAddress6'] . "',
-						lat = '" . $latitude . "',
-						lng = '" . $longitude . "',
+						lat = '" . $Latitude . "',
+						lng = '" . $Longitude . "',
 						specialinstructions = '" . $_POST['SpecialInstructions'] . "',
 						phoneno='" . $_POST['PhoneNo'] . "',
 						faxno='" . $_POST['FaxNo'] . "',
@@ -209,8 +209,8 @@
 					'" . $_POST['BrAddress4'] . "',
 					'" . $_POST['BrAddress5'] . "',
 					'" . $_POST['BrAddress6'] . "',
-					'" . $latitude . "',
-					'" . $longitude . "',
+					'" . $Latitude . "',
+					'" . $Longitude . "',
 					'" . $_POST['SpecialInstructions'] . "',
 					'" . filter_number_format($_POST['EstDeliveryDays']) . "',
 					'" . $_POST['FwdDate'] . "',
@@ -362,9 +362,9 @@
 	if ($myrow) {
 		echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
                  ' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
-		echo '<table class=selection>';
-		
-		echo '<tr><th>'._('Code').'</th>
+		echo '<table class="selection">
+			<tr>
+				<th>'._('Code').'</th>
 				<th>'._('Name').'</th>
 				<th>'._('Branch Contact').'</th>
 				<th>'._('Salesman').'</th>
@@ -373,7 +373,8 @@
 				<th>'._('Fax No').'</th>
 				<th>'._('Email').'</th>
 				<th>'._('Tax Group').'</th>
-				<th>'._('Enabled?').'</th></tr>';
+				<th>'._('Enabled?').'</th>
+			</tr>';
 
 		$k=0;
 		do {
@@ -425,10 +426,16 @@
 
 		} while ($myrow = DB_fetch_row($result));
 		//END WHILE LIST LOOP
-		echo '</table><br /><table class=selection><tr><td><div class="centre">';
+		echo '</table>
+			<br />
+			<table class="selection">
+			<tr>
+				<td><div class="centre">';
 		echo '<b>'.$TotalEnable.'</b> ' . _('Branches are enabled.') . '<br />';
 		echo '<b>'.$TotalDisable.'</b> ' . _('Branches are disabled.') . '<br />';
-		echo '<b>'.($TotalEnable+$TotalDisable). '</b> ' . _('Total Branches') . '</div></td></tr></table>';
+		echo '<b>'.($TotalEnable+$TotalDisable). '</b> ' . _('Total Branches') . '</div></td>
+			</tr>
+			</table>';
 	} else {
 		$sql = "SELECT debtorsmaster.name,
 						address1,
@@ -577,7 +584,7 @@
 			$_POST['BranchCode']='';
 		}
 		echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
-		echo '<table class=selection>
+		echo '<table class="selection">
 				<tr>
 					<td>'._('Branch Code'). ':</td>
 					<td><input ' .(in_array('BranchCode',$Errors) ?  'class="inputerror"' : '' ) . ' tabindex="1" type="text" name="BranchCode" size="12" maxlength="10" value="' . $_POST['BranchCode'] . '" /></td>

Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php	2012-01-20 23:11:00 UTC (rev 4825)
+++ trunk/StockAdjustments.php	2012-01-21 00:49:44 UTC (rev 4826)
@@ -349,8 +349,11 @@
 	$_SESSION['Adjustment']->StandardCost=$myrow['materialcost']+$myrow['labourcost']+$myrow['overheadcost'];
 	$DecimalPlaces = $myrow['decimalplaces'];
 }
-echo '<br /><table class=selection>';
-echo '<tr><th colspan="4"><font color=blue size=3>'._('Adjustment Details').'</font></th></tr>';
+echo '<br />
+	<table class="selection">
+	<tr>
+		<th colspan="4"><font color=blue size="3">'._('Adjustment Details').'</font></th>
+	</tr>';
 if (!isset($_GET['Description'])) {
 	$_GET['Description']='';
 }

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2012-01-20 23:11:00 UTC (rev 4825)
+++ trunk/doc/Change.log	2012-01-21 00:49:44 UTC (rev 4826)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+20/1/12 Phil: Fixed GetStockPrice API function for effectivty dates
 20/1/12 Vitaly: Changed $DB_error_no($db) to DB_error_no($db) in Z_ChangeStockCode.php
 20/1/12 Vitaly: xhtml fixes in CustomerBranches.php StockAdjustments.php WorkOrderEntry.php
 20/1/12 Tim: Merge tendering system from Tim's branch

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.