From: <tim...@us...> - 2010-03-22 08:29:41
|
Revision: 3397 http://web-erp.svn.sourceforge.net/web-erp/?rev=3397&view=rev Author: tim_schofield Date: 2010-03-22 08:29:34 +0000 (Mon, 22 Mar 2010) Log Message: ----------- Tim: Change customer statement layout to not have overlapping text Modified Paths: -------------- trunk/PrintCustStatements.php trunk/doc/Change.log.html trunk/includes/PDFStatementPageHeader.inc Modified: trunk/PrintCustStatements.php =================================================================== --- trunk/PrintCustStatements.php 2010-03-21 13:12:52 UTC (rev 3396) +++ trunk/PrintCustStatements.php 2010-03-22 08:29:34 UTC (rev 3397) @@ -14,11 +14,12 @@ if (isset($_GET['PrintPDF'])) { $FromCust = $_GET['FromCust']; $ToCust = $_GET['ToCust']; - $PrintPDF = $_GET['PrintPDF']; + $PrintPDF = $_GET['PrintPDF']; $_POST['FromCust'] = $FromCust; $_POST['ToCust'] = $ToCust; $_POST['PrintPDF'] = $PrintPDF; -} + $PaperSize='A4_Landscape'; +} @@ -126,13 +127,13 @@ OR debtortrans.id=custallocns.transid_allocto) WHERE custallocns.datealloc >='" . Date('Y-m-d',Mktime(0,0,0,Date('m')-1,Date('d'),Date('y'))) . "' - AND debtortrans.debtorno='" . $StmtHeader['debtorno'] . "' + AND debtortrans.debtorno='" . $StmtHeader['debtorno'] . "' AND debtortrans.settled=1 ORDER BY debtortrans.id"; $SetldTrans=DB_query($sql,$db, $ErrMsg); $NumberOfRecordsReturned += DB_num_rows($SetldTrans); - + } if ( $NumberOfRecordsReturned >=1){ @@ -169,19 +170,19 @@ $FontSize=9; $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,$myrow['typename'], 'left'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+61,$YPos,50,$FontSize,$myrow['transno'], 'left'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+111,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left'); $FontSize=10; if ($myrow['total']>0){ $DisplayTotal = number_format($myrow['total'],2); - $LeftOvers = $pdf->addTextWrap($Left_Margin+150,$YPos,60,$FontSize,$DisplayTotal, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,60,$FontSize,$DisplayTotal, 'right'); } else { $DisplayTotal = number_format(-$myrow['total'],2); - $LeftOvers = $pdf->addTextWrap($Left_Margin+210,$YPos,60,$FontSize,$DisplayTotal, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,60,$FontSize,$DisplayTotal, 'right'); } - $LeftOvers = $pdf->addTextWrap($Left_Margin+270,$YPos,60,$FontSize,$DisplayAlloc, 'right'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+330,$YPos,60,$FontSize,$DisplayOutstanding, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,60,$FontSize,$DisplayAlloc, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right'); if ($YPos-$line_height <= $Bottom_Margin){ /* head up a new statement page */ @@ -219,26 +220,26 @@ $FontSize=9; $LeftOvers = $pdf->addTextWrap($Left_Margin+1,$YPos,60,$FontSize,$myrow['typename'], 'left'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+61,$YPos,50,$FontSize,$myrow['transno'], 'left'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+111,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+110,$YPos,50,$FontSize,$myrow['transno'], 'left'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+211,$YPos,50,$FontSize,ConvertSQLDate($myrow['trandate']), 'left'); $FontSize=10; if ($myrow['total']>0){ $DisplayTotal = number_format($myrow['total'],2); - $LeftOvers = $pdf->addTextWrap($Left_Margin+161,$YPos,55,$FontSize,$DisplayTotal, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+300,$YPos,55,$FontSize,$DisplayTotal, 'right'); } else { $DisplayTotal = number_format(-$myrow['total'],2); - $LeftOvers = $pdf->addTextWrap($Left_Margin+216,$YPos,55,$FontSize,$DisplayTotal, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+382,$YPos,55,$FontSize,$DisplayTotal, 'right'); } - $LeftOvers = $pdf->addTextWrap($Left_Margin+271,$YPos,59,$FontSize,$DisplayAlloc, 'right'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+330,$YPos,60,$FontSize,$DisplayOutstanding, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+459,$YPos,59,$FontSize,$DisplayAlloc, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+536,$YPos,60,$FontSize,$DisplayOutstanding, 'right'); /*Now show also in the remittance advice sectin */ $FontSize=8; - $LeftOvers = $pdf->addTextWrap($Perforation+1,$YPos,30,$FontSize,$myrow['typename'], 'left'); - $LeftOvers = $pdf->addTextWrap($Perforation+35,$YPos,30,$FontSize,$myrow['transno'], 'left'); - $LeftOvers = $pdf->addTextWrap($Perforation+65,$YPos,60,$FontSize,$DisplayOutstanding, 'right'); + $LeftOvers = $pdf->addTextWrap($Perforation+10,$YPos,30,$FontSize,$myrow['typename'], 'left'); + $LeftOvers = $pdf->addTextWrap($Perforation+75,$YPos,30,$FontSize,$myrow['transno'], 'left'); + $LeftOvers = $pdf->addTextWrap($Perforation+90,$YPos,60,$FontSize,$DisplayOutstanding, 'right'); if ($YPos-$line_height <= $Bottom_Margin){ /* head up a new statement page */ @@ -281,7 +282,7 @@ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END - ELSE + ELSE CASE WHEN TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1', 'MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= 0 THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc @@ -307,8 +308,8 @@ THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + debtortrans.ovdiscount - debtortrans.alloc ELSE 0 END - ELSE - CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1','MONTH') . "), " . + ELSE + CASE WHEN (TO_DAYS(Now()) - TO_DAYS(DATE_ADD(DATE_ADD(debtortrans.trandate, " . INTERVAL('1','MONTH') . "), " . INTERVAL('(paymentterms.dayinfollowingmonth - DAYOFMONTH(debtortrans.trandate))','DAY') . ")) >= " . $_SESSION['PastDueDays2'] . ") THEN debtortrans.ovamount + debtortrans.ovgst + debtortrans.ovfreight + @@ -356,19 +357,19 @@ $FontSize=10; - $pdf->addText($Left_Margin+37, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Current'). ' '); - $pdf->addText($Left_Margin+110, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Past Due').' '); - $pdf->addText($Left_Margin+182, $Bottom_Margin+(3*$line_height)+4, $FontSize, $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('days') ); - $pdf->addText($Left_Margin+265, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Over').' ' . $_SESSION['PastDueDays2'] . ' '. _('days')); - $pdf->addText($Left_Margin+332, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Total Balance') ); + $pdf->addText($Left_Margin+75, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Current'). ' '); + $pdf->addText($Left_Margin+158, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Past Due').' '); + $pdf->addText($Left_Margin+242, $Bottom_Margin+(3*$line_height)+4, $FontSize, $_SESSION['PastDueDays1'] . '-' . $_SESSION['PastDueDays2'] . ' ' . _('days') ); + $pdf->addText($Left_Margin+315, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Over').' ' . $_SESSION['PastDueDays2'] . ' '. _('days')); + $pdf->addText($Left_Margin+442, $Bottom_Margin+(3*$line_height)+4, $FontSize, _('Total Balance') ); - $LeftOvers = $pdf->addTextWrap($Left_Margin+1, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayCurrent, 'right'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+81, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayDue, 'right'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+161, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue1, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+37, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayCurrent, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+130, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayDue, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+222, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue1, 'right'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+251, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue2, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+305, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayOverdue2, 'right'); - $LeftOvers = $pdf->addTextWrap($Left_Margin+324, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayBalance, 'right'); + $LeftOvers = $pdf->addTextWrap($Left_Margin+432, $Bottom_Margin+(2*$line_height)+8,70,$FontSize,$DisplayBalance, 'right'); /*draw a line under the balance info */ @@ -377,7 +378,8 @@ if (strlen($StmtHeader['lastpaiddate'])>1 && $StmtHeader['lastpaid']!=0){ - $pdf->addText($Left_Margin+5, $Bottom_Margin+13, $FontSize, _('Last payment received').' ' . ConvertSQLDate($StmtHeader['lastpaiddate']) . ' ' . _('Amount received was').' ' . number_format($StmtHeader['lastpaid'],2)); + $pdf->addText($Left_Margin+5, $Bottom_Margin+13, $FontSize, _('Last payment received').' ' . ConvertSQLDate($StmtHeader['lastpaiddate']) . + ' ' . _('Amount received was').' ' . number_format($StmtHeader['lastpaid'],2)); } /*also show the total due in the remittance section */ Modified: trunk/doc/Change.log.html =================================================================== --- trunk/doc/Change.log.html 2010-03-21 13:12:52 UTC (rev 3396) +++ trunk/doc/Change.log.html 2010-03-22 08:29:34 UTC (rev 3397) @@ -1,5 +1,6 @@ <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p> <p></p> +<p>22/03/10 Tim: Change customer statement layout to not have overlapping text</p> <p>21/03/10 Simon Peter Otandeka: PDFStatementPageHeader.inc - Correction for right margin variable misnamed</p> <p>21/03/10 Pak Ricad: MRPShortages.php - Correctuion to mrp shortages report where total supply = 0</p> <p>18/03/10 Tim: Add report of customer transactions entered on a given date</p> Modified: trunk/includes/PDFStatementPageHeader.inc =================================================================== --- trunk/includes/PDFStatementPageHeader.inc 2010-03-21 13:12:52 UTC (rev 3396) +++ trunk/includes/PDFStatementPageHeader.inc 2010-03-22 08:29:34 UTC (rev 3397) @@ -6,7 +6,7 @@ $YPos = $Page_Height - $Top_Margin; -$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -70,$YPos-80,0,30); +$pdf->addJpegFromFile($_SESSION['LogoFile'],$Page_Width/2 -130,$YPos-80,0,60); // Title $FontSize =15; @@ -165,19 +165,19 @@ $FontSize =10; /*Set up headings */ $pdf->addText($Left_Margin+1, $YPos,$FontSize, _('Trans Type') ); -$pdf->addText($Left_Margin+57, $YPos,$FontSize, _('Number') ); -$pdf->addText($Left_Margin+108, $YPos,$FontSize, _('Date') ); -$pdf->addText($Left_Margin+178, $YPos,$FontSize, _('Charges') ); -$pdf->addText($Left_Margin+239, $YPos,$FontSize, _('Credits') ); -$pdf->addText($Left_Margin+289, $YPos,$FontSize, _('Allocated') ); -$pdf->addText($Left_Margin+336, $YPos,$FontSize, _('Outstanding') ); +$pdf->addText($Left_Margin+100, $YPos,$FontSize, _('Number') ); +$pdf->addText($Left_Margin+210, $YPos,$FontSize, _('Date') ); +$pdf->addText($Left_Margin+300, $YPos,$FontSize, _('Charges') ); +$pdf->addText($Left_Margin+382, $YPos,$FontSize, _('Credits') ); +$pdf->addText($Left_Margin+459, $YPos,$FontSize, _('Allocated') ); +$pdf->addText($Left_Margin+536, $YPos,$FontSize, _('Outstanding') ); /*Set up remittance section headings */ $FontSize=8; -$pdf->addText($Perforation+1, $YPos,$FontSize, _('Trans') ); -$pdf->addText($Perforation+35, $YPos,$FontSize, _('Number') ); -$pdf->addText($Perforation+80, $YPos,$FontSize, _('Outstanding') ); +$pdf->addText($Perforation+10, $YPos,$FontSize, _('Trans') ); +$pdf->addText($Perforation+55, $YPos,$FontSize, _('Number') ); +$pdf->addText($Perforation+100, $YPos,$FontSize, _('Outstanding') ); $YPos -= $line_height; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |