web-erp-svn Mailing List for webERP Accounting & Business Management (Page 24)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7380
          http://sourceforge.net/p/web-erp/reponame/7380
Author:   rchacon
Date:     2015-11-03 15:30:05 +0000 (Tue, 03 Nov 2015)
Log Message:
-----------
In GLAccountInquiry.php, add ViewTopic and BookMark, fix some colspan, and add thead and column classes.

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

Modified: trunk/GLAccountInquiry.php
===================================================================

--- trunk/GLAccountInquiry.php	2015-11-03 11:13:33 UTC (rev 7379)
+++ trunk/GLAccountInquiry.php	2015-11-03 15:30:05 UTC (rev 7380)
@@ -3,6 +3,8 @@
 
 include ('includes/session.inc');
 $Title = _('General Ledger Account Inquiry');
+$ViewTopic = 'GeneralLedger';
+$BookMark = 'GLAccountInquiry';
 include('includes/header.inc');
 include('includes/GLPostings.inc');
 
@@ -163,26 +165,25 @@
 
 	echo '<br />
 		<table class="selection">
-		<tr>
-			<th colspan="8"><b>' ._('Transactions for account').' '.$SelectedAccount. ' - '. $SelectedAccountName . '</b></th>
-		</tr>';
+		<thead>
+			<tr>
+				<th colspan="11"><b>', _('Transactions for account'), ' ', $SelectedAccount, ' - ', $SelectedAccountName, '</b></th>
+			</tr>
+			<tr>
+				<th class="text">', _('Type'), '</th>
+				<th class="number">', _('Number'), '</th>
+				<th class="centre">', ('Date'), '</th>
+				<th class="number">', _('Debit'), '</th>
+				<th class="number">', _('Credit'), '</th>
+				<th class="text">', _('Org Currency'), '</th>
+				<th class="number">', _('Amount in Org Currency'), '</th>
+				<th class="text">', _('Bank Reference'), '</th>
+				<th class="text">', _('Narrative'), '</th>
+				<th class="number">', _('Balance'), '</th>
+				<th class="text">', _('Tag'), '</th>
+			</tr>
+		</thead><tbody>';
 
-	$TableHeader = '<tr>
-						<th>' . _('Type') . '</th>
-						<th>' . _('Number') . '</th>
-						<th>' . _('Date') . '</th>
-						<th>' . _('Debit') . '</th>
-						<th>' . _('Credit') . '</th>
-						<th>' . _('Org Currency') . '</th>
-						<th>' . _('Amount in Org Currency') . '</th>
-						<th>' . _('Bank Ref') .'</th>
-						<th>' . _('Narrative') . '</th>
-						<th>' . _('Balance') . '</th>
-						<th>' . _('Tag') . '</th>
-					</tr>';
-
-	echo $TableHeader;
-
 	if ($PandLAccount==True) {
 		$RunningTotal = 0;
 	} else {
@@ -198,19 +199,18 @@
 		$ChartDetailsResult = DB_query($sql,$ErrMsg);
 		$ChartDetailRow = DB_fetch_array($ChartDetailsResult);
 
-		$RunningTotal =$ChartDetailRow['bfwd'];
+		$RunningTotal = $ChartDetailRow['bfwd'];
 			echo '<tr>
-					<td colspan="3"><b>' . _('Brought Forward Balance') . '</b></td>';
-		if ($RunningTotal < 0 ){ //its a credit balance b/fwd
-			echo '
-					<td></td>
-					<td class="number"><b>' . locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
-					<td colspan="3">&nbsp;</td>
+					<td colspan="3"><b>', _('Brought Forward Balance'), '</b></td>
+				';
+		if($RunningTotal < 0 ) {// It is a credit balance b/fwd
+			echo '	<td>&nbsp;</td>
+					<td class="number"><b>', locale_number_format(-$RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+					<td colspan="6">&nbsp;</td>
 				</tr>';
-		} else { //its a debit balance b/fwd
-			echo '
-					<td class="number"><b>' . locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
-					<td colspan="4">&nbsp;</td>
+		} else {// It is a debit balance b/fwd
+			echo '	<td class="number"><b>', locale_number_format($RunningTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+					<td colspan="7">&nbsp;</td>
 				</tr>';
 		}
 	}
@@ -238,21 +238,21 @@
 
 				echo '<tr>
 					<td colspan="3"><b>' . _('Total for period') . ' ' . $PeriodNo . '</b></td>';
-				if ($PeriodTotal < 0 ){ //its a credit balance b/fwd
+				if($PeriodTotal < 0 ) {// It is a credit balance b/fwd
 					if ($PandLAccount==True) {
 						$RunningTotal = 0;
 					}
-					echo '<td></td>
-						<td class="number"><b>' . locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
-						<td colspan="3">&nbsp;</td>
-				</tr>';
-				} else { //its a debit balance b/fwd
-					if ($PandLAccount==True) {
+					echo '	<td>&nbsp;</td>
+							<td class="number"><b>', locale_number_format(-$PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+							<td colspan="6">&nbsp;</td>
+						</tr>';
+				} else {// It is a debit balance b/fwd
+					if($PandLAccount==True) {
 						$RunningTotal = 0;
 					}
-					echo '<td class="number"><b>' . locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
-							<td colspan="4">&nbsp;</td>
-				</tr>';
+					echo '	<td class="number"><b>', locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+							<td colspan="7">&nbsp;</td>
+						</tr>';
 				}
 				$IntegrityReport .= '<br />' . _('Period') . ': ' . $PeriodNo  . _('Account movement per transaction') . ': '  . locale_number_format($PeriodTotal,$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('Movement per ChartDetails record') . ': ' . locale_number_format($ChartDetailRow['actual'],$_SESSION['CompanyRecord']['decimalplaces']) . ' ' . _('Period difference') . ': ' . locale_number_format($PeriodTotal -$ChartDetailRow['actual'],3);
 
@@ -301,17 +301,17 @@
 		$FormatedTranDate = ConvertSQLDate($myrow['trandate']);
 		$URL_to_TransDetail = $RootPath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&amp;TransNo=' . $myrow['typeno'];
 
-		printf('<td>%s</td>
+		printf('<td class="text">%s</td>
 				<td class="number"><a href="%s">%s</a></td>
-				<td>%s</td>
+				<td class="centre">%s</td>
 				<td class="number">%s</td>
 				<td class="number">%s</td>
-				<td>%s</td>
+				<td class="text">%s</td>
 				<td class="number"><b>%s</b></td>
-				<td>%s</td>
-				<td>%s</td>
+				<td class="text">%s</td>
+				<td class="text">%s</td>
 				<td class="number">%s</td>
-				<td>%s</td>
+				<td class="text">%s</td>
 				</tr>',
 				_($myrow['typename']),
 				$URL_to_TransDetail,
@@ -338,16 +338,17 @@
 	}
 	echo '</b></td>';
 
-	if ($RunningTotal >0){
-		echo '<td class="number"><b>' . locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
-				<td colspan="2"></td>
+	if($RunningTotal < 0) {// It is a debit Total Period Movement or Balance C/Fwd
+		echo '	<td>&nbsp;</td>
+				<td class="number"><b>', locale_number_format((-$RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+				<td colspan="6"></td>
 			</tr>';
-	}else {
-		echo '<td></td>
-				<td class="number"><b>' . locale_number_format((-$RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td><td colspan="2"></td>
+	} else {// It is a credit Total Period Movement or Balance C/Fwd
+		echo '	<td class="number"><b>', locale_number_format(($RunningTotal),$_SESSION['CompanyRecord']['decimalplaces']), '</b></td>
+				<td colspan="7"></td>
 			</tr>';
 	}
-	echo '</table>';
+	echo '</tbody></table>';
 } /* end of if Show button hit */
 
 

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2015-11-03 11:13:33 UTC (rev 7379)
+++ trunk/doc/Change.log	2015-11-03 15:30:05 UTC (rev 7380)
@@ -1,5 +1,6 @@
 webERP Change Log
 
+3/11/15 RChacon: In GLAccountInquiry.php, add ViewTopic and BookMark, fix some colspan, and add thead and column classes.
 3/11/15 Exson: Tidy code up in StockClone.php.
 3/11/15 Exson: Fixed typo in PriceMatrix.php.
 30/10/15 Exson: Allow user input supplier's delivery note during goods receiving and make the inquiry script for it. So users can search corresponding GRN, PO and invoice with it.  





2011	Jan (14)	Feb (42)	Mar (56)	Apr (60)	May (54)	Jun (48)	Jul (74)	Aug (52)	Sep (68)	Oct (64)	Nov (42)	Dec (62)
2012	Jan (142)	Feb (270)	Mar (374)	Apr (230)	May (214)	Jun (116)	Jul (234)	Aug (66)	Sep (120)	Oct (16)	Nov (17)	Dec (41)
2013	Jan (19)	Feb (18)	Mar (8)	Apr (40)	May (121)	Jun (42)	Jul (127)	Aug (145)	Sep (27)	Oct (38)	Nov (83)	Dec (61)
2014	Jan (33)	Feb (35)	Mar (59)	Apr (41)	May (38)	Jun (45)	Jul (17)	Aug (58)	Sep (46)	Oct (51)	Nov (55)	Dec (36)
2015	Jan (57)	Feb (67)	Mar (70)	Apr (34)	May (32)	Jun (11)	Jul (3)	Aug (17)	Sep (16)	Oct (13)	Nov (30)	Dec (30)
2016	Jan (17)	Feb (12)	Mar (17)	Apr (20)	May (47)	Jun (15)	Jul (13)	Aug (30)	Sep (32)	Oct (20)	Nov (32)	Dec (24)
2017	Jan (16)	Feb	Mar (11)	Apr (11)	May (5)	Jun (42)	Jul (9)	Aug (10)	Sep (14)	Oct (15)	Nov (2)	Dec (29)
2018	Jan (28)	Feb (49)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

web-erp-svn Mailing List for webERP Accounting & Business Management (Page 24)

Accounting & Best Practice Business Administration System

web-erp-svn — SVN commits