web-erp-svn — SVN commits

[Web-erp-svn] SF.net SVN: web-erp:[7280] trunk/includes/DefineSuppTransClass.php

[<ex...@us...>]

Revision: 7280
          http://sourceforge.net/p/web-erp/reponame/7280
Author:   exsonqu
Date:     2015-04-30 04:30:19 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
30/04/15 Exson: Fixed the properties initial bug and tidy code up by fix typo.

Modified Paths:
--------------
    trunk/includes/DefineSuppTransClass.php

Modified: trunk/includes/DefineSuppTransClass.php
===================================================================
--- trunk/includes/DefineSuppTransClass.php	2015-04-26 02:56:42 UTC (rev 7279)
+++ trunk/includes/DefineSuppTransClass.php	2015-04-30 04:30:19 UTC (rev 7280)
@@ -28,7 +28,7 @@
 	var $OvAmount;
 	var $OvGST;
 	var $GLCodesCounter=0;
-	var $ShiptsCounter=0;
+	var $ShiptCounter=0;
 	var $ContractsCounter=0;
 	var $AssetCounter=0;
 	var $TaxGroup;
@@ -36,7 +36,6 @@
 	var $TaxGroupDescription;
 	var $Taxes;
 	var $Hold;
-	var $ShiptCounter;
 
 	function SuppTrans(){
 	/*Constructor function initialises a new Supplier Transaction object */
@@ -46,7 +45,6 @@
 		$this->Contracts = array();
 		$this->Assets = array();
 		$this->Taxes = array();
-		$ShiptCounter = 0;
 	}
 
 	function GetTaxes () {

[Web-erp-svn] SF.net SVN: web-erp:[7279] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7279
          http://sourceforge.net/p/web-erp/reponame/7279
Author:   exsonqu
Date:     2015-04-26 02:56:42 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-26 02:56:08 UTC (rev 7278)
+++ trunk/doc/Change.log	2015-04-26 02:56:42 UTC (rev 7279)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.
 26/04/15 Exson: Comment out the mrpparameters table update in sql file upgrade4.11.3-4.11.4.sql which made a misleading during upgrade and absolutely non-necessary.
 26/4/15 Exson: Fixed the account code cannot be key in directly bug in GLJournal.php. Reported by Akits.
 26/4/15 Exson: Fixed the raw material sellable bug introduced by myself in SelectOrderItems.php.

[Web-erp-svn] SF.net SVN: web-erp:[7278] trunk/StockAdjustments.php

[<ex...@us...>]

Revision: 7278
          http://sourceforge.net/p/web-erp/reponame/7278
Author:   exsonqu
Date:     2015-04-26 02:56:08 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
26/04/15 Exson: Add adjustment reason to the mail text and fixed the notice noise in StockAdjustments.php.

Modified Paths:
--------------
    trunk/StockAdjustments.php

Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php	2015-04-26 02:44:26 UTC (rev 7277)
+++ trunk/StockAdjustments.php	2015-04-26 02:56:08 UTC (rev 7278)
@@ -367,8 +367,8 @@
 		EnsureGLEntriesBalance(17, $AdjustmentNumber,$db);
 
 		$Result = DB_Txn_Commit();
-
-		$ConfirmationText = _('A stock adjustment for'). ' ' . $_SESSION['Adjustment' . $identifier]->StockID . ' -  ' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' '._('has been created from location').' ' . $_SESSION['Adjustment' . $identifier]->StockLocation .' '. _('for a quantity of') . ' ' . locale_number_format($_SESSION['Adjustment' . $identifier]->Quantity,$_SESSION['Adjustment' . $identifier]->DecimalPlaces) ;
+		$AdjustReason = $_SESSION['Adjustment' . $identifier]->Narrative?  _('Narrative') . ' ' . $_SESSION['Adjustment' . $identifier]->Narrative:'';
+		$ConfirmationText = _('A stock adjustment for'). ' ' . $_SESSION['Adjustment' . $identifier]->StockID . ' -  ' . $_SESSION['Adjustment' . $identifier]->ItemDescription . ' '._('has been created from location').' ' . $_SESSION['Adjustment' . $identifier]->StockLocation .' '. _('for a quantity of') . ' ' . locale_number_format($_SESSION['Adjustment' . $identifier]->Quantity,$_SESSION['Adjustment' . $identifier]->DecimalPlaces) . ' ' . $AdjustReason;
 		prnMsg( $ConfirmationText,'success');
 
 		if ($_SESSION['InventoryManagerEmail']!=''){
@@ -454,7 +454,7 @@
 echo '<tr><td>'. _('Adjustment to Stock At Location').':</td>
 		<td><select name="StockLocation" onchange="submit();"> ';
 foreach ($LocationList as $Loccode=>$Locationname){
-	if ($Loccode == $_SESSION['Adjustment' . $identifier]->StockLocation){
+	if (isset($_SESSION['Adjustment'.$identifier]->StockLocation) AND $Loccode == $_SESSION['Adjustment' . $identifier]->StockLocation){
 		 echo '<option selected="selected" value="' . $Loccode . '">' . $Locationname . '</option>';
 	} else {
 		 echo '<option value="' . $Loccode . '">' . $Locationname . '</option>';
@@ -536,4 +536,4 @@
       </div>
       </form>';
 include('includes/footer.inc');
-?>
\ No newline at end of file
+?>

[Web-erp-svn] SF.net SVN: web-erp:[7277] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7277
          http://sourceforge.net/p/web-erp/reponame/7277
Author:   exsonqu
Date:     2015-04-26 02:44:26 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-26 02:43:50 UTC (rev 7276)
+++ trunk/doc/Change.log	2015-04-26 02:44:26 UTC (rev 7277)
@@ -1,4 +1,6 @@
 webERP Change Log
+
+26/04/15 Exson: Comment out the mrpparameters table update in sql file upgrade4.11.3-4.11.4.sql which made a misleading during upgrade and absolutely non-necessary.
 26/4/15 Exson: Fixed the account code cannot be key in directly bug in GLJournal.php. Reported by Akits.
 26/4/15 Exson: Fixed the raw material sellable bug introduced by myself in SelectOrderItems.php.
 19/4/15 RChacon: Remove the class noprint from the image in page_title_text.

[Web-erp-svn] SF.net SVN: web-erp:[7276] trunk/sql/mysql/upgrade4.11.3-4.11.4.sql

[<ex...@us...>]

Revision: 7276
          http://sourceforge.net/p/web-erp/reponame/7276
Author:   exsonqu
Date:     2015-04-26 02:43:50 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
26/04/15 Exson: Comment out the mrpparameters table update in sql file upgrade4.11.3-4.11.4.sql which made a misleading during upgrade and absolutely non-necessary.

Modified Paths:
--------------
    trunk/sql/mysql/upgrade4.11.3-4.11.4.sql

Modified: trunk/sql/mysql/upgrade4.11.3-4.11.4.sql
===================================================================
--- trunk/sql/mysql/upgrade4.11.3-4.11.4.sql	2015-04-26 02:39:34 UTC (rev 7275)
+++ trunk/sql/mysql/upgrade4.11.3-4.11.4.sql	2015-04-26 02:43:50 UTC (rev 7276)
@@ -75,7 +75,7 @@
 		AND locations.loccode = locationusers.loccode
         WHERE locationusers.userid IS NULL;
 
-ALTER TABLE  `mrpparameters` ADD  `userldemands` VARCHAR( 5 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'use RL requirements or not' AFTER  `usemrpdemands`;
+-- ALTER TABLE  `mrpparameters` ADD  `userldemands` VARCHAR( 5 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'use RL requirements or not' AFTER  `usemrpdemands`;
 
 INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('WOCanBeProducedNow.php', '4', 'List of WO items that can be produced with available stock in location');
 INSERT INTO `scripts` ( `script` , `pagesecurity` , `description` ) VALUES ('PrintWOItemSlip.php', '4', 'PDF WO Item production Slip ');

[Web-erp-svn] SF.net SVN: web-erp:[7275] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7275
          http://sourceforge.net/p/web-erp/reponame/7275
Author:   exsonqu
Date:     2015-04-26 02:39:34 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-26 02:38:07 UTC (rev 7274)
+++ trunk/doc/Change.log	2015-04-26 02:39:34 UTC (rev 7275)
@@ -1,4 +1,5 @@
 webERP Change Log
+26/4/15 Exson: Fixed the account code cannot be key in directly bug in GLJournal.php. Reported by Akits.
 26/4/15 Exson: Fixed the raw material sellable bug introduced by myself in SelectOrderItems.php.
 19/4/15 RChacon: Remove the class noprint from the image in page_title_text.
 19/4/15 RChacon: Add ".page_title_text img" as a display none class. This makes unnecessary to add the class noprint to the image in page_title_text.

[Web-erp-svn] SF.net SVN: web-erp:[7274] trunk/GLJournal.php

[<ex...@us...>]

Revision: 7274
          http://sourceforge.net/p/web-erp/reponame/7274
Author:   exsonqu
Date:     2015-04-26 02:38:07 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
26/04/15 Exson: Fixed the account code cannot be key in directly bug in GLJournal.php, reported by Akits.

Modified Paths:
--------------
    trunk/GLJournal.php

Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php	2015-04-26 02:36:16 UTC (rev 7273)
+++ trunk/GLJournal.php	2015-04-26 02:38:07 UTC (rev 7274)
@@ -322,7 +322,7 @@
 if (!isset($_POST['GLManualCode'])) {
 	$_POST['GLManualCode']='';
 }
-echo '<td><input type="text" autofocus="autofocus" name="GLManualCode" maxlength="12" size="12" onchange="inArray(this.value, GLCode.options,'.	"'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'"  /></td>';
+echo '<td><input type="text" autofocus="autofocus" name="GLManualCode" maxlength="12" size="12" onchange="inArray(this, GLCode.options,'.	"'".'The account code '."'".'+ this.value+ '."'".' doesnt exist'."'".')" value="'. $_POST['GLManualCode'] .'"  /></td>';
 
 $sql="SELECT accountcode,
 			accountname

[Web-erp-svn] SF.net SVN: web-erp:[7273] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7273
          http://sourceforge.net/p/web-erp/reponame/7273
Author:   exsonqu
Date:     2015-04-26 02:36:16 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-26 02:33:51 UTC (rev 7272)
+++ trunk/doc/Change.log	2015-04-26 02:36:16 UTC (rev 7273)
@@ -1,5 +1,5 @@
 webERP Change Log
-
+26/4/15 Exson: Fixed the raw material sellable bug introduced by myself in SelectOrderItems.php.
 19/4/15 RChacon: Remove the class noprint from the image in page_title_text.
 19/4/15 RChacon: Add ".page_title_text img" as a display none class. This makes unnecessary to add the class noprint to the image in page_title_text.
 19/4/15 Phil: SelectSupplier - total supplier spend was incorrect only looked at supplier transactions excluding invoices? Now takes invoice net of debit notes reported by Andrew Galuski

[Web-erp-svn] SF.net SVN: web-erp:[7272] trunk/SelectOrderItems.php

[<ex...@us...>]

Revision: 7272
          http://sourceforge.net/p/web-erp/reponame/7272
Author:   exsonqu
Date:     2015-04-26 02:33:51 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
26/04/15 Exson: Fixed raw material sellable broken bug introduced by myself in 6720.

Modified Paths:
--------------
    trunk/SelectOrderItems.php

Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php	2015-04-23 14:00:44 UTC (rev 7271)
+++ trunk/SelectOrderItems.php	2015-04-26 02:33:51 UTC (rev 7272)
@@ -727,9 +727,9 @@
 						custitem.cust_part,
 						custitem.cust_description
 				FROM stockmaster INNER JOIN stockcategory
-				ON stockmaster.categoryid=stockcategory.categoryid
+				ON stockmaster.categoryid=stockcategory.categoryid 
 				" . $IncludeCustItem . "
-				WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L')
+				WHERE (stockcategory.stocktype='F' OR stockcategory.stocktype='D' OR stockcategory.stocktype='L' " . $RawMaterialSellable . ")
 				AND stockmaster.mbflag <>'G'
 				AND stockmaster.discontinued=0 ";
 
@@ -1850,4 +1850,4 @@
 		$result = DB_query($sql,$ErrMsg,$DbgMsg);
 		return $result;
 }
-?>
\ No newline at end of file
+?>

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

[<rc...@us...>]

Revision: 7271
          http://sourceforge.net/p/web-erp/reponame/7271
Author:   rchacon
Date:     2015-04-23 14:00:44 +0000 (Thu, 23 Apr 2015)
Log Message:
-----------
Add noprint and other minor changes.

Modified Paths:
--------------
    trunk/Locations.php
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po

Modified: trunk/Locations.php
===================================================================
--- trunk/Locations.php	2015-04-21 14:26:58 UTC (rev 7270)
+++ trunk/Locations.php	2015-04-23 14:00:44 UTC (rev 7271)
@@ -1,21 +1,26 @@
 <?php
 /* $Id$*/
+/* Defines the inventory stocking locations or warehouses */
 
 include('includes/session.inc');
-$Title = _('Location Maintenance');
-$ViewTopic = 'Inventory';// Filename in ManualContents.php's TOC.
+$Title = _('Location Maintenance');// Screen identification.
+$ViewTopic = 'Inventory';// Filename's id in ManualContents.php's TOC.
 $BookMark = 'Locations';// Anchor's id in the manual's html document.
 include('includes/header.inc');
+echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
+	'/images/supplier.png" title="' .// Icon image.
+	_('Inventory') . '" /> ' .// Icon title.
+	_('Location Maintenance') . '</p>';// Page title.
 
 include('includes/CountriesArray.php');
 
-if (isset($_GET['SelectedLocation'])){
+if(isset($_GET['SelectedLocation'])) {
 	$SelectedLocation = $_GET['SelectedLocation'];
-} elseif (isset($_POST['SelectedLocation'])){
+} elseif(isset($_POST['SelectedLocation'])) {
 	$SelectedLocation = $_POST['SelectedLocation'];
 }
 
-if (isset($_POST['submit'])) {
+if(isset($_POST['submit'])) {
 	$_POST['Managed']='off';
 	//initialise no input errors assumed initially before we test
 	$InputError = 0;
@@ -24,13 +29,13 @@
 	ie the page has called itself with some user input */
 
 	$_POST['LocCode']=mb_strtoupper($_POST['LocCode']);
-	if( trim($_POST['LocCode']) == '' ) {
+	if(trim($_POST['LocCode']) == '') {
 		$InputError = 1;
-		prnMsg( _('The location code may not be empty'), 'error');
+		prnMsg(_('The location code may not be empty'), 'error');
 	}
-	if ($_POST['CashSaleCustomer']!=''){
+	if($_POST['CashSaleCustomer']!='') {
 
-		if ($_POST['CashSaleBranch']==''){
+		if($_POST['CashSaleBranch']=='') {
 			prnMsg(_('A cash sale customer and branch are necessary to fully setup the counter sales functionality'),'error');
 			$InputError =1;
 		} else { //customer branch is set too ... check it ties up with a valid customer
@@ -39,17 +44,17 @@
 					AND branchcode='" . $_POST['CashSaleBranch'] . "'";
 
 			$result = DB_query($sql);
-			if (DB_num_rows($result)==0){
+			if(DB_num_rows($result)==0) {
 				$InputError = 1;
 				prnMsg(_('The cash sale customer for this location must be defined with both a valid customer code and a valid branch code for this customer'),'error');
 			}
 		}
 	} //end of checking the customer - branch code entered
 
-	if (isset($SelectedLocation) AND $InputError !=1) {
+	if(isset($SelectedLocation) AND $InputError !=1) {
 
 		/* Set the managed field to 1 if it is checked, otherwise 0 */
-		if(isset($_POST['Managed']) and $_POST['Managed'] == 'on'){
+		if(isset($_POST['Managed']) and $_POST['Managed'] == 'on') {
 			$_POST['Managed'] = 1;
 		} else {
 			$_POST['Managed'] = 0;
@@ -80,7 +85,7 @@
 
 		$result = DB_query($sql,$ErrMsg,$DbgMsg);
 
-		prnMsg( _('The location record has been updated'),'success');
+		prnMsg(_('The location record has been updated'),'success');
 		unset($_POST['LocCode']);
 		unset($_POST['LocationName']);
 		unset($_POST['DelAdd1']);
@@ -102,7 +107,7 @@
 		unset($_POST['UsedForWO']);
 
 
-	} elseif ($InputError !=1) {
+	} elseif($InputError !=1) {
 
 		/* Set the managed field to 1 if it is checked, otherwise 0 */
 		if($_POST['Managed'] == 'on') {
@@ -154,7 +159,7 @@
 		$DbgMsg =  _('The SQL used to insert the location record was');
 		$result = DB_query($sql,$ErrMsg,$DbgMsg);
 
-		prnMsg( _('The new location record has been added'),'success');
+		prnMsg(_('The new location record has been added'),'success');
 
 	/* Also need to add LocStock records for all existing stock items */
 
@@ -221,19 +226,19 @@
 
 	$DispTaxProvincesResult = DB_query("SELECT taxprovinceid FROM locations");
 	$TaxCatsResult = DB_query("SELECT taxcatid FROM taxcategories");
-	if (DB_num_rows($TaxCatsResult) > 0 ) { // This will only work if there are levels else we get an error on seek.
+	if(DB_num_rows($TaxCatsResult) > 0) { // This will only work if there are levels else we get an error on seek.
 
-		while ($myrow=DB_fetch_row($DispTaxProvincesResult)){
+		while ($myrow=DB_fetch_row($DispTaxProvincesResult)) {
 			/*Check to see there are TaxAuthRates records set up for this TaxProvince */
 			$NoTaxRates = DB_query("SELECT taxauthority FROM taxauthrates WHERE dispatchtaxprovince='" . $myrow[0] . "'");
 
-			if (DB_num_rows($NoTaxRates) < $NoTaxAuths[0]){
+			if(DB_num_rows($NoTaxRates) < $NoTaxAuths[0]) {
 
 				/*First off delete any tax authoritylevels already existing */
 				$DelTaxAuths = DB_query("DELETE FROM taxauthrates WHERE dispatchtaxprovince='" . $myrow[0] . "'");
 
 				/*Now add the new TaxAuthRates required */
-				while ($CatRow = DB_fetch_row($TaxCatsResult)){
+				while ($CatRow = DB_fetch_row($TaxCatsResult)) {
 					$sql = "INSERT INTO taxauthrates (taxauthority,
 										dispatchtaxprovince,
 										taxcatid)
@@ -250,7 +255,7 @@
 	}
 
 
-} elseif (isset($_GET['delete'])) {
+} elseif(isset($_GET['delete'])) {
 //the link to delete a selected record was clicked instead of the submit button
 
 	$CancelDelete = 0;
@@ -259,17 +264,17 @@
 	$sql= "SELECT COUNT(*) FROM salesorders WHERE fromstkloc='". $SelectedLocation . "'";
 	$result = DB_query($sql);
 	$myrow = DB_fetch_row($result);
-	if ($myrow[0]>0) {
+	if($myrow[0]>0) {
 		$CancelDelete = 1;
-		prnMsg( _('Cannot delete this location because sales orders have been created delivering from this location'),'warn');
+		prnMsg(_('Cannot delete this location because sales orders have been created delivering from this location'),'warn');
 		echo  _('There are') . ' ' . $myrow[0] . ' ' . _('sales orders with this Location code');
 	} else {
 		$sql= "SELECT COUNT(*) FROM stockmoves WHERE stockmoves.loccode='" . $SelectedLocation . "'";
 		$result = DB_query($sql);
 		$myrow = DB_fetch_row($result);
-		if ($myrow[0]>0) {
+		if($myrow[0]>0) {
 			$CancelDelete = 1;
-			prnMsg( _('Cannot delete this location because stock movements have been created using this location'),'warn');
+			prnMsg(_('Cannot delete this location because stock movements have been created using this location'),'warn');
 			echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('stock movements with this Location code');
 
 		} else {
@@ -278,7 +283,7 @@
 					AND locstock.quantity !=0";
 			$result = DB_query($sql);
 			$myrow = DB_fetch_row($result);
-			if ($myrow[0]>0) {
+			if($myrow[0]>0) {
 				$CancelDelete = 1;
 				prnMsg(_('Cannot delete this location because location stock records exist that use this location and have a quantity on hand not equal to 0'),'warn');
 				echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('stock items with stock on hand at this location code');
@@ -287,7 +292,7 @@
 						WHERE www_users.defaultlocation='" . $SelectedLocation . "'";
 				$result = DB_query($sql);
 				$myrow = DB_fetch_row($result);
-				if ($myrow[0]>0) {
+				if($myrow[0]>0) {
 					$CancelDelete = 1;
 					prnMsg(_('Cannot delete this location because it is the default location for a user') . '. ' . _('The user record must be modified first'),'warn');
 					echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('users using this location as their default location');
@@ -296,7 +301,7 @@
 							WHERE bom.loccode='" . $SelectedLocation . "'";
 					$result = DB_query($sql);
 					$myrow = DB_fetch_row($result);
-					if ($myrow[0]>0) {
+					if($myrow[0]>0) {
 						$CancelDelete = 1;
 						prnMsg(_('Cannot delete this location because it is the default location for a bill of material') . '. ' . _('The bill of materials must be modified first'),'warn');
 						echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('bom components using this location');
@@ -305,25 +310,25 @@
 								WHERE workcentres.location='" . $SelectedLocation . "'";
 						$result = DB_query($sql);
 						$myrow = DB_fetch_row($result);
-						if ($myrow[0]>0) {
+						if($myrow[0]>0) {
 							$CancelDelete = 1;
-							prnMsg( _('Cannot delete this location because it is used by some work centre records'),'warn');
+							prnMsg(_('Cannot delete this location because it is used by some work centre records'),'warn');
 							echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('works centres using this location');
 						} else {
 							$sql= "SELECT COUNT(*) FROM workorders
 									WHERE workorders.loccode='" . $SelectedLocation . "'";
 							$result = DB_query($sql);
 							$myrow = DB_fetch_row($result);
-							if ($myrow[0]>0) {
+							if($myrow[0]>0) {
 								$CancelDelete = 1;
-								prnMsg( _('Cannot delete this location because it is used by some work order records'),'warn');
+								prnMsg(_('Cannot delete this location because it is used by some work order records'),'warn');
 								echo '<br />' . _('There are') . ' ' . $myrow[0] . ' ' . _('work orders using this location');
 							} else {
 								$sql= "SELECT COUNT(*) FROM custbranch
 										WHERE custbranch.defaultlocation='" . $SelectedLocation . "'";
 								$result = DB_query($sql);
 								$myrow = DB_fetch_row($result);
-								if ($myrow[0]>0) {
+								if($myrow[0]>0) {
 									$CancelDelete = 1;
 									prnMsg(_('Cannot delete this location because it is used by some branch records as the default location to deliver from'),'warn');
 									echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('branches set up to use this location by default');
@@ -331,7 +336,7 @@
 									$sql= "SELECT COUNT(*) FROM purchorders WHERE intostocklocation='" . $SelectedLocation . "'";
 									$result = DB_query($sql);
 									$myrow = DB_fetch_row($result);
-									if ($myrow[0]>0) {
+									if($myrow[0]>0) {
 										$CancelDelete = 1;
 										prnMsg(_('Cannot delete this location because it is used by some purchase order records as the location to receive stock into'),'warn');
 										echo '<br /> ' . _('There are') . ' ' . $myrow[0] . ' ' . _('purchase orders set up to use this location as the receiving location');
@@ -344,7 +349,7 @@
 			}
 		}
 	}
-	if (! $CancelDelete) {
+	if(! $CancelDelete) {
 
 		/* need to figure out if this location is the only one in the same tax province */
 		$result = DB_query("SELECT taxprovinceid FROM locations
@@ -353,7 +358,7 @@
 		$result = DB_query("SELECT COUNT(taxprovinceid) FROM locations
 							WHERE taxprovinceid='" .$TaxProvinceRow[0] . "'");
 		$TaxProvinceCount = DB_fetch_row($result);
-		if ($TaxProvinceCount[0]==1){
+		if($TaxProvinceCount[0]==1) {
 		/* if its the only location in this tax authority then delete the appropriate records in TaxAuthLevels */
 			$result = DB_query("DELETE FROM taxauthrates
 								WHERE dispatchtaxprovince='" . $TaxProvinceRow[0] . "'");
@@ -363,14 +368,14 @@
 		$result = DB_query("DELETE FROM locationusers WHERE loccode='" . $SelectedLocation . "'");
 		$result = DB_query("DELETE FROM locations WHERE loccode='" . $SelectedLocation . "'");
 
-		prnMsg( _('Location') . ' ' . $SelectedLocation . ' ' . _('has been deleted') . '!', 'success');
+		prnMsg(_('Location') . ' ' . $SelectedLocation . ' ' . _('has been deleted') . '!', 'success');
 		unset ($SelectedLocation);
 	} //end if Delete Location
 	unset($SelectedLocation);
 	unset($_GET['delete']);
 }
 
-if (!isset($SelectedLocation)) {
+if(!isset($SelectedLocation)) {
 
 /* It could still be the second time the page has been run and a record has been selected for modification - SelectedLocation will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
 then none of the above are true and the list of Locations will be displayed with
@@ -385,22 +390,21 @@
 			ON locations.taxprovinceid=taxprovinces.taxprovinceid";
 	$result = DB_query($sql);
 
-	if (DB_num_rows($result)==0){
+	if(DB_num_rows($result)==0) {
 		prnMsg (_('There are no locations that match up with a tax province record to display. Check that tax provinces are set up for all dispatch locations'),'error');
 	}
-	echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' .
-			_('Inventory') . '" alt="" />' . ' ' . $Title . '</p>';
 
 	echo '<table class="selection">';
 	echo '<tr>
 			<th class="ascending">' . _('Location Code') . '</th>
 			<th class="ascending">' . _('Location Name') . '</th>
 			<th class="ascending">' . _('Tax Province') . '</th>
+			<th class="noprint" colspan="2">&nbsp;</th>
 		</tr>';
 
 $k=0; //row colour counter
 while ($myrow = DB_fetch_array($result)) {
-	if ($k==1){
+	if($k==1) {
 		echo '<tr class="EvenTableRows">';
 		$k=0;
 	} else {
@@ -417,16 +421,14 @@
 	printf('<td>%s</td>
 			<td>%s</td>
 			<td>%s</td>
-			<td><a href="%sSelectedLocation=%s">' . _('Edit') . '</a></td>
-			<td><a href="%sSelectedLocation=%s&amp;delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this inventory location?') . '\');">' . _('Delete') . '</a></td>
+			<td class="noprint"><a href="%sSelectedLocation=%s">' . _('Edit') . '</a></td>
+			<td class="noprint"><a href="%sSelectedLocation=%s&amp;delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this inventory location?') . '\');">' . _('Delete') . '</a></td>
 			</tr>',
 			$myrow['loccode'],
 			$myrow['locationname'],
 			$myrow['description'],
-			htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
-			$myrow['loccode'],
-			htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
-			$myrow['loccode']);
+			htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?', $myrow['loccode'],
+			htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?', $myrow['loccode']);
 
 	}
 	//END WHILE LIST LOOP
@@ -436,21 +438,19 @@
 //end of ifs and buts!
 
 echo '<br />';
-if (isset($SelectedLocation)) {
+if(isset($SelectedLocation)) {
 	echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Review Records') . '</a>';
 }
 echo '<br />';
 
-if (!isset($_GET['delete'])) {
+if(!isset($_GET['delete'])) {
 
 	echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
     echo '<div>';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
-	if (isset($SelectedLocation)) {
+	if(isset($SelectedLocation)) {
 		//editing an existing Location
-		echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/supplier.png" title="' .
-			_('Inventory') . '" alt="" />' . ' ' . $Title . '</p>';
 
 		$sql = "SELECT loccode,
 					locationname,
@@ -507,7 +507,7 @@
 				<td>' . $_POST['LocCode'] . '</td>
 			</tr>';
 	} else { //end of if $SelectedLocation only do the else when a new record is being entered
-		if (!isset($_POST['LocCode'])) {
+		if(!isset($_POST['LocCode'])) {
 			$_POST['LocCode'] = '';
 		}
 		echo '<table class="selection">
@@ -519,46 +519,46 @@
 				<td><input type="text" autofocus="autofocus" required="required" title="' . _('Enter up to five characters for the inventory location code') . '" data-type="no-illegal-chars" name="LocCode" value="' . $_POST['LocCode'] . '" size="5" maxlength="5" /></td>
 			</tr>';
 	}
-	if (!isset($_POST['LocationName'])) {
+	if(!isset($_POST['LocationName'])) {
 		$_POST['LocationName'] = '';
 	}
-	if (!isset($_POST['Contact'])) {
+	if(!isset($_POST['Contact'])) {
 		$_POST['Contact'] = '';
 	}
-	if (!isset($_POST['DelAdd1'])) {
+	if(!isset($_POST['DelAdd1'])) {
 		$_POST['DelAdd1'] = ' ';
 	}
-	if (!isset($_POST['DelAdd2'])) {
+	if(!isset($_POST['DelAdd2'])) {
 		$_POST['DelAdd2'] = '';
 	}
-	if (!isset($_POST['DelAdd3'])) {
+	if(!isset($_POST['DelAdd3'])) {
 		$_POST['DelAdd3'] = '';
 	}
-	if (!isset($_POST['DelAdd4'])) {
+	if(!isset($_POST['DelAdd4'])) {
 		$_POST['DelAdd4'] = '';
 	}
-	if (!isset($_POST['DelAdd5'])) {
+	if(!isset($_POST['DelAdd5'])) {
 		$_POST['DelAdd5'] = '';
 	}
-	if (!isset($_POST['DelAdd6'])) {
+	if(!isset($_POST['DelAdd6'])) {
 		$_POST['DelAdd6'] = '';
 	}
-	if (!isset($_POST['Tel'])) {
+	if(!isset($_POST['Tel'])) {
 		$_POST['Tel'] = '';
 	}
-	if (!isset($_POST['Fax'])) {
+	if(!isset($_POST['Fax'])) {
 		$_POST['Fax'] = '';
 	}
-	if (!isset($_POST['Email'])) {
+	if(!isset($_POST['Email'])) {
 		$_POST['Email'] = '';
 	}
-	if (!isset($_POST['CashSaleCustomer'])) {
+	if(!isset($_POST['CashSaleCustomer'])) {
 		$_POST['CashSaleCustomer'] = '';
 	}
-	if (!isset($_POST['CashSaleBranch'])) {
+	if(!isset($_POST['CashSaleBranch'])) {
 		$_POST['CashSaleBranch'] = '';
 	}
-	if (!isset($_POST['Managed'])) {
+	if(!isset($_POST['Managed'])) {
 		$_POST['Managed'] = 0;
 	}
 
@@ -593,10 +593,10 @@
 		<tr>
 			<td>' . _('Country') . ':</td>
 			<td><select name="DelAdd6">';
-		foreach ($CountriesArray as $CountryEntry => $CountryName){
-			if (isset($_POST['DelAdd6']) AND (strtoupper($_POST['DelAdd6']) == strtoupper($CountryName))){
+		foreach ($CountriesArray as $CountryEntry => $CountryName) {
+			if(isset($_POST['DelAdd6']) AND (strtoupper($_POST['DelAdd6']) == strtoupper($CountryName))) {
 				echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName  . '</option>';
-			}elseif (!isset($_POST['Address6']) AND $CountryName == "") {
+			}elseif(!isset($_POST['Address6']) AND $CountryName == "") {
 				echo '<option selected="selected" value="' . $CountryName . '">' . $CountryName  . '</option>';
 			} else {
 				echo '<option value="' . $CountryName . '">' . $CountryName  . '</option>';
@@ -621,8 +621,8 @@
 			<td><select name="TaxProvince">';
 
 	$TaxProvinceResult = DB_query("SELECT taxprovinceid, taxprovincename FROM taxprovinces");
-	while ($myrow=DB_fetch_array($TaxProvinceResult)){
-		if ($_POST['TaxProvince']==$myrow['taxprovinceid']){
+	while ($myrow=DB_fetch_array($TaxProvinceResult)) {
+		if($_POST['TaxProvince']==$myrow['taxprovinceid']) {
 			echo '<option selected="selected" value="' . $myrow['taxprovinceid'] . '">' . $myrow['taxprovincename'] . '</option>';
 		} else {
 			echo '<option value="' . $myrow['taxprovinceid'] . '">' . $myrow['taxprovincename'] . '</option>';
@@ -642,12 +642,12 @@
 	echo '<tr>
 			<td>' . _('Allow internal requests?') . ':</td>
 			<td><select name="InternalRequest">';
-	if ($_POST['InternalRequest']==1){
+	if($_POST['InternalRequest']==1) {
 		echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
 	} else {
 		echo '<option value="1">' . _('Yes') . '</option>';
 	}
-	if ($_POST['InternalRequest']==0){
+	if($_POST['InternalRequest']==0) {
 		echo '<option selected="selected" value="0">' . _('No') . '</option>';
 	} else {
 		echo '<option value="0">' . _('No') . '</option>';
@@ -657,12 +657,12 @@
 	echo '<tr>
 			<td>' . _('Use for Work Order Productions?') . ':</td>
 			<td><select name="UsedForWO">';
-	if ($_POST['UsedForWO']==1){
+	if($_POST['UsedForWO']==1) {
 		echo '<option selected="selected" value="1">' . _('Yes') . '</option>';
 	} else {
 		echo '<option value="1">' . _('Yes') . '</option>';
 	}
-	if ($_POST['UsedForWO']==0){
+	if($_POST['UsedForWO']==0) {
 		echo '<option selected="selected" value="0">' . _('No') . '</option>';
 	} else {
 		echo '<option value="0">' . _('No') . '</option>';

Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2015-04-21 14:26:58 UTC (rev 7270)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2015-04-23 14:00:44 UTC (rev 7271)
@@ -8,7 +8,7 @@
 "Project-Id-Version: webERP 4.12.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-02-24 17:34-0600\n"
-"PO-Revision-Date: 2015-03-23 18:29-0600\n"
+"PO-Revision-Date: 2015-04-23 07:53-0600\n"
 "Last-Translator: Rafael Chacon <raf...@gm...>\n"
 "Language-Team: TecnoSoluciones.com <web...@te...>\n"
 "Language: es_ES\n"
@@ -13211,7 +13211,7 @@
 
 #: FixedAssetLocations.php:98 FixedAssetLocations.php:121
 msgid "Location ID"
-msgstr "ID de Ubicación"
+msgstr "ID de ubicación"
 
 #: FixedAssetLocations.php:99 FixedAssetLocations.php:131
 msgid "Location Description"
@@ -16022,7 +16022,7 @@
 #: InternalStockRequestAuthorisation.php:70
 #: InternalStockRequestFulfill.php:288
 msgid "Location Of Stock"
-msgstr "Ubicación de la Existencia: "
+msgstr "Ubicación del inventario"
 
 #: InternalStockRequestAuthorisation.php:71
 #: InternalStockRequestFulfill.php:289
@@ -16704,7 +16704,7 @@
 
 #: Locations.php:5
 msgid "Location Maintenance"
-msgstr "Administrar Ubicaciones"
+msgstr "Administrar ubicaciones"
 
 #: Locations.php:29
 msgid "The location code may not be empty"
@@ -16917,11 +16917,11 @@
 #: Locations.php:396 Locations.php:506 Locations.php:518
 #: api/api_xml-rpc.php:876
 msgid "Location Code"
-msgstr "Código Localidad"
+msgstr "Código de ubicación"
 
 #: Locations.php:397 Locations.php:566
 msgid "Location Name"
-msgstr "Nombre Localidad"
+msgstr "Nombre de ubicación"
 
 #: Locations.php:398 Locations.php:620 TaxAuthorityRates.php:81
 #: TaxProvinces.php:165
@@ -16943,7 +16943,7 @@
 
 #: Locations.php:515
 msgid "New Location details"
-msgstr "Detalles Nueva Ubicación"
+msgstr "Detalles de nueva ubicación"
 
 #: Locations.php:519
 msgid "Enter up to five characters for the inventory location code"
@@ -18328,7 +18328,7 @@
 
 #: NoSalesItems.php:195
 msgid "Location QOH"
-msgstr "Ubicación"
+msgstr "Ubicación de la disponibilidad"
 
 #: NoSalesItems.php:196
 msgid "Total QOH"
@@ -19389,7 +19389,7 @@
 
 #: PDFPeriodStockTransListing.php:44 includes/DatabaseTranslations.php:30
 msgid "Location Transfer"
-msgstr "Transferencia de Localidad"
+msgstr "Transferencia de ubicación"
 
 #: PDFPeriodStockTransListing.php:45 includes/DatabaseTranslations.php:31
 msgid "Stock Adjustment"
@@ -19437,7 +19437,7 @@
 
 #: PDFPeriodStockTransListing.php:169 SelectProduct.php:405
 msgid "Location Transfers"
-msgstr "Transferencias de localidad"
+msgstr "Transferencias de ubicación"
 
 #: PDFPeriodStockTransListing.php:172 StockAdjustments.php:8
 msgid "Stock Adjustments"
@@ -31752,7 +31752,7 @@
 
 #: StockLocTransferReceive.php:454
 msgid "Location Transfer Reference"
-msgstr "Referencia de Ubicación de transferencia"
+msgstr "Referencia de transferencia de ubicación"
 
 #: StockLocTransferReceive.php:460
 msgid "Quantity Dispatched"
@@ -40106,7 +40106,7 @@
 
 #: Z_ChangeLocationCode.php:244
 msgid "Location code"
-msgstr "Código de Localidad"
+msgstr "Código de ubicación"
 
 #: Z_ChangeLocationCode.php:255
 msgid "Existing Location Code"
@@ -43018,7 +43018,7 @@
 
 #: api/api_errorcodes.php:215
 msgid "Location Code Not Setup"
-msgstr "Código de Localidad no Configurado"
+msgstr "Código de ubicación sin configurar"
 
 #: api/api_errorcodes.php:216
 msgid "Tax Group Id Not Setup"
@@ -46023,7 +46023,7 @@
 
 #: includes/PDFInventoryValnPageHeader.inc:15
 msgid "location"
-msgstr "Ubicación"
+msgstr "ubicación"
 
 #: includes/PDFLowGPPageHeader.inc:15
 msgid "Low GP Sales Between"

[Web-erp-svn] SF.net SVN: web-erp:[7270] trunk/Dashboard.php

[<aga...@us...>]

Revision: 7270
          http://sourceforge.net/p/web-erp/reponame/7270
Author:   agaluski
Date:     2015-04-21 14:26:58 +0000 (Tue, 21 Apr 2015)
Log Message:
-----------
Moved total initialization so that Grand Total is not total for last supplier

Modified Paths:
--------------
    trunk/Dashboard.php

Modified: trunk/Dashboard.php
===================================================================
--- trunk/Dashboard.php	2015-04-20 12:44:02 UTC (rev 7269)
+++ trunk/Dashboard.php	2015-04-21 14:26:58 UTC (rev 7270)
@@ -398,7 +398,8 @@
 	$SupplierID ='';
 	$TotalPayments = 0;
 	$TotalAccumDiffOnExch = 0;
-
+	$AccumBalance =0;
+	
 	while ($SuppliersToPay = DB_fetch_array($SuppliersResult)){
 
 		$CurrDecimalPlaces = $SuppliersToPay['currdecimalplaces'];
@@ -445,7 +446,6 @@
 		unset($Allocs);
 		$Allocs = array();
 		$AllocCounter =0;
-		$AccumBalance =0;
 		$k=0; //row colour counter
 
 		while ($DetailTrans = DB_fetch_array($TransResult)){

[Web-erp-svn] SF.net SVN: web-erp:[7269] trunk/SelectSupplier.php

[<aga...@us...>]

Revision: 7269
          http://sourceforge.net/p/web-erp/reponame/7269
Author:   agaluski
Date:     2015-04-20 12:44:02 +0000 (Mon, 20 Apr 2015)
Log Message:
-----------
Fix SQL (change '==' to '=')

Modified Paths:
--------------
    trunk/SelectSupplier.php

Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php	2015-04-19 14:57:47 UTC (rev 7268)
+++ trunk/SelectSupplier.php	2015-04-20 12:44:02 UTC (rev 7269)
@@ -371,7 +371,7 @@
 			$DataResult = DB_query($sql, $ErrMsg);
 			$myrow = DB_fetch_array($DataResult);
 			// Select some more data about the supplier
-			$SQL = "SELECT SUM(ovamount) AS total FROM supptrans WHERE supplierno = '" . $_SESSION['SupplierID'] . "' AND (type == '20' OR type='21')";
+			$SQL = "SELECT SUM(ovamount) AS total FROM supptrans WHERE supplierno = '" . $_SESSION['SupplierID'] . "' AND (type = '20' OR type='21')";
 			$Total1Result = DB_query($SQL);
 			$row = DB_fetch_array($Total1Result);
 			echo '<br />';

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

[<rc...@us...>]

Revision: 7268
          http://sourceforge.net/p/web-erp/reponame/7268
Author:   rchacon
Date:     2015-04-19 14:57:47 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
Remove the class noprint from the image in page_title_text.

Modified Paths:
--------------
    trunk/DailyBankTransactions.php
    trunk/GLBalanceSheet.php
    trunk/GLProfit_Loss.php
    trunk/GLTrialBalance.php
    trunk/doc/Change.log

Modified: trunk/DailyBankTransactions.php
===================================================================
--- trunk/DailyBankTransactions.php	2015-04-19 13:40:59 UTC (rev 7267)
+++ trunk/DailyBankTransactions.php	2015-04-19 14:57:47 UTC (rev 7268)
@@ -23,7 +23,7 @@
 	$DbgMsg = _('The SQL used to retrieve the bank accounts was');
 	$AccountsResults = DB_query($SQL,$ErrMsg,$DbgMsg);
 
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/bank.png" title="' .// Icon image.
 		_('Bank Transactions Inquiry') . '" /> ' .// Icon title.
 		_('Bank Transactions Inquiry') . '</p>';// Page title.
@@ -115,7 +115,7 @@
 	$result = DB_query($sql);
 
 	if (DB_num_rows($result)==0) {
-		echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+		echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 			'/images/bank.png" title="' .// Icon image.
 			_('Bank Transactions Inquiry') . '" /> ' .// Icon title.
 			_('Bank Transactions Inquiry') . '</p>';// Page title.
@@ -123,7 +123,7 @@
 	} else {
 		$BankDetailRow = DB_fetch_array($BankResult);
 		echo '<div id="Report">';// Division to identify the report block.
-		echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+		echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 			'/images/bank.png" title="' .// Icon image.
 			_('Bank Transactions Inquiry') . '" /> ' .// Icon title.
 			_('Account Transactions For').'<br />'.$BankDetailRow['bankaccountname'].'<br />'.

Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php	2015-04-19 13:40:59 UTC (rev 7267)
+++ trunk/GLBalanceSheet.php	2015-04-19 14:57:47 UTC (rev 7268)
@@ -17,7 +17,7 @@
 
 	/*Show a form to allow input of criteria for TB to show */
 	include('includes/header.inc');
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/printer.png" title="' .// Icon image.
 		_('Print Statement of Financial Position') . '" /> ' .// Icon title.
 		_('Balance Sheet') . '</p>';// Page title.
@@ -392,7 +392,7 @@
 	// Page title as IAS1 numerals 10 and 51:
 	include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
 	echo '<div id="Report">';// Division to identify the report block.
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/gl.png" title="' .// Icon image.
 		_('Statement of Financial Position') . '" /> ' .// Icon title.
 		_('Balance Sheet') . '<br />' .// Page title, reporting statement.

Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php	2015-04-19 13:40:59 UTC (rev 7267)
+++ trunk/GLProfit_Loss.php	2015-04-19 14:57:47 UTC (rev 7268)
@@ -20,7 +20,7 @@
 		OR isset($_POST['SelectADifferentPeriod'])){
 
 	include('includes/header.inc');
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/printer.png" title="' .// Icon image.
 		_('Print Statement of Comprehensive Income') . '" /> ' .// Icon title.
 		_('Print Profit and Loss Report') . '</p>';// Page title.
@@ -613,7 +613,7 @@
 	// Page title as IAS1 numerals 10 and 51:
 	include_once('includes/CurrenciesArray.php');// Array to retrieve currency name.
 	echo '<div id="Report">';// Division to identify the report block.
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/gl.png" title="' .// Icon image.
 		_('Statement of Comprehensive Income') . '" /> ' .// Icon title.
 		_('Profit and Loss Statement') . '<br />' .// Page title, reporting statement.

Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php	2015-04-19 13:40:59 UTC (rev 7267)
+++ trunk/GLTrialBalance.php	2015-04-19 14:57:47 UTC (rev 7268)
@@ -29,7 +29,7 @@
 	OR isset($_POST['SelectADifferentPeriod'])){
 
 	include  ('includes/header.inc');
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/printer.png" title="' .// Icon image.
 		_('Print Trial Balance') . '" /> ' .// Icon title.
 		_('Trial Balance') . '</p>';// Page title.
@@ -433,7 +433,7 @@
 
 	$AccountsResult = DB_query($SQL, _('No general ledger accounts were returned by the SQL because'), _('The SQL that failed was:'));
 
-	echo '<p class="page_title_text"><img alt="" class="noprint" src="'.$RootPath.'/css/'.$Theme.
+	echo '<p class="page_title_text"><img alt="" src="'.$RootPath.'/css/'.$Theme.
 		'/images/gl.png" title="' .// Icon image.
 		_('Trial Balance') . '" /> ' .// Icon title.
 		_('Trial Balance for the month of ') . $PeriodToDate . '<br />' .

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-19 13:40:59 UTC (rev 7267)
+++ trunk/doc/Change.log	2015-04-19 14:57:47 UTC (rev 7268)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+19/4/15 RChacon: Remove the class noprint from the image in page_title_text.
 19/4/15 RChacon: Add ".page_title_text img" as a display none class. This makes unnecessary to add the class noprint to the image in page_title_text.
 19/4/15 Phil: SelectSupplier - total supplier spend was incorrect only looked at supplier transactions excluding invoices? Now takes invoice net of debit notes reported by Andrew Galuski
 07/4/15 Exson: Fixed the Wiki link broken bug in SystemParameters.php.

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

[<rc...@us...>]

Revision: 7267
          http://sourceforge.net/p/web-erp/reponame/7267
Author:   rchacon
Date:     2015-04-19 13:40:59 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
Add ".page_title_text img" as a display none class. This makes unnecessary to add the class noprint to the image in page_title_text.

Modified Paths:
--------------
    trunk/css/print.css
    trunk/doc/Change.log

Modified: trunk/css/print.css
===================================================================
--- trunk/css/print.css	2015-04-19 07:14:59 UTC (rev 7266)
+++ trunk/css/print.css	2015-04-19 13:40:59 UTC (rev 7267)
@@ -3,7 +3,7 @@
 
 @media print {
 
-#FooterDiv, #HeaderDiv, #MainMenuDiv, .noprint, .site-description, .site-title {
+#FooterDiv, #HeaderDiv, #MainMenuDiv, .noprint, .page_title_text img, .site-description, .site-title {
 	display:none;
 	/* Remove unwanted elements. */
 }
@@ -106,7 +106,8 @@
 }
 
 #Report {
-	/* Division id for reports. */}
+	/* Division id for reports. */
+}
 #Report table {
 	width:100%;
 	/* Expands the body of the report to use the full width of the page. */

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-19 07:14:59 UTC (rev 7266)
+++ trunk/doc/Change.log	2015-04-19 13:40:59 UTC (rev 7267)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+19/4/15 RChacon: Add ".page_title_text img" as a display none class. This makes unnecessary to add the class noprint to the image in page_title_text.
 19/4/15 Phil: SelectSupplier - total supplier spend was incorrect only looked at supplier transactions excluding invoices? Now takes invoice net of debit notes reported by Andrew Galuski
 07/4/15 Exson: Fixed the Wiki link broken bug in SystemParameters.php.
 04/4/15 Exson: Fixed the bug that Credit and Debit submit amount was duplicated processed by local_number_format function.

[Web-erp-svn] SF.net SVN: web-erp:[7266] trunk/SelectSupplier.php

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

Revision: 7266
          http://sourceforge.net/p/web-erp/reponame/7266
Author:   daintree
Date:     2015-04-19 07:14:59 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
SelectSupplier - total supplier spend was incorrect only looked at supplier transactions excluding invoices? Now takes invoice net of debit notes

Modified Paths:
--------------
    trunk/SelectSupplier.php

Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php	2015-04-19 05:32:06 UTC (rev 7265)
+++ trunk/SelectSupplier.php	2015-04-19 07:14:59 UTC (rev 7266)
@@ -371,7 +371,7 @@
 			$DataResult = DB_query($sql, $ErrMsg);
 			$myrow = DB_fetch_array($DataResult);
 			// Select some more data about the supplier
-			$SQL = "SELECT SUM(-ovamount) AS total FROM supptrans WHERE supplierno = '" . $_SESSION['SupplierID'] . "' AND (type == '20' OR type='21')";
+			$SQL = "SELECT SUM(ovamount) AS total FROM supptrans WHERE supplierno = '" . $_SESSION['SupplierID'] . "' AND (type == '20' OR type='21')";
 			$Total1Result = DB_query($SQL);
 			$row = DB_fetch_array($Total1Result);
 			echo '<br />';

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

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

Revision: 7265
          http://sourceforge.net/p/web-erp/reponame/7265
Author:   daintree
Date:     2015-04-19 05:32:06 +0000 (Sun, 19 Apr 2015)
Log Message:
-----------
SelectSupplier - total supplier spend was incorrect only looked at supplier transactions excluding invoices? Now takes invoice net of debit notes

Modified Paths:
--------------
    trunk/BackupDatabase.php
    trunk/SelectSupplier.php
    trunk/doc/Change.log

Modified: trunk/BackupDatabase.php
===================================================================
--- trunk/BackupDatabase.php	2015-04-07 10:31:12 UTC (rev 7264)
+++ trunk/BackupDatabase.php	2015-04-19 05:32:06 UTC (rev 7265)
@@ -35,19 +35,13 @@
 	$Command = 'mysqldump --opt -h' . $host . ' -u' . $DBUser . ' -p' . $DBPassword  . '  ' . $_SESSION['DatabaseName'] . '| gzip > ' .
 	$_SERVER['DOCUMENT_ROOT'] . $BackupFile;
 
+	exec($Command);
+	prnMsg(_('The backup file has now been created. You must now download this to your computer because in case the web-server has a disk failure the backup would then not on the same machine. Use the link below') . '<br /><br /><a href="' . $BackupFile  . '">' . _('Download the backup file to your locale machine') . '</a>','success');
+	prnMsg(_('Once you have downloaded the database backup file to your local machine you should use the link below to delete it - backup files can consume a lot of space on your hosting account and will accumulate if not deleted - they also contain sensitive information which would otherwise be available for others to download!'),'info');
+	echo '<br />
+		<br />
+		<a href="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?BackupFile=' .$BackupFile  .'">' . _('Delete the backup file off the server') . '</a>';
 
-	$CommandOutput = array();
-	exec($Command,$CommandOutput, $ReturnValue);
-
-	if ($ReturnValue ==0) {
-		prnMsg(_('The backup file has now been created. You must now download this to your computer because in case the web-server has a disk failure the backup would then not on the same machine. Use the link below') . '<br /><br /><a href="' . $BackupFile  . '">' . _('Download the backup file to your locale machine') . '</a>','success');
-		prnMsg(_('Once you have downloaded the database backup file to your local machine you should use the link below to delete it - backup files can consume a lot of space on your hosting account and will accumulate if not deleted - they also contain sensitive information which would otherwise be available for others to download!'),'info');
-		echo '<br />
-			<br />
-			<a href="'. htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?BackupFile=' .$BackupFile  .'">' . _('Delete the backup file off the server') . '</a>';
-	} else {
-		prnMsg(_('There was some problem producing a backup using mysqldump. Normally this relates to a permissions issue - the web-server user must have permission to write to the companies directory'),'error');
-	}
 }
 /*
 //this could be a weighty file attachment!!

Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php	2015-04-07 10:31:12 UTC (rev 7264)
+++ trunk/SelectSupplier.php	2015-04-19 05:32:06 UTC (rev 7265)
@@ -371,7 +371,7 @@
 			$DataResult = DB_query($sql, $ErrMsg);
 			$myrow = DB_fetch_array($DataResult);
 			// Select some more data about the supplier
-			$SQL = "SELECT SUM(-ovamount) AS total FROM supptrans WHERE supplierno = '" . $_SESSION['SupplierID'] . "' and type != '20'";
+			$SQL = "SELECT SUM(-ovamount) AS total FROM supptrans WHERE supplierno = '" . $_SESSION['SupplierID'] . "' AND (type == '20' OR type='21')";
 			$Total1Result = DB_query($SQL);
 			$row = DB_fetch_array($Total1Result);
 			echo '<br />';

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-07 10:31:12 UTC (rev 7264)
+++ trunk/doc/Change.log	2015-04-19 05:32:06 UTC (rev 7265)
@@ -1,40 +1,41 @@
 webERP Change Log
 
-07/04/15 Exson: Fixed the Wiki link broken bug in SystemParameters.php. 
-04/04/15 Exson: Fixed the bug that Credit and Debit submit amount was duplicated processed by local_number_format function.
-01/04/15 Exson: Remove comma from item description and suppliername to make csv file correctly in POReport.php.
-01/04/15 Exson: Fixed comma bug due to locale issue of POReport.php csv file. And add ordered/received quantity field in the report.
-01/04/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.
-01/04/15 Thumb: Add a Z_ImportCustbranch.php script to import customer branches.
+19/4/15 Phil: SelectSupplier - total supplier spend was incorrect only looked at supplier transactions excluding invoices? Now takes invoice net of debit notes reported by Andrew Galuski
+07/4/15 Exson: Fixed the Wiki link broken bug in SystemParameters.php.
+04/4/15 Exson: Fixed the bug that Credit and Debit submit amount was duplicated processed by local_number_format function.
+01/4/15 Exson: Remove comma from item description and suppliername to make csv file correctly in POReport.php.
+01/4/15 Exson: Fixed comma bug due to locale issue of POReport.php csv file. And add ordered/received quantity field in the report.
+01/4/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.
+01/4/15 Thumb: Add a Z_ImportCustbranch.php script to import customer branches.
 30/3/15  Vitaly: Get all taxes for the tax group, even if calculationorder is left at default value 0.
 29/3/15  Phil: Allow dummy/service items to be propogated to CounterLogic POS installs through the api
-27/03/15 Exson: Remove redundant code from PrintCustTrans.php.
-27/03/15 Exson: Make credit not for freight only is printable in PrintCustTrans.php.
-26/03/15 Exson: Fixed disabletrans status bug in CustomerBranches.php and fix index undefined noise.
-25/03/15 Exson: Add planned accumulation in MRP report.
-14/03/15 Exson: Fixed undefined index noise in Credit_Invoice.php.
-13/03/15 Exson: fixed the undefined index noise in WorkOrderReceive.php.
-13/03/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
-13/03/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
-12/03/15 Exson: Make Order No sortable in SelectSalesOrder.php.
-12/03/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
+27/3/15 Exson: Remove redundant code from PrintCustTrans.php.
+27/3/15 Exson: Make credit not for freight only is printable in PrintCustTrans.php.
+26/3/15 Exson: Fixed disabletrans status bug in CustomerBranches.php and fix index undefined noise.
+25/3/15 Exson: Add planned accumulation in MRP report.
+14/3/15 Exson: Fixed undefined index noise in Credit_Invoice.php.
+13/3/15 Exson: fixed the undefined index noise in WorkOrderReceive.php.
+13/3/15 Exson: Fixed the undefined index noise in SelectWorkOrder.php.
+13/3/15 Exson: Make Labor type allowed by category select in WorkOrderIssue.php.
+12/3/15 Exson: Make Order No sortable in SelectSalesOrder.php.
+12/3/15 Exson: Fixed undefined parameters noise in PO_SelectPurchOrder.php.
 11/3/15 Exson: Fixed wrong handling for dummy parts receiving from PO in GoodsReceived.php.
-09/03/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
-09/03/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
-09/03/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
-08/03/15 Vitaly: Fit HTML view of invoices to one screen
-08/03/15 Exson: Fixed undefined index noise in PO_Items.php.
-07/03/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
-07/03/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
-07/03/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
-07/03/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
-07/03/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
-07/03/15 Exson: Fixed typo in AuditTrail.php.
-07/03/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
-07/03/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
-07/03/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
-04/03/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
-04/03/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
+09/3/15 Vitaly: Page refresh when credit type changes in Credit_Invoce.php
+09/3/15 RChacon: In DailyBankTransactions.php: Improves page_title_text. Orders by banktrans.transdate ascending and banktrans.banktransid ascending. Adds division to identify the report block. Groups table-header cells inside thead tags. Groups table-data cells inside tbody tags. Adds th.text class to left align. Adds "Print This" and "Return" buttons with icon.
+09/3/15 Exson: Fixed undefined index noise of $_POST['SupplierContact'] in PO_Header.php.
+08/3/15 Vitaly: Fit HTML view of invoices to one screen
+08/3/15 Exson: Fixed undefined index noise in PO_Items.php.
+07/3/15 RChacon: Deletes class="invoice" (it does not exist in css). Creates division id="Report" to identify the report block. Moves full width style to print.css (thanks Tim Schofield).
+07/3/15 Exson: Fixed undefined index noise in ShipmentCosting.php.
+07/3/15 Exson: Fixed property ShiptCounter non defined bug in DefineSuppTransClass.php.
+07/3/15 Exson: Fixed the undefine index OpenOrClose noise in Shipt_Select.php.
+07/3/15 Exson: Fixed undefine index InputError noise in SupplierInvoice.php.
+07/3/15 Exson: Fixed typo in AuditTrail.php.
+07/3/15 Exson: Remove properties $_SESSION['Shipment']->GLLink which never been defined in Shipments.php.
+07/3/15: Exson: Change login date of users without login record to 'No login record' instead of today. It's very confusion.
+07/3/15 Exson: Fixed order value error that should be value undelivered instead of uncompleted line value and some notice noise in SelectSalesOrder.php.
+04/3/15 Vitaly: Display Phantom assembly type correctly in SelectProduct.php
+04/3/15 Vitaly: Added missing comma to SQL statement in Credit_Invoice.php
 3/3/15 RChacon: Adds cross.png to all css images for use in Reset or Cancel buttons as needed.
 2/3/15 RChacon: Completes table-row colums, regroups price, cost and gross profit in one table-row, uses company decimal places for gross profit in SelectProduct.php.
 25/2/15 TurboPT: Fix Z_ImportSupplier bug reported in forum by: Bill Schlaerth.

[Web-erp-svn] SF.net SVN: web-erp:[7264] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7264
          http://sourceforge.net/p/web-erp/reponame/7264
Author:   exsonqu
Date:     2015-04-07 10:31:12 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-07 10:30:19 UTC (rev 7263)
+++ trunk/doc/Change.log	2015-04-07 10:31:12 UTC (rev 7264)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+07/04/15 Exson: Fixed the Wiki link broken bug in SystemParameters.php. 
 04/04/15 Exson: Fixed the bug that Credit and Debit submit amount was duplicated processed by local_number_format function.
 01/04/15 Exson: Remove comma from item description and suppliername to make csv file correctly in POReport.php.
 01/04/15 Exson: Fixed comma bug due to locale issue of POReport.php csv file. And add ordered/received quantity field in the report.

[Web-erp-svn] SF.net SVN: web-erp:[7263] trunk/SystemParameters.php

[<ex...@us...>]

Revision: 7263
          http://sourceforge.net/p/web-erp/reponame/7263
Author:   exsonqu
Date:     2015-04-07 10:30:19 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
07/04/15 Exson: Fixed the Wiki link broken bug in SystemParameters.php. 

Modified Paths:
--------------
    trunk/SystemParameters.php

Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php	2015-04-06 08:24:23 UTC (rev 7262)
+++ trunk/SystemParameters.php	2015-04-07 10:30:19 UTC (rev 7263)
@@ -264,7 +264,7 @@
 		if ($_SESSION['CheckCreditLimits'] != $_POST['X_CheckCreditLimits'] ) {
 			$sql[] = "UPDATE config SET confvalue = '". ($_POST['X_CheckCreditLimits'])."' WHERE confname = 'CheckCreditLimits'";
 		}
-		if ($_SESSION['WikiApp'] != $_POST['X_WikiApp'] ) {
+		if ($_SESSION['WikiApp'] !== $_POST['X_WikiApp'] ) {
 			$sql[] = "UPDATE config SET confvalue = '". $_POST['X_WikiApp']."' WHERE confname = 'WikiApp'";
 		}
 		if ($_SESSION['WikiPath'] != $_POST['X_WikiPath'] ) {
@@ -989,7 +989,7 @@
 echo '<tr style="outline: 1px solid"><td>' . _('Wiki application') . ':</td>
 	<td><select name="X_WikiApp">';
 for ($i=0; $i < sizeof($WikiApplications); $i++ ) {
-	echo '<option '.($_SESSION['WikiApp'] == $i ? 'selected="selected" ' : '').'value="'. $i .'">' . $WikiApplications[$i]  . '</option>';
+	echo '<option '.($_SESSION['WikiApp'] == $WikiApplications[$i] ? 'selected="selected" ' : '').'value="'.$WikiApplications[$i].'">' . $WikiApplications[$i]  . '</option>';
 }
 echo '</select></td>
 	<td>' . _('This feature makes webERP show links to a free form company knowledge base using a wiki. This allows sharing of important company information - about customers, suppliers and products and the set up of work flow menus and/or company procedures documentation')  . '</td></tr>';

[Web-erp-svn] SF.net SVN: web-erp:[7262] trunk/SalesInquiry.php

[<te...@us...>]

Revision: 7262
          http://sourceforge.net/p/web-erp/reponame/7262
Author:   tehonu
Date:     2015-04-06 08:24:23 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Minor fix

Modified Paths:
--------------
    trunk/SalesInquiry.php

Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php	2015-04-06 08:07:43 UTC (rev 7261)
+++ trunk/SalesInquiry.php	2015-04-06 08:24:23 UTC (rev 7262)
@@ -973,6 +973,7 @@
 				$columnheader7 =  _('Customer Name');
 			}
 			if ($SummaryType == 'categoryid') {
+				$Description = 'categorydescription';
 				$SummaryHeader =  _('Stock Category');
 				$Descriptionheader =  _('Category Description');
 			}

[Web-erp-svn] SF.net SVN: web-erp:[7261] trunk/SalesInquiry.php

[<te...@us...>]

Revision: 7261
          http://sourceforge.net/p/web-erp/reponame/7261
Author:   tehonu
Date:     2015-04-06 08:07:43 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Fix bug in multi currency environment

Modified Paths:
--------------
    trunk/SalesInquiry.php

Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php	2015-04-04 01:37:20 UTC (rev 7260)
+++ trunk/SalesInquiry.php	2015-04-06 08:07:43 UTC (rev 7261)
@@ -193,7 +193,7 @@
 							   salesorders.branchcode,
 							   salesorderdetails.quantity,
 							   salesorderdetails.qtyinvoiced,
-							   (salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+							   (salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 							   (salesorderdetails.quantity * stockmaster.actualcost) as extcost,
 							   IF(salesorderdetails.quantity = salesorderdetails.qtyinvoiced ||
 								  salesorderdetails.completed = 1,'Completed','Open') as linestatus,
@@ -231,7 +231,7 @@
 							   salesorders.branchcode,
 							   salesorderdetails.quantity,
 							   salesorderdetails.qtyinvoiced,
-							   (tempstockmoves.qty * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) * -1 / currencies.rate as extprice,
+							   (tempstockmoves.qty * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) * -1 / currencies.rate) as extprice,
 							   (tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 							   IF(salesorderdetails.quantity = salesorderdetails.qtyinvoiced ||
 								  salesorderdetails.completed = 1,'Completed','Open') as linestatus,
@@ -283,7 +283,7 @@
 					$sql = "SELECT salesorderdetails.stkcode,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost,
 								   stockmaster.description,
 								   stockmaster.decimalplaces
@@ -318,7 +318,7 @@
 					               debtorsmaster.name,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
 								   FROM salesorderdetails
 							LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -352,7 +352,7 @@
 					               debtorsmaster.name,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
 								   FROM salesorderdetails
 							LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -382,7 +382,7 @@
 								   CONCAT(MONTHNAME(salesorders.orddate),' ',YEAR(salesorders.orddate)) as monthname,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
 								   FROM salesorderdetails
 							LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -412,7 +412,7 @@
 								   stockcategory.categorydescription,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
 								   FROM salesorderdetails
 							LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -443,7 +443,7 @@
 								   salesman.salesmanname,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
 								   FROM salesorderdetails
 							LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -473,7 +473,7 @@
 								   areas.areadescription,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent)) / currencies.rate as extprice,
+								   SUM(salesorderdetails.quantity * salesorderdetails.unitprice * (1 - salesorderdetails.discountpercent) / currencies.rate) as extprice,
 								   SUM(salesorderdetails.quantity * stockmaster.actualcost) as extcost
 								   FROM salesorderdetails
 							LEFT JOIN salesorders ON salesorders.orderno=salesorderdetails.orderno
@@ -505,7 +505,7 @@
 					$sql = "SELECT salesorderdetails.stkcode,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   stockmaster.description,
 								   SUM(tempstockmoves.qty * -1) as qty
@@ -542,7 +542,7 @@
 					               debtorsmaster.name,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   SUM(tempstockmoves.qty * -1) as qty
 								   FROM tempstockmoves
@@ -581,7 +581,7 @@
 					               debtorsmaster.name,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   SUM(tempstockmoves.qty * -1) as qty
 								   FROM tempstockmoves
@@ -616,7 +616,7 @@
 								   CONCAT(MONTHNAME(salesorders.orddate),' ',YEAR(salesorders.orddate)) as monthname,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   SUM(tempstockmoves.qty * -1) as qty
 								   FROM tempstockmoves
@@ -651,7 +651,7 @@
 								   stockcategory.categorydescription,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   SUM(tempstockmoves.qty * -1) as qty
 								   FROM tempstockmoves
@@ -686,7 +686,7 @@
 								   salesman.salesmanname,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   SUM(tempstockmoves.qty * -1) as qty
 								   FROM tempstockmoves
@@ -721,7 +721,7 @@
 								   areas.areadescription,
 								   SUM(salesorderdetails.quantity) as quantity,
 								   SUM(salesorderdetails.qtyinvoiced) as qtyinvoiced,
-								   SUM(tempstockmoves.qty * tempstockmoves.price) * -1 / currencies.rate as extprice,
+								   SUM(tempstockmoves.qty * tempstockmoves.price * -1 / currencies.rate) as extprice,
 								   SUM(tempstockmoves.qty * tempstockmoves.standardcost) * -1 as extcost,
 								   SUM(tempstockmoves.qty * -1) as qty
 								   FROM tempstockmoves

[Web-erp-svn] SF.net SVN: web-erp:[7260] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7260
          http://sourceforge.net/p/web-erp/reponame/7260
Author:   exsonqu
Date:     2015-04-04 01:37:20 +0000 (Sat, 04 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-04 01:36:35 UTC (rev 7259)
+++ trunk/doc/Change.log	2015-04-04 01:37:20 UTC (rev 7260)
@@ -1,4 +1,6 @@
 webERP Change Log
+
+04/04/15 Exson: Fixed the bug that Credit and Debit submit amount was duplicated processed by local_number_format function.
 01/04/15 Exson: Remove comma from item description and suppliername to make csv file correctly in POReport.php.
 01/04/15 Exson: Fixed comma bug due to locale issue of POReport.php csv file. And add ordered/received quantity field in the report.
 01/04/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.

[Web-erp-svn] SF.net SVN: web-erp:[7259] trunk/GLJournal.php

[<ex...@us...>]

Revision: 7259
          http://sourceforge.net/p/web-erp/reponame/7259
Author:   exsonqu
Date:     2015-04-04 01:36:35 +0000 (Sat, 04 Apr 2015)
Log Message:
-----------
04/04/15 Exson: Fixed the bug that Credit and Debit submit amount was duplicated processed by local_number_format function.

Modified Paths:
--------------
    trunk/GLJournal.php

Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php	2015-04-03 15:41:23 UTC (rev 7258)
+++ trunk/GLJournal.php	2015-04-04 01:36:35 UTC (rev 7259)
@@ -175,7 +175,7 @@
 				unset($_POST['GLManualCode']);
 			} else {
 				$myrow = DB_fetch_array($Result);
-				$_SESSION['JournalDetail']->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
+				$_SESSION['JournalDetail']->add_to_glanalysis($_POST['GLAmount'],
 															$_POST['GLNarrative'],
 															$_POST['GLManualCode'],
 															$myrow['accountname'],
@@ -215,7 +215,7 @@
 			$SQL = "SELECT accountname FROM chartmaster WHERE accountcode='" . $_POST['GLCode'] . "'";
 			$Result=DB_query($SQL);
 			$myrow=DB_fetch_array($Result);
-			$_SESSION['JournalDetail']->add_to_glanalysis(filter_number_format($_POST['GLAmount']),
+			$_SESSION['JournalDetail']->add_to_glanalysis($_POST['GLAmount'],
 															$_POST['GLNarrative'],
 															$_POST['GLCode'],
 															$myrow['accountname'],

[Web-erp-svn] SF.net SVN: web-erp:[7258] trunk/BankReconciliation.php

[<vv...@us...>]

Revision: 7258
          http://sourceforge.net/p/web-erp/reponame/7258
Author:   vvs2012
Date:     2015-04-03 15:41:23 +0000 (Fri, 03 Apr 2015)
Log Message:
-----------
Show bank reconciliation balance for the current period.

Modified Paths:
--------------
    trunk/BankReconciliation.php

Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php	2015-04-01 11:25:51 UTC (rev 7257)
+++ trunk/BankReconciliation.php	2015-04-03 15:41:23 UTC (rev 7258)
@@ -149,16 +149,11 @@
 
 /*Get the balance of the bank account concerned */
 
-	$sql = "SELECT MAX(period)
-			FROM chartdetails
-			WHERE accountcode='" . $_POST['BankAccount']."'";
-	$PrdResult = DB_query($sql);
-	$myrow = DB_fetch_row($PrdResult);
-	$LastPeriod = $myrow[0];
+	$PeriodNo = GetPeriod(date($_SESSION['DefaultDateFormat']), $db);
 
 	$SQL = "SELECT bfwd+actual AS balance
 			FROM chartdetails
-			WHERE period='" . $LastPeriod . "'
+			WHERE period='" . $PeriodNo . "'
 			AND accountcode='" . $_POST['BankAccount']."'";
 
 	$ErrMsg = _('The bank account balance could not be returned by the SQL because');

[Web-erp-svn] SF.net SVN: web-erp:[7257] trunk/doc/Change.log

[<ex...@us...>]

Revision: 7257
          http://sourceforge.net/p/web-erp/reponame/7257
Author:   exsonqu
Date:     2015-04-01 11:25:51 +0000 (Wed, 01 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    trunk/doc/Change.log

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-04-01 11:24:48 UTC (rev 7256)
+++ trunk/doc/Change.log	2015-04-01 11:25:51 UTC (rev 7257)
@@ -1,5 +1,5 @@
 webERP Change Log
-
+01/04/15 Exson: Remove comma from item description and suppliername to make csv file correctly in POReport.php.
 01/04/15 Exson: Fixed comma bug due to locale issue of POReport.php csv file. And add ordered/received quantity field in the report.
 01/04/15 Exson: Fixed the bug that when delete one gl item from the payment details, the bank account related setting will disappeared in Payments.php. Reported by Steven.
 01/04/15 Thumb: Add a Z_ImportCustbranch.php script to import customer branches.

[Web-erp-svn] SF.net SVN: web-erp:[7256] trunk/POReport.php

[<ex...@us...>]

Revision: 7256
          http://sourceforge.net/p/web-erp/reponame/7256
Author:   exsonqu
Date:     2015-04-01 11:24:48 +0000 (Wed, 01 Apr 2015)
Log Message:
-----------
01/04/15 Exson: Remove comma from item description and suppliername to make csv file correctly.

Modified Paths:
--------------
    trunk/POReport.php

Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php	2015-04-01 10:32:19 UTC (rev 7255)
+++ trunk/POReport.php	2015-04-01 11:24:48 UTC (rev 7256)
@@ -1333,15 +1333,15 @@
 					$myrow['itemcode'],
 					ConvertSQLDate($myrow['orddate']),
 					$myrow['supplierno'],
-					$myrow['suppname'],
-					locale_number_format($myrow['quantityord'],$myrow['decimalplaces']),
-					locale_number_format($myrow['quantityrecd'],$myrow['decimalplaces']),
-					locale_number_format($myrow['extcost'],2),
-					locale_number_format($myrow['extprice'],2),
-					locale_number_format($myrow['qtyinvoiced'],$myrow['decimalplaces']),
+					str_replace(',',' ',$myrow['suppname']),
+					round($myrow['quantityord'],$myrow['decimalplaces']),
+					round($myrow['quantityrecd'],$myrow['decimalplaces']),
+					round($myrow['extcost'],2),
+					round($myrow['extprice'],2),
+					round($myrow['qtyinvoiced'],$myrow['decimalplaces']),
 					$myrow['linestatus'],
 					ConvertSQLDate($myrow['deliverydate']),
-					$myrow['description']);
+					str_replace(',',' ',$myrow['description']));
 					$LastDecimalPlaces = $myrow['decimalplaces'];
 					$TotalQty += $myrow['quantityord'];
 					$TotalExtCost += $myrow['extcost'];
@@ -1387,7 +1387,7 @@
 					$myrow['itemcode'],
 					ConvertSQLDate($myrow['orddate']),
 					$myrow['supplierno'],
-					$myrow['suppname'],
+					str_replace(',',' ',$myrow['suppname']),
 					round($myrow['quantityrecd'],$myrow['decimalplaces']),
 					round($myrow['quantityord'],$myrow['decimalplaces']),
 					round($myrow['extcost'],2),
@@ -1395,7 +1395,7 @@
 					round($myrow['qtyinvoiced'],$myrow['decimalplaces']),
 					$myrow['linestatus'],
 					ConvertSQLDate($myrow['deliverydate']),
-					$myrow['description']);
+					str_replace(',',' ',$myrow['description']));
 					$LastDecimalPlaces = $myrow['decimalplaces'];
 					$TotalQty += $myrow['quantityord'];
 					$TotalExtCost += $myrow['extcost'];