From: <Ex...@us...> - 2012-02-13 05:19:58
|
Revision: 4891 http://web-erp.svn.sourceforge.net/web-erp/?rev=4891&view=rev Author: ExsonQu Date: 2012-02-13 05:19:51 +0000 (Mon, 13 Feb 2012) Log Message: ----------- Srdjan: Report and fixed 'Settled Transactions' overlap with next row Modified Paths: -------------- trunk/PrintCustStatements.php Modified: trunk/PrintCustStatements.php =================================================================== --- trunk/PrintCustStatements.php 2012-02-12 10:53:55 UTC (rev 4890) +++ trunk/PrintCustStatements.php 2012-02-13 05:19:51 UTC (rev 4891) @@ -154,7 +154,7 @@ $FontSize=12; $YPos -= $line_height; - $pdf->addText($Left_Margin+1,$YPos,$FontSize, _('Settled Transactions')); + $pdf->addText($Left_Margin+1,$YPos+20,$FontSize, _('Settled Transactions')); $YPos -= ($line_height); @@ -431,4 +431,4 @@ } /*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. |
From: <Ex...@us...> - 2012-02-13 05:19:58
|
Revision: 4891 http://web-erp.svn.sourceforge.net/web-erp/?rev=4891&view=rev Author: ExsonQu Date: 2012-02-13 05:19:51 +0000 (Mon, 13 Feb 2012) Log Message: ----------- Srdjan: Report and fixed 'Settled Transactions' overlap with next row Modified Paths: -------------- trunk/PrintCustStatements.php Modified: trunk/PrintCustStatements.php =================================================================== --- trunk/PrintCustStatements.php 2012-02-12 10:53:55 UTC (rev 4890) +++ trunk/PrintCustStatements.php 2012-02-13 05:19:51 UTC (rev 4891) @@ -154,7 +154,7 @@ $FontSize=12; $YPos -= $line_height; - $pdf->addText($Left_Margin+1,$YPos,$FontSize, _('Settled Transactions')); + $pdf->addText($Left_Margin+1,$YPos+20,$FontSize, _('Settled Transactions')); $YPos -= ($line_height); @@ -431,4 +431,4 @@ } /*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. |
From: <ex...@us...> - 2013-11-19 04:20:11
|
Revision: 6412 http://sourceforge.net/p/web-erp/reponame/6412 Author: exsonqu Date: 2013-11-19 04:20:06 +0000 (Tue, 19 Nov 2013) Log Message: ----------- 2013/11/19 Thumb: Text 'settled transaction' position adjusted to proper position in PrintCustStatements.php. Modified Paths: -------------- trunk/PrintCustStatements.php Modified: trunk/PrintCustStatements.php =================================================================== --- trunk/PrintCustStatements.php 2013-11-18 10:17:42 UTC (rev 6411) +++ trunk/PrintCustStatements.php 2013-11-19 04:20:06 UTC (rev 6412) @@ -156,7 +156,7 @@ if (DB_num_rows($SetldTrans)>=1) { $FontSize=12; - $pdf->addText($Left_Margin+1,$YPos+20,$FontSize, _('Settled Transactions')); + $pdf->addText($Left_Margin+1,$YPos+5,$FontSize, _('Settled Transactions')); $YPos -= (2*$line_height); |
From: <ex...@us...> - 2014-01-19 15:35:41
|
Revision: 6545 http://sourceforge.net/p/web-erp/reponame/6545 Author: exsonqu Date: 2014-01-19 15:35:37 +0000 (Sun, 19 Jan 2014) Log Message: ----------- 19/01/14 Exson: Add sales man login control and modify the PDF to download to harmony with other files and solve backward failure problem in PrintCustStatements.php. Modified Paths: -------------- trunk/PrintCustStatements.php Modified: trunk/PrintCustStatements.php =================================================================== --- trunk/PrintCustStatements.php 2014-01-19 01:19:06 UTC (rev 6544) +++ trunk/PrintCustStatements.php 2014-01-19 15:35:37 UTC (rev 6545) @@ -104,9 +104,14 @@ FROM debtortrans INNER JOIN systypes ON debtortrans.type=systypes.typeid WHERE debtortrans.debtorno='" . $StmtHeader['debtorno'] . "' - AND debtortrans.settled=0 - ORDER BY debtortrans.id"; + AND debtortrans.settled=0"; + + if ($_SESSION['SalesmanLogin'] != '') { + $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; + } + $sql .= " ORDER BY debtortrans.id"; + $OstdgTrans=DB_query($sql,$db, $ErrMsg); $NumberOfRecordsReturned = DB_num_rows($OstdgTrans); @@ -129,9 +134,14 @@ 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.settled=1 - ORDER BY debtortrans.id"; + AND debtortrans.settled=1"; + if ($_SESSION['SalesmanLogin'] != '') { + $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; + } + + $sql .= " ORDER BY debtortrans.id"; + $SetldTrans=DB_query($sql,$db, $ErrMsg); $NumberOfRecordsReturned += DB_num_rows($SetldTrans); @@ -264,7 +274,7 @@ /* head up a new statement/credit note page */ $PageNumber++; $pdf->newPage(); - include ('includes/PDFStatementPageHeader.inc'); + include ('includes/PDFStatementPageHeader.inc'); } /*Now figure out the aged analysis for the customer under review */ @@ -325,8 +335,13 @@ INNER JOIN debtortrans ON debtorsmaster.debtorno = debtortrans.debtorno WHERE - debtorsmaster.debtorno = '" . $StmtHeader['debtorno'] . "' - GROUP BY + debtorsmaster.debtorno = '" . $StmtHeader['debtorno'] . "'"; + + if ($_SESSION['SalesmanLogin'] != '') { + $sql .= " AND debtortrans.salesperson='" . $_SESSION['SalesmanLogin'] . "'"; + } + + $sql .= " GROUP BY debtorsmaster.name, currencies.currency, paymentterms.terms, @@ -396,7 +411,7 @@ if (isset($pdf)){ - $pdf->OutputI($_SESSION['DatabaseName'] . '_CustStatements_' . date('Y-m-d') . '.pdf'); + $pdf->OutputD($_SESSION['DatabaseName'] . '_CustStatements_' . date('Y-m-d') . '.pdf'); $pdf->__destruct(); } else { |
From: <te...@us...> - 2016-08-16 13:26:45
|
Revision: 7590 http://sourceforge.net/p/web-erp/reponame/7590 Author: tehonu Date: 2016-08-16 13:26:43 +0000 (Tue, 16 Aug 2016) Log Message: ----------- Fixed syntax error Modified Paths: -------------- trunk/PrintCustStatements.php Modified: trunk/PrintCustStatements.php =================================================================== --- trunk/PrintCustStatements.php 2016-08-15 09:51:49 UTC (rev 7589) +++ trunk/PrintCustStatements.php 2016-08-16 13:26:43 UTC (rev 7590) @@ -514,11 +514,11 @@ include('includes/header.inc'); echo '<br /> <br /> - <br />' . prnMsg( _('There were no statements to print'); + <br />' . prnMsg( _('There were no statements to print')); } else { echo '<br /> <br /> - <br />' . prnMsg( _('There were no statements to email'); + <br />' . prnMsg( _('There were no statements to email')); } echo'<br /> <br /> |