Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3365] trunk
|
From: <tim...@us...> - 2010-03-03 13:48:04
|
Revision: 3365
http://web-erp.svn.sourceforge.net/web-erp/?rev=3365&view=rev
Author: tim_schofield
Date: 2010-03-03 13:47:58 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
New PcReportTab with limited tab view (supervised or own) tabs.
Modified Paths:
--------------
trunk/PcReportTab.php
trunk/doc/Change.log.html
Modified: trunk/PcReportTab.php
===================================================================
--- trunk/PcReportTab.php 2010-03-01 17:38:42 UTC (rev 3364)
+++ trunk/PcReportTab.php 2010-03-03 13:47:58 UTC (rev 3365)
@@ -19,29 +19,31 @@
include ('includes/header.inc');
echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">';
-
+
if (!isset($_POST['FromDate'])){
$_POST['FromDate']=Date($_SESSION['DefaultDateFormat'], mktime(0,0,0,Date('m'),1,Date('Y')));
}
-
+
if (!isset($_POST['ToDate'])){
$_POST['ToDate'] = Date($_SESSION['DefaultDateFormat']);
}
-
+
/*Show a form to allow input of criteria for Tabs to show */
echo '<table>';
echo '<tr><td>' . _('Code Of Petty Cash Tab') . ":</td><td><select name='SelectedTabs'>";
DB_free_result($result);
-
- if ($_SESSION['AccessLevel'] >= 8){ // GL user (to supervise the supervisor)
+
+ if ($_SESSION['AccessLevel'] >= 15){ // superuser can supervise the supervisors
$SQL = "SELECT tabcode
- FROM pctabs";
+ FROM pctabs
+ ORDER BY tabcode";
}else{
$SQL = "SELECT tabcode
FROM pctabs
- WHERE authorizer='" . $_SESSION['UserID'] . "'";
- }
+ WHERE ( authorizer='" . $_SESSION['UserID'] . "' OR usercode ='" . $_SESSION['UserID'] . "' )
+ ORDER BY tabcode";
+ }
$result = DB_query($SQL,$db);
while ($myrow = DB_fetch_array($result)) {
@@ -51,10 +53,10 @@
echo "<option VALUE='";
}
echo $myrow['tabcode'] . "'>" . $myrow['tabcode'];
-
+
} //end while loop get type of tab
-
+
echo '</select></td></tr>';
echo'<tr><td>' . _('From Date :') . '</td><td>';
echo '<input tabindex="2" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" type="TEXT" name="FromDate" maxlength="10" size="11" VALUE="' . $_POST['FromDate'] . '">';
@@ -66,23 +68,23 @@
echo "<input type=submit Name='PrintPDF' Value='"._('PrintPDF')."'></div>";
} else if (isset($_POST['PrintPDF'])) {
-
-
+
+
include('includes/PDFStarter.php');
$PageNumber = 0;
$FontSize = 10;
$pdf->addinfo('Title', _('Petty Cash Report Of Tab') );
$pdf->addinfo('Subject', _('Petty Cash Report Of Tab') );
$line_height = 12;
-
+
$SQL_FromDate = FormatDateForSQL($_POST['FromDate']);
$SQL_ToDate = FormatDateForSQL($_POST['ToDate']);
-
+
$SQL = "SELECT * FROM pcashdetails
WHERE tabcode='$SelectedTabs'
- AND date >='" . $SQL_FromDate . "' AND date <= '" . $SQL_ToDate . "'
+ AND date >='" . $SQL_FromDate . "' AND date <= '" . $SQL_ToDate . "'
ORDER BY date, counterindex ASC";
-
+
$TabDetail = DB_query($SQL,$db);
if (DB_error_no($db)!=0){
@@ -102,29 +104,29 @@
include('includes/footer.inc');
exit;
}
-
+
include('includes/PDFTabReportHeader.inc');
-
+
$SqlTabs = "SELECT * FROM pctabs
WHERE tabcode='$SelectedTabs'";
-
+
$TabResult = DB_query($SqlTabs, $db, _('No Petty Cash tabs were returned by the SQL because'), _('The SQL that failed was:'));
-
+
$Tabs=DB_fetch_array($TabResult);
-
+
$SqlBalance = "SELECT SUM(amount) FROM pcashdetails
WHERE tabcode='$SelectedTabs'
AND date<'".$SQL_FromDate."'";
-
+
$TabBalance = DB_query($SqlBalance,
$db);
-
+
$Balance=DB_fetch_array($TabBalance);
-
+
if( !isset($Balance['0'])){
$Balance['0']=0;
}
-
+
$YPos -= (2 * $line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Tab Code :'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+90,$YPos,20,$FontSize,_(': '));
@@ -132,7 +134,7 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('From '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['FromDate']);
-
+
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('User '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+90,$YPos,20,$FontSize,_(': '));
@@ -140,27 +142,27 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+290,$YPos,70,$FontSize,_('To '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+320,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+340,$YPos,70,$FontSize,$_POST['ToDate']);
-
+
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Authorizer '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+90,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,70,$FontSize,$Tabs['authorizer']);
-
+
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,60,$FontSize,_('Currency '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+90,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,70,$FontSize,$Tabs['currency']);
-
+
$YPos -= $line_height;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,40,$FontSize,_('Balance before '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+40,$YPos,70,$FontSize,$_POST['FromDate']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+90,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+100,$YPos,70,$FontSize,number_format($Balance['0'],2));
$LeftOvers = $pdf->addTextWrap($Left_Margin+140,$YPos,70,$FontSize,$Tabs['currency']);
-
+
$YPos -= (2 * $line_height);
$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
-
+
$YPos -= (2 * $line_height);
$FontSize = 8;
$LeftOvers = $pdf->addTextWrap($Left_Margin,$YPos,70,$FontSize,_('Date Of Expense'));
@@ -171,16 +173,16 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+420,$YPos,100,$FontSize,_('Date Authorizer'));
$pdf->selectFont('./fonts/Helvetica.afm');
$YPos -= (2 * $line_height);
-
+
while ($myrow=DB_fetch_array($TabDetail)) {
-
- $sqldes="SELECT description
- FROM pcexpenses
+
+ $sqldes="SELECT description
+ FROM pcexpenses
WHERE codeexpense='". $myrow[3] . "'";
-
+
$ResultDes = DB_query($sqldes,$db);
$Description=DB_fetch_array($ResultDes);
-
+
if (!isset($Description[0])){
$Description[0]='ASSIGNCASH';
}
@@ -193,35 +195,35 @@
$LeftOvers = $pdf->addTextWrap($Left_Margin+350,$YPos,70,$FontSize,$myrow['receipt']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+430,$YPos,70,$FontSize,ConvertSQLDate($myrow['authorized']));
$YPos -= $line_height;
-
+
} //end of while loop
-
- $sqlamount="SELECT sum(amount)
+
+ $sqlamount="SELECT sum(amount)
FROM pcashdetails
WHERE tabcode='$SelectedTabs'
AND date<='".$SQL_ToDate."'";
-
+
$ResultAmount = DB_query($sqlamount,$db);
$Amount=DB_fetch_array($ResultAmount);
-
+
if (!isset($Amount[0])) {
$Amount[0]=0;
}
-
-
-
+
+
+
$YPos -= (2 * $line_height);
- $pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
+ $pdf->line($Left_Margin+250, $YPos+$line_height,$Left_Margin+500, $YPos+$line_height);
$LeftOvers = $pdf->addTextWrap($Left_Margin+70,$YPos,100,$FontSize,_('Balance at'));
$LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,70,$FontSize,$_POST['ToDate']);
$LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,20,$FontSize,_(': '));
$LeftOvers = $pdf->addTextWrap($Left_Margin+160,$YPos,70,$FontSize,number_format($Amount[0],2),'right');
$LeftOvers = $pdf->addTextWrap($Left_Margin+240,$YPos,70,$FontSize,$Tabs['currency']);
$pdf->line($Page_Width-$Right_Margin, $YPos+$line_height,$Left_Margin, $YPos+$line_height);
-
+
$pdfcode = $pdf->output();
$len = strlen($pdfcode);
-
+
if ($len<=20){
$title = _('Print Report Tab Error');
include('includes/header.inc');
@@ -255,82 +257,82 @@
$SqlTabs = "SELECT * FROM pctabs
WHERE tabcode='$SelectedTabs'";
-
+
$TabResult = DB_query($SqlTabs,
$db,
_('No Petty Cash Tabs were returned by the SQL because'),
_('The SQL that failed was:'));
-
+
$Tabs=DB_fetch_array($TabResult);
-
+
echo "<br><table >";
-
+
echo '<tr><td>' . _('Tab Code') . '</td>
<td>:</td>
<td width=200>' . ''.$SelectedTabs.'</td>' .
'<td>' . _('From') . '</td><td>:</td><td>' .
''.$_POST['FromDate'].'</td></tr>';
-
+
echo '<tr><td>' . _('User') . '</td>
<td>:</td>
<td>' . ''.$Tabs['usercode'].'</td>'.
'<td>' . _('To') . '</td><td>:</td><td>' .
''.$_POST['ToDate'].'</td></tr>';
-
+
echo '<tr><td>' . _('Authorizer') . '</td><td>:</td><td>' . ''.$Tabs['authorizer'].'</td>
</tr>';
echo '<tr><td>' . _('Currency') . '</td><td>:</td><td>' . ''.$Tabs['currency'].'</td>
</tr>';
-
- $SqlBalance = "SELECT SUM(amount)
+
+ $SqlBalance = "SELECT SUM(amount)
FROM pcashdetails
WHERE tabcode='$SelectedTabs'
AND date<'".$SQL_FromDate."'";
-
+
$TabBalance = DB_query($SqlBalance, $db);
$Balance=DB_fetch_array($TabBalance);
-
+
if( !isset($Balance['0'])){
$Balance['0']=0;
}
-
+
echo '<tr><td>' . _('Balance before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$Balance['0'].' '.$Tabs['currency'].'</td></tr>';
- $SqlBalanceNotAut = "SELECT SUM(amount)
+ $SqlBalanceNotAut = "SELECT SUM(amount)
FROM pcashdetails
WHERE tabcode= '$SelectedTabs'
AND authorized = '0000-00-00'
AND date<'".$SQL_FromDate."'";
-
+
$TabBalanceNotAut = DB_query($SqlBalanceNotAut, $db);
$BalanceNotAut=DB_fetch_array($TabBalanceNotAut);
-
+
if( !isset($BalanceNotAut['0'])){
$BalanceNotAut['0']=0;
}
-
+
echo '<tr><td>' . _('Total not authorized before ') . ''.$_POST['FromDate'].'</td><td>:</td><td>' . ''.$BalanceNotAut['0'].' '.$Tabs['currency'].'</td></tr>';
echo '</table>';
-
+
/*show a table of the accounts info returned by the SQL
Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */
-
+
$SQL = "SELECT * FROM pcashdetails
WHERE tabcode='$SelectedTabs'
- AND date >='" . $SQL_FromDate . "'
+ AND date >='" . $SQL_FromDate . "'
AND date <= '" . $SQL_ToDate . "'
ORDER BY date, counterindex Asc";
-
+
$TabDetail = DB_query($SQL,
$db,
_('No Petty Cash movements for this tab were returned by the SQL because'),
_('The SQL that failed was:'));
-
+
echo '<br><table BORDER=1>';
echo "<tr>
<th>" . _('Date Of Expense') . "</th>
@@ -352,15 +354,15 @@
echo '<tr class="OddTableRows">';
$k=1;
}
-
-
- $sqldes="SELECT description
- FROM pcexpenses
+
+
+ $sqldes="SELECT description
+ FROM pcexpenses
WHERE codeexpense='". $myrow['3'] . "'";
-
+
$ResultDes = DB_query($sqldes,$db);
$Description=DB_fetch_array($ResultDes);
-
+
if (!isset($Description['0'])){
$Description['0']='ASSIGNCASH';
}
@@ -396,20 +398,20 @@
}
- $sqlamount="SELECT sum(amount)
+ $sqlamount="SELECT sum(amount)
FROM pcashdetails
WHERE tabcode='$SelectedTabs'
AND date<='".$SQL_ToDate."'";
-
+
$ResultAmount = DB_query($sqlamount,$db);
$Amount=DB_fetch_array($ResultAmount);
-
+
if (!isset($Amount[0])) {
$Amount[0]=0;
}
-
+
echo '<tr><td colspan=2 style=text-align:right >' . _('Balance At') . ' '.$_POST['ToDate'].':</td>
- <td>'.number_format($Amount[0],2).' </td><td>'.$Tabs['currency'].'</td></tr>';
+ <td>'.number_format($Amount[0],2).' </td><td>'.$Tabs['currency'].'</td></tr>';
echo '</table>';
echo '<br><div class="centre"><input type=submit Name="SelectDifferentDate" Value="' . _('Select A Different Date') . '"></div>';
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-01 17:38:42 UTC (rev 3364)
+++ trunk/doc/Change.log.html 2010-03-03 13:47:58 UTC (rev 3365)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>01/03/10 Pak Ricard: PcReportTab.php - New PcReportTab with limited tab view (supervised or own) tabs.</p>
<p>01/03/10 Tim: PrintCustTrans.php - Correctly show html and pdf formats</p>
<p>01/03/10 Pak Ricard: PDFPriceList.php - Updated price list report</p>
<p>01/03/10 Harald: PcExpensesTypeTabv.php - Correct message on deletion of tab</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
