Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4916] trunk/AgedSuppliers.php
|
From: <tim...@us...> - 2012-02-16 16:06:50
|
Revision: 4916
http://web-erp.svn.sourceforge.net/web-erp/?rev=4916&view=rev
Author: tim_schofield
Date: 2012-02-16 16:06:38 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
Merge from Tims branch and bring Phils code in line with coding guidelines
Modified Paths:
--------------
trunk/AgedSuppliers.php
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-02-16 12:14:37 UTC (rev 4915)
+++ trunk/AgedSuppliers.php 2012-02-16 16:06:38 UTC (rev 4916)
@@ -4,13 +4,12 @@
include('includes/session.inc');
-If (isset($_POST['PrintPDF'])
- AND isset($_POST['FromCriteria'])
- AND mb_strlen($_POST['FromCriteria'])>=1
- AND isset($_POST['ToCriteria'])
- AND mb_strlen($_POST['ToCriteria'])>=1){
+if (isset($_POST['PrintPDF'])
+ and isset($_POST['FromCriteria'])
+ and mb_strlen($_POST['FromCriteria'])>=1
+ and isset($_POST['ToCriteria'])
+ and mb_strlen($_POST['ToCriteria'])>=1){
-
include('includes/PDFStarter.php');
$pdf->addInfo('Title',_('Aged Supplier Listing'));
$pdf->addInfo('Subject',_('Aged Suppliers'));
@@ -18,13 +17,13 @@
$PageNumber=0;
$line_height=12;
- /*Now figure out the aged analysis for the Supplier range under review */
+ /*Now figure out the aged analysis for the Supplier range under review */
if ($_POST['All_Or_Overdues']=='All'){
- $SQL = "SELECT suppliers.supplierid,
- suppliers.suppname,
+ $SQL = "SELECT suppliers.supplierid,
+ suppliers.suppname,
currencies.currency,
- currencies.decimalplaces AS currdecimalplaces,
+ currencies.decimalplaces AS currdecimalplaces,
paymentterms.terms,
SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
SUM(CASE WHEN paymentterms.daysbeforedue > 0 THEN
@@ -46,7 +45,7 @@
ON suppliers.paymentterms = paymentterms.termsindicator
INNER JOIN currencies
ON suppliers.currcode = currencies.currabrev
- INNER JOIN supptrans
+ INNER JOIN supptrans
ON suppliers.supplierid = supptrans.supplierno
WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
@@ -54,15 +53,14 @@
GROUP BY suppliers.supplierid,
suppliers.suppname,
currencies.currency,
- currencies.decimalplaces,
paymentterms.terms,
paymentterms.daysbeforedue,
paymentterms.dayinfollowingmonth
HAVING SUM(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) <>0";
-
+
} else {
- $SQL = "SELECT suppliers.supplierid,
+ $SQL = "SELECT suppliers.supplierid,
suppliers.suppname,
currencies.currency,
currencies.decimalplaces AS currdecimalplaces,
@@ -83,11 +81,11 @@
ELSE
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
END) AS overdue2
- FROM suppliers INNER JOIN paymentterms
- ON suppliers.paymentterms = paymentterms.termsindicator
- INNER JOIN currencies
- ON suppliers.currcode = currencies.currabrev
- INNER JOIN supptrans
+ FROM suppliers INNER JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ INNER JOIN supptrans
ON suppliers.supplierid = supptrans.supplierno
WHERE suppliers.supplierid >= '" . $_POST['FromCriteria'] . "'
AND suppliers.supplierid <= '" . $_POST['ToCriteria'] . "'
@@ -95,11 +93,10 @@
GROUP BY suppliers.supplierid,
suppliers.suppname,
currencies.currency,
- currencies.decimalplaces,
paymentterms.terms,
paymentterms.daysbeforedue,
paymentterms.dayinfollowingmonth
- HAVING Sum(IF (paymentterms.daysbeforedue > 0,
+ HAVING SUM(IF (paymentterms.daysbeforedue > 0,
CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END,
CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END)) > 0";
@@ -108,15 +105,15 @@
$SupplierResult = DB_query($SQL,$db,'','',False,False); /*dont trap errors */
if (DB_error_no($db) !=0) {
- $title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
- include('includes/header.inc');
- prnMsg(_('The Supplier details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
- echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
- if ($debug==1){
- echo '<br />' . $SQL;
- }
- include('includes/footer.inc');
- exit;
+ $title = _('Aged Supplier Account Analysis') . ' - ' . _('Problem Report') ;
+ include('includes/header.inc');
+ prnMsg(_('The Supplier details could not be retrieved by the SQL because') . ' ' . DB_error_msg($db),'error');
+ echo '<br /><a href="' . $rootpath . '/index.php">' . _('Back to the menu') . '</a>';
+ if ($debug==1){
+ echo '<br />' . $SQL;
+ }
+ include('includes/footer.inc');
+ exit;
}
include ('includes/PDFAgedSuppliersPageHeader.inc');
@@ -126,13 +123,13 @@
$TotOD1 = 0;
$TotOD2 = 0;
$CurrDecimalPlaces =0;
-
- $ListCount = DB_num_rows($SupplierResult); // UldisN
- While ($AgedAnalysis = DB_fetch_array($SupplierResult,$db)){
-
+ $ListCount = DB_num_rows($SupplierResult); // UldisN
+
+ while ($AgedAnalysis = DB_fetch_array($SupplierResult,$db)){
+
$CurrDecimalPlaces = $AgedAnalysis['currdecimalplaces'];
-
+
$DisplayDue = locale_number_format($AgedAnalysis['due']-$AgedAnalysis['overdue1'],$CurrDecimalPlaces);
$DisplayCurrent = locale_number_format($AgedAnalysis['balance']-$AgedAnalysis['due'],$CurrDecimalPlaces);
$DisplayBalance = locale_number_format($AgedAnalysis['balance'],$CurrDecimalPlaces);
@@ -154,7 +151,7 @@
$YPos -=$line_height;
if ($YPos < $Bottom_Margin + $line_height){
- include('includes/PDFAgedSuppliersPageHeader.inc');
+ include('includes/PDFAgedSuppliersPageHeader.inc');
}
if ($_POST['DetailedReport']=='Yes'){
@@ -163,36 +160,38 @@
/*draw a line under the Supplier aged analysis*/
$pdf->line($Page_Width-$Right_Margin, $YPos+10,$Left_Margin, $YPos+10);
- $sql = "SELECT systypes.typename, supptrans.suppreference, supptrans.trandate,
- (supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
- CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END AS due,
- CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END AS overdue1,
- CASE WHEN paymentterms.daysbeforedue > 0 THEN
- CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- ELSE
- CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
- END AS overdue2
- FROM suppliers,
- paymentterms,
- supptrans,
- systypes
- WHERE systypes.typeid = supptrans.type
- AND suppliers.paymentterms = paymentterms.termsindicator
- AND suppliers.supplierid = supptrans.supplierno
- AND ABS(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) >0.009
- AND supptrans.settled = 0
- AND supptrans.supplierno = '" . $AgedAnalysis["supplierid"] . "'";
+ $sql = "SELECT systypes.typename,
+ supptrans.suppreference,
+ supptrans.trandate,
+ (supptrans.ovamount + supptrans.ovgst - supptrans.alloc) as balance,
+ CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(supptrans.trandate)) >= paymentterms.daysbeforedue THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= 0 THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END AS due,
+ CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays1'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END AS overdue1,
+ CASE WHEN paymentterms.daysbeforedue > 0 THEN
+ CASE WHEN TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) > paymentterms.daysbeforedue AND TO_DAYS(Now()) - TO_DAYS(supptrans.trandate) >= (paymentterms.daysbeforedue + " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ ELSE
+ CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(supptrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(supptrans.trandate))', 'DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN supptrans.ovamount + supptrans.ovgst - supptrans.alloc ELSE 0 END
+ END AS overdue2
+ FROM suppliers
+ LEFT JOIN paymentterms
+ ON suppliers.paymentterms = paymentterms.termsindicator
+ LEFT JOIN supptrans
+ ON suppliers.supplierid = supptrans.supplierno
+ LEFT JOIN systypes
+ ON systypes.typeid = supptrans.type
+ WHERE ABS(supptrans.ovamount + supptrans.ovgst - supptrans.alloc) >0.009
+ AND supptrans.settled = 0
+ AND supptrans.supplierno = '" . $AgedAnalysis["supplierid"] . "'";
- $DetailResult = DB_query($sql,$db,'','',False,False); /*dont trap errors - trapped below*/
- if (DB_error_no($db) !=0) {
+ $DetailResult = DB_query($sql,$db,'','',False,False); /*dont trap errors - trapped below*/
+ if (DB_error_no($db) !=0) {
$title = _('Aged Supplier Account Analysis - Problem Report');
include('includes/header.inc');
prnMsg(_('The details of outstanding transactions for Supplier') . ' - ' . $AgedAnalysis['supplierid'] . ' ' . _('could not be retrieved because') . ' - ' . DB_error_msg($db),'error');
@@ -202,35 +201,35 @@
}
include('includes/footer.inc');
exit;
- }
+ }
- while ($DetailTrans = DB_fetch_array($DetailResult)){
-
- $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos,60,$FontSize,$DetailTrans['typename'],'left');
- $LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,50,$FontSize,$DetailTrans['suppreference'],'left');
- $DisplayTranDate = ConvertSQLDate($DetailTrans['trandate']);
- $LeftOvers = $pdf->addTextWrap($Left_Margin+105,$YPos,70,$FontSize,$DisplayTranDate,'left');
+ while ($DetailTrans = DB_fetch_array($DetailResult)){
- $DisplayDue = locale_number_format($DetailTrans['due']-$DetailTrans['overdue1'],$CurrDecimalPlaces);
- $DisplayCurrent = locale_number_format($DetailTrans['balance']-$DetailTrans['due'],$CurrDecimalPlaces);
- $DisplayBalance = locale_number_format($DetailTrans['balance'],$CurrDecimalPlaces);
- $DisplayOverdue1 = locale_number_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],$CurrDecimalPlaces);
- $DisplayOverdue2 = locale_number_format($DetailTrans['overdue2'],$CurrDecimalPlaces);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+5,$YPos,60,$FontSize,$DetailTrans['typename'],'left');
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+65,$YPos,50,$FontSize,$DetailTrans['suppreference'],'left');
+ $DisplayTranDate = ConvertSQLDate($DetailTrans['trandate']);
+ $LeftOvers = $pdf->addTextWrap($Left_Margin+105,$YPos,70,$FontSize,$DisplayTranDate,'left');
- $LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayBalance,'right');
- $LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayCurrent,'right');
- $LeftOvers = $pdf->addTextWrap(340,$YPos,60,$FontSize,$DisplayDue,'right');
- $LeftOvers = $pdf->addTextWrap(400,$YPos,60,$FontSize,$DisplayOverdue1,'right');
- $LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayOverdue2,'right');
+ $DisplayDue = locale_number_format($DetailTrans['due']-$DetailTrans['overdue1'],$CurrDecimalPlaces);
+ $DisplayCurrent = locale_number_format($DetailTrans['balance']-$DetailTrans['due'],$CurrDecimalPlaces);
+ $DisplayBalance = locale_number_format($DetailTrans['balance'],$CurrDecimalPlaces);
+ $DisplayOverdue1 = locale_number_format($DetailTrans['overdue1']-$DetailTrans['overdue2'],$CurrDecimalPlaces);
+ $DisplayOverdue2 = locale_number_format($DetailTrans['overdue2'],$CurrDecimalPlaces);
- $YPos -=$line_height;
- if ($YPos < $Bottom_Margin + $line_height){
+ $LeftOvers = $pdf->addTextWrap(220,$YPos,60,$FontSize,$DisplayBalance,'right');
+ $LeftOvers = $pdf->addTextWrap(280,$YPos,60,$FontSize,$DisplayCurrent,'right');
+ $LeftOvers = $pdf->addTextWrap(340,$YPos,60,$FontSize,$DisplayDue,'right');
+ $LeftOvers = $pdf->addTextWrap(400,$YPos,60,$FontSize,$DisplayOverdue1,'right');
+ $LeftOvers = $pdf->addTextWrap(460,$YPos,60,$FontSize,$DisplayOverdue2,'right');
+
+ $YPos -=$line_height;
+ if ($YPos < $Bottom_Margin + $line_height){
$PageNumber++;
include('includes/PDFAgedSuppliersPageHeader.inc');
$FontSize=6;
- }
- } /*end while there are detail transactions to show */
- /*draw a line under the detailed transactions before the next Supplier aged analysis*/
+ }
+ } /*end while there are detail transactions to show */
+ /*draw a line under the detailed transactions before the next Supplier aged analysis*/
$pdf->line($Page_Width-$Right_Margin, $YPos+10,$Left_Margin, $YPos+10);
$FontSize=8;
} /*Its a detailed report */
@@ -260,30 +259,29 @@
$YPos -=$line_height;
$pdf->line($Page_Width-$Right_Margin, $YPos ,220, $YPos);
- if ($ListCount == 0) {
+ if ($ListCount == 0) {
$title = _('Aged Supplier Analysis');
include('includes/header.inc');
- prnMsg('There are no results so the PDF is empty');
- include('includes/footer.inc');
- } else {
- $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');
- }
- $pdf->__destruct();
+ prnMsg('There are no results so the PDF is empty');
+ include('includes/footer.inc');
+ } else {
+ $pdf->OutputD($_SESSION['DatabaseName'] . '_AggedSupliers_' . date('Y-m-d').'.pdf');
+ }
+ $pdf->__destruct();
} else { /*The option to print PDF was not hit */
$title = _('Aged Supplier Analysis');
include('includes/header.inc');
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' .
- _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- if (!isset($_POST['FromCriteria']) OR !isset($_POST['ToCriteria'])) {
+ if (!isset($_POST['FromCriteria']) or !isset($_POST['ToCriteria'])) {
/*if $FromCriteria is not set then show a form to allow input */
- echo '<form sction="' . htmlspecialchars($_SERVER['PHP_SELF']) . '" method="post">
- <table class="selection">
+ echo '<form sction="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">
<tr>
<td>' . _('From Supplier Code') . ':</font></td>
<td><input tabindex="1" type="text" maxlength="6" size="7" name="FromCriteria" value="1" /></td>
@@ -307,11 +305,11 @@
$result=DB_query($sql,$db);
while ($myrow=DB_fetch_array($result)){
- if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
- echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
- } else {
- echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
- }
+ if ($myrow['currabrev'] == $_SESSION['CompanyRecord']['currencydefault']){
+ echo '<option selected="selected" value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ } else {
+ echo '<option value="' . $myrow['currabrev'] . '">' . $myrow['currency'] . '</option>';
+ }
}
echo '</select></td>
</tr>
@@ -331,4 +329,4 @@
include('includes/footer.inc');
} /*end of else not PrintPDF */
-?>
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
