Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3380] trunk
|
From: <tim...@us...> - 2010-03-13 15:42:28
|
Revision: 3380
http://web-erp.svn.sourceforge.net/web-erp/?rev=3380&view=rev
Author: tim_schofield
Date: 2010-03-13 15:42:22 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
Tim: SuppPriceList.php - Remove deprecated split() function
Modified Paths:
--------------
trunk/SuppPriceList.php
trunk/doc/Change.log.html
Modified: trunk/SuppPriceList.php
===================================================================
--- trunk/SuppPriceList.php 2010-03-13 14:03:01 UTC (rev 3379)
+++ trunk/SuppPriceList.php 2010-03-13 15:42:22 UTC (rev 3380)
@@ -12,20 +12,20 @@
if (isset($_POST['PrintPDF'])) {
include('includes/PDFStarter.php');
-
+
$FontSize=9;
$pdf->addinfo('Title',_('Supplier Price List'));
$pdf->addinfo('Subject',_('Price List of goods from a Supplier'));
$PageNumber=1;
$line_height=12;
-
- //get supplier
+
+ //get supplier
$sqlsup = "SELECT suppname FROM suppliers where supplierid='" . $_POST['supplier'] . "'";
- $resultsup = db_query($sqlsup,$db,$ErrMsg);
+ $resultsup = db_query($sqlsup,$db);
$RowSup = db_fetch_row($resultsup);
$Supp=$RowSup['0'];
-
+
//get category
if ($_POST['category']!="all"){
$sqlcat="SELECT categorydescription FROM `stockcategory` where categoryid ='" . $_POST['category'] . "'";
@@ -35,42 +35,42 @@
} else {
$Categoryname="ALL";
}
-
+
//get currency
$sqlcur="SELECT currcode FROM `suppliers` where supplierid='" . $_POST['supplier'] . "'";
- $resultcur = db_query($sqlcur,$db,$ErrMsg);
+ $resultcur = db_query($sqlcur,$db);
$RowCur = db_fetch_row($resultcur);
$Currency=$RowCur['0'];
-
+
//get date price
if ($_POST['price']=="all"){
$DatePrice=_('All Price');
} else {
$DatePrice=_('Current Price');
}
-
+
//price and category = all
if (($_POST['price']=="all")and($_POST['category']=="all")){
$sql = "SELECT purchdata.stockid,
stockmaster.description,
purchdata.price,
(purchdata.effectivefrom)as dateprice,
- purchdata.supplierdescription
+ purchdata.supplierdescription
FROM purchdata,stockmaster
WHERE supplierno='" . $_POST['supplier'] . "'
AND stockmaster.stockid=purchdata.stockid
ORDER BY stockid ASC ,dateprice DESC";
} else {
//category=all and price != all
- if (($_POST['price']!="all")and($_POST['category']=="all")){
-
- $sql = "SELECT purchdata.stockid,
+ if (($_POST['price']!="all")and($_POST['category']=="all")){
+
+ $sql = "SELECT purchdata.stockid,
stockmaster.description,
- purchdata.price,
- (SELECT purchdata.effectivefrom
- FROM purchdata
- WHERE purchdata.stockid = stockmaster.stockid
- ORDER BY effectivefrom DESC
+ purchdata.price,
+ (SELECT purchdata.effectivefrom
+ FROM purchdata
+ WHERE purchdata.stockid = stockmaster.stockid
+ ORDER BY effectivefrom DESC
LIMIT 0,1) AS dateprice,
purchdata.supplierdescription
FROM purchdata, stockmaster
@@ -78,15 +78,15 @@
AND stockmaster.stockid = purchdata.stockid
GROUP BY stockid
ORDER BY stockid ASC , dateprice DESC";
- } else {
+ } else {
//price = all category !=all
if (($_POST['price']=="all")and($_POST['category']!="all")){
-
+
$sql = "SELECT purchdata.stockid,
stockmaster.description,
purchdata.price,
(purchdata.effectivefrom)as dateprice,
- purchdata.supplierdescription
+ purchdata.supplierdescription
FROM purchdata,stockmaster
WHERE supplierno='" . $_POST['supplier'] . "'
AND stockmaster.stockid=purchdata.stockid
@@ -97,12 +97,12 @@
$sql = "SELECT purchdata.stockid,
stockmaster.description,
purchdata.price,
- (SELECT purchdata.effectivefrom
- FROM purchdata
- WHERE purchdata.stockid = stockmaster.stockid
- ORDER BY effectivefrom DESC
+ (SELECT purchdata.effectivefrom
+ FROM purchdata
+ WHERE purchdata.stockid = stockmaster.stockid
+ ORDER BY effectivefrom DESC
LIMIT 0,1) AS dateprice,
- purchdata.supplierdescription
+ purchdata.supplierdescription
FROM purchdata,stockmaster
WHERE supplierno='" . $_POST['supplier'] . "'
AND stockmaster.stockid=purchdata.stockid
@@ -130,7 +130,7 @@
$Page_Width,$Right_Margin,$Supp,$Categoryname,$Currency,$DatePrice);
$FontSize=8;
-
+ $code='';
while ($myrow = DB_fetch_array($result,$db)){
$YPos -=$line_height;
// Parameters for addTextWrap are defined in /includes/class.pdf.php
@@ -138,9 +138,14 @@
// 4) Height 5) Text 6) Alignment 7) Border 8) Fill - True to use SetFillColor
// and False to set to transparent
- $date=$myrow[3];
- list($year,$month,$day ) = split('[/.-]', $myrow[3]);
- $dateprice="$day/$month/$year";
+ if (strpos($myrow[3],'-')) {
+ $DateArray=explode('-', $myrow[3]);
+ } else if (strpos($myrow[3],'/')) {
+ $DateArray=explode('/', $myrow[3]);
+ } else if (strpos($myrow[3],'.')) {
+ $DateArray=explode('.', $myrow[3]);
+ }
+ $dateprice=date($_SESSION['DefaultDateFormat'], mktime(0,0,0,$DateArray[1],$DateArray[2],$DateArray[0]));
//if item has more than 1 price, write only price, date and supplier code for the old ones
if ($code==$myrow[0]){
@@ -149,17 +154,17 @@
$pdf->addTextWrap(430,$YPos,50,$FontSize,$dateprice,'left');
$pdf->addTextWrap(510,$YPos,40,$FontSize,$myrow[4],'left');
$code=$myrow[0];
- } else {
- $code=$myrow[0];
+ } else {
+ $code=$myrow[0];
$pdf->addTextWrap(50,$YPos,90,$FontSize,$myrow[0],'left');
$pdf->addTextWrap(145,$YPos,215,$FontSize,$myrow[1],'left');
$pdf->addTextWrap(350,$YPos,50,$FontSize,number_format($myrow[2],2),'right');
$pdf->addTextWrap(430,$YPos,50,$FontSize,$dateprice,'left');
$pdf->addTextWrap(510,$YPos,40,$FontSize,$myrow[4],'left');
- }
+ }
- if ($YPos < $Bottom_Margin + $line_height){
+ if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin,$Supp,$Categoryname,$Currency,$DatePrice);
@@ -168,7 +173,7 @@
} /*end while loop */
-
+
if ($YPos < $Bottom_Margin + $line_height){
PrintHeader($pdf,$YPos,$PageNumber,$Page_Height,$Top_Margin,$Left_Margin,$Page_Width,
$Right_Margin,$Supp,$Categoryname,$Currency,$DatePrice);
@@ -176,17 +181,17 @@
$pdfcode = $pdf->output();
-
+
header('Content-type: application/pdf');
header("Content-Length: " . $len);
header('Content-Disposition: inline; filename=Supplier Price List.pdf');
header('Expires: 0');
header('Cache-Control: private, post-check=0, pre-check=0');
- header('Pragma: public');
+ header('Pragma: public');
$pdf->Output('SuppPriceList.pdf', 'I');
-
+
} else { /*The option to print PDF was not hit so display form */
$title=_('Supplier Price List');
@@ -195,7 +200,7 @@
echo '<div class="page_help_text">' . _('View the Price List from supplier') . '</div><br>';
echo '<br/><form action=' . $_SERVER['PHP_SELF'] . " method='post'><table>";
-
+
$sql = "SELECT supplierid,suppname FROM `suppliers`";
$result = DB_query($sql,$db);
echo '<table>';
@@ -206,9 +211,9 @@
} else {
echo '<option Value="' . $myrow['supplierid'] . '">' . $myrow['supplierid'].' - '.$myrow['suppname'];
}
- }
+ }
echo '</select></td></tr>';
-
+
$sql='SELECT categoryid,categorydescription FROM `stockcategory`';
$result = DB_query($sql,$db);
echo '<tr><td>' . _('Category') . ':</td><td><select name="category"> ';
@@ -219,15 +224,15 @@
} else {
echo '<option Value="' . $myrow['categoryid'] . '">' .$myrow['categoryid'].' - '. $myrow['categorydescription'];
}
- }
+ }
echo '</select></td></tr>';
-
+
echo '<tr><td>' . _('Price List') . ':</td><td><select name="price"> ';
echo '<option Value="all">' ._('All Prices').'';
echo '<option Value="current">' ._('Only Current Price').'';
echo '</select></td></tr>';
-
-
+
+
echo "</table><br/><div class='centre'><input type=submit name='PrintPDF' value='" . _('Print PDF') . "'></div>";
include('includes/footer.inc');
@@ -248,18 +253,18 @@
$FontSize=9;
$YPos= $Page_Height-$Top_Margin;
$YPos -=(3*$line_height);
-
+
$pdf->addTextWrap($Left_Margin,$YPos,300,$FontSize+2,$_SESSION['CompanyRecord']['coyname']);
$YPos -=$line_height;
-
+
$pdf->addTextWrap($Left_Margin,$YPos,150,$FontSize,_('Supplier Price List for').' '.$DatePrice);
-
- $pdf->addTextWrap($Page_Width-$Right_Margin-150,$YPos,160,$FontSize,_('Printed') . ': ' .
+
+ $pdf->addTextWrap($Page_Width-$Right_Margin-150,$YPos,160,$FontSize,_('Printed') . ': ' .
Date($_SESSION['DefaultDateFormat']) . ' ' . _('Page') . ' ' . $PageNumber,'left');
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Supplier').' ');
$pdf->addTextWrap(95,$YPos,150,$FontSize,_(': ').$Supp);
-
+
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Category').' ');
@@ -267,18 +272,18 @@
$YPos -= $line_height;
$pdf->addTextWrap($Left_Margin,$YPos,50,$FontSize,_('Currency').' ');
$pdf->addTextWrap(95,$YPos,50,$FontSize,_(': ').$Currency);
- $YPos -=(2*$line_height);
+ $YPos -=(2*$line_height);
/*set up the headings */
-
-
-
+
+
+
$pdf->addTextWrap(50,$YPos,100,$FontSize,_('Code'), 'left');
$pdf->addTextWrap(145,$YPos,200,$FontSize,_('Description'), 'left');
$pdf->addTextWrap(370,$YPos,60,$FontSize,_('Price'), 'left');
$pdf->addTextWrap(390,$YPos,80,$FontSize,_('Date Price'), 'right');
$pdf->addTextWrap(470,$YPos,80,$FontSize,_('Supp Code'), 'right');
-
-
+
+
$FontSize=8;
$PageNumber++;
} // End of PrintHeader() function
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-03-13 14:03:01 UTC (rev 3379)
+++ trunk/doc/Change.log.html 2010-03-13 15:42:22 UTC (rev 3380)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>13/03/10 Tim: SuppPriceList.php - Remove deprecated split() function</p>
<p>13/03/10 Tim: SupplierContacts.php - Correctly do the while loop to avoid a blank line, and only try to do the database updates when there are no errors</p>
<p>13/03/10 Phil: GLAccountReport.php - creates a pdf for GL account listings for any selected range of accounts and periods</p>
<p>13/03/10 Phil: GLAccountCSV.php - creates a csv file for GL account report for any selected range of accounts and periods</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
